Merge branch 'clk-fixes' into clk-next

* clk-fixes:
  drivers: clk: st: Incorrect register offset used for lock_status
This commit is contained in:
Stephen Boyd 2015-07-07 17:10:50 -07:00
commit f04b8b48d3
1 changed files with 1 additions and 1 deletions

View File

@ -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,