diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2015-07-07 17:10:50 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-07-07 17:20:07 -0700 |
| commit | f04b8b48d32c66b5d9243f7a1c85ca198eff43bb (patch) | |
| tree | ac3409475ed04c8ddca4aeaedae005559ac121e6 /drivers/clk/st | |
| parent | 2573a02aa5c882fdcab82bba953241f2fa3181a3 (diff) | |
| parent | 56551da9255f20ffd3a9711728a1a3ad4b7100af (diff) | |
| download | linux-f04b8b48d32c66b5d9243f7a1c85ca198eff43bb.tar.bz2 | |
Merge branch 'clk-fixes' into clk-next
* clk-fixes:
drivers: clk: st: Incorrect register offset used for lock_status
Diffstat (limited to 'drivers/clk/st')
| -rw-r--r-- | drivers/clk/st/clkgen-fsyn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/st/clkgen-fsyn.c b/drivers/clk/st/clkgen-fsyn.c index 99c98c15d4a4..d9eb2e1d8471 100644 --- a/drivers/clk/st/clkgen-fsyn.c +++ b/drivers/clk/st/clkgen-fsyn.c @@ -340,7 +340,7 @@ static const struct clkgen_quadfs_data st_fs660c32_C_407 = { CLKGEN_FIELD(0x30c, 0xf, 20), CLKGEN_FIELD(0x310, 0xf, 20) }, .lockstatus_present = true, - .lock_status = CLKGEN_FIELD(0x2A0, 0x1, 24), + .lock_status = CLKGEN_FIELD(0x2f0, 0x1, 24), .powerup_polarity = 1, .standby_polarity = 1, .pll_ops = &st_quadfs_pll_c32_ops, |