diff options
| author |  Arnd Bergmann <arnd@arndb.de>
| 2024-03-04 17:36:56 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de>
| 2024-03-04 17:37:02 +0100 |
| commit | 794f8770648eaea3f8a2e3b1d9f158198aff31ba (patch) | |
| tree | ec59e56628eb831a0cf7fc224c7d1012f0ae4350 /drivers/clk/ti/mux.c | |
| parent | Linux 6.8-rc6 (diff) | |
| parent | ARM: dts: omap3: Update clksel clocks to use reg instead of ti,bit-shift (diff) | |
| download | linux-794f8770648eaea3f8a2e3b1d9f158198aff31ba.tar.gz linux-794f8770648eaea3f8a2e3b1d9f158198aff31ba.tar.bz2 linux-794f8770648eaea3f8a2e3b1d9f158198aff31ba.zip | |
Merge tag 'omap-for-v6.9/dt-warnings-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into soc/late
Update TI clksel clocks to use reg
Updates for TI clksel clocks to use the standard reg property instead of
the non-standard ti,bit-shift legacy property.
There are still lots of TI composite clock related devicetree warnings for
missing bindings, and overlapping reg properties. We have grouped some of
the TI composite clocks under the clksel clock node, but did not consider
the reg property issue. Let's update the existing users before we continue
grouping more of the composite clocks.
* tag 'omap-for-v6.9/dt-warnings-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: omap3: Update clksel clocks to use reg instead of ti,bit-shift
ARM: dts: am3: Update clksel clocks to use reg instead of ti,bit-shift
clk: ti: Improve clksel clock bit parsing for reg property
clk: ti: Handle possible address in the node name
Link: https://lore.kernel.org/r/pull-1709102378-94138@atomide.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/clk/ti/mux.c')
| -rw-r--r-- | drivers/clk/ti/mux.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/clk/ti/mux.c b/drivers/clk/ti/mux.c index 1ebafa386be6..216d85d6aac6 100644 --- a/drivers/clk/ti/mux.c +++ b/drivers/clk/ti/mux.c @@ -189,7 +189,7 @@ static void of_mux_clk_setup(struct device_node *node) if (ti_clk_get_reg_addr(node, 0, ®)) goto cleanup; - of_property_read_u32(node, "ti,bit-shift", &shift); + shift = reg.bit; of_property_read_u32(node, "ti,latch-bit", &latch); @@ -252,7 +252,6 @@ static void __init of_ti_composite_mux_clk_setup(struct device_node *node) { struct clk_omap_mux *mux; unsigned int num_parents; - u32 val; mux = kzalloc(sizeof(*mux), GFP_KERNEL); if (!mux) @@ -261,8 +260,7 @@ static void __init of_ti_composite_mux_clk_setup(struct device_node *node) if (ti_clk_get_reg_addr(node, 0, &mux->reg)) goto cleanup; - if (!of_property_read_u32(node, "ti,bit-shift", &val)) - mux->shift = val; + mux->shift = mux->reg.bit; if (of_property_read_bool(node, "ti,index-starts-at-one")) mux->flags |= CLK_MUX_INDEX_ONE; |