Commit f04b8b48 authored by Stephen Boyd's avatar Stephen Boyd

Merge branch 'clk-fixes' into clk-next

* clk-fixes:
  drivers: clk: st: Incorrect register offset used for lock_status
parents 2573a02a 56551da9
...@@ -340,7 +340,7 @@ static const struct clkgen_quadfs_data st_fs660c32_C_407 = { ...@@ -340,7 +340,7 @@ static const struct clkgen_quadfs_data st_fs660c32_C_407 = {
CLKGEN_FIELD(0x30c, 0xf, 20), CLKGEN_FIELD(0x30c, 0xf, 20),
CLKGEN_FIELD(0x310, 0xf, 20) }, CLKGEN_FIELD(0x310, 0xf, 20) },
.lockstatus_present = true, .lockstatus_present = true,
.lock_status = CLKGEN_FIELD(0x2A0, 0x1, 24), .lock_status = CLKGEN_FIELD(0x2f0, 0x1, 24),
.powerup_polarity = 1, .powerup_polarity = 1,
.standby_polarity = 1, .standby_polarity = 1,
.pll_ops = &st_quadfs_pll_c32_ops, .pll_ops = &st_quadfs_pll_c32_ops,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment