Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: arm: Fix SP805 clocks

The SP805 binding sets the name for the actual watchdog clock to
"wdog_clk" (with an underscore).

Change the name in the DTs for ARM Ltd. platforms to match that. The
Linux and U-Boot driver use the *first* clock for this purpose anyway,
so it does not break anything.

For MPS2 we only specify one clock so far, but the binding requires
two clocks to be named.

In practice, Linux would pick a clock named "apb_pclk" for the bus
clock, and the Linux and U-Boot SP805 driver would use the first clock
to derive the actual watchdog counter frequency. So since currently both
are the very same clock, we can just double the clock reference, and add
the correct clock-names, to match the binding.

Link: https://lore.kernel.org/r/20200828130602.42203-8-andre.przywara@arm.com
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

authored by

Andre Przywara and committed by
Sudeep Holla
a894c6dd 34a45918

+13 -13
+1 -1
arch/arm/boot/dts/arm-realview-eb.dtsi
··· 390 390 compatible = "arm,sp805", "arm,primecell"; 391 391 reg = <0x10010000 0x1000>; 392 392 clocks = <&wdogclk>, <&pclk>; 393 - clock-names = "wdogclk", "apb_pclk"; 393 + clock-names = "wdog_clk", "apb_pclk"; 394 394 status = "disabled"; 395 395 }; 396 396
+2 -2
arch/arm/boot/dts/arm-realview-pb11mp.dts
··· 546 546 interrupt-parent = <&intc_pb11mp>; 547 547 interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>; 548 548 clocks = <&wdogclk>, <&pclk>; 549 - clock-names = "wdogclk", "apb_pclk"; 549 + clock-names = "wdog_clk", "apb_pclk"; 550 550 status = "disabled"; 551 551 }; 552 552 ··· 556 556 interrupt-parent = <&intc_pb11mp>; 557 557 interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>; 558 558 clocks = <&wdogclk>, <&pclk>; 559 - clock-names = "wdogclk", "apb_pclk"; 559 + clock-names = "wdog_clk", "apb_pclk"; 560 560 }; 561 561 562 562 timer01: timer@10011000 {
+2 -2
arch/arm/boot/dts/arm-realview-pbx.dtsi
··· 381 381 compatible = "arm,sp805", "arm,primecell"; 382 382 reg = <0x1000f000 0x1000>; 383 383 clocks = <&wdogclk>, <&pclk>; 384 - clock-names = "wdogclk", "apb_pclk"; 384 + clock-names = "wdog_clk", "apb_pclk"; 385 385 status = "disabled"; 386 386 }; 387 387 ··· 389 389 compatible = "arm,sp805", "arm,primecell"; 390 390 reg = <0x10010000 0x1000>; 391 391 clocks = <&wdogclk>, <&pclk>; 392 - clock-names = "wdogclk", "apb_pclk"; 392 + clock-names = "wdog_clk", "apb_pclk"; 393 393 status = "disabled"; 394 394 }; 395 395
+2 -2
arch/arm/boot/dts/mps2.dtsi
··· 199 199 arm,primecell-periphid = <0x00141805>; 200 200 reg = <0x8000 0x1000>; 201 201 interrupts = <0>; 202 - clocks = <&sysclk>; 203 - clock-names = "apb_pclk"; 202 + clocks = <&sysclk>, <&sysclk>; 203 + clock-names = "wdog_clk", "apb_pclk"; 204 204 status = "disabled"; 205 205 }; 206 206 };
+1 -1
arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
··· 280 280 reg = <0x0f0000 0x1000>; 281 281 interrupts = <0>; 282 282 clocks = <&v2m_refclk32khz>, <&smbclk>; 283 - clock-names = "wdogclk", "apb_pclk"; 283 + clock-names = "wdog_clk", "apb_pclk"; 284 284 }; 285 285 286 286 v2m_timer01: timer@110000 {
+1 -1
arch/arm/boot/dts/vexpress-v2m.dtsi
··· 198 198 reg = <0x0f000 0x1000>; 199 199 interrupts = <0>; 200 200 clocks = <&v2m_refclk32khz>, <&smbclk>; 201 - clock-names = "wdogclk", "apb_pclk"; 201 + clock-names = "wdog_clk", "apb_pclk"; 202 202 }; 203 203 204 204 v2m_timer01: timer@11000 {
+2 -2
arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
··· 87 87 status = "disabled"; 88 88 reg = <0 0x2b060000 0 0x1000>; 89 89 interrupts = <0 98 4>; 90 - clocks = <&sys_pll>; 91 - clock-names = "apb_pclk"; 90 + clocks = <&sys_pll>, <&sys_pll>; 91 + clock-names = "wdog_clk", "apb_pclk"; 92 92 }; 93 93 94 94 gic: interrupt-controller@2c001000 {
+1 -1
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
··· 128 128 reg = <0 0x2a490000 0 0x1000>; 129 129 interrupts = <0 98 4>; 130 130 clocks = <&oscclk6a>, <&oscclk6a>; 131 - clock-names = "wdogclk", "apb_pclk"; 131 + clock-names = "wdog_clk", "apb_pclk"; 132 132 }; 133 133 134 134 hdlcd@2b000000 {
+1 -1
arch/arm/boot/dts/vexpress-v2p-ca9.dts
··· 132 132 reg = <0x100e5000 0x1000>; 133 133 interrupts = <0 51 4>; 134 134 clocks = <&oscclk2>, <&oscclk2>; 135 - clock-names = "wdogclk", "apb_pclk"; 135 + clock-names = "wdog_clk", "apb_pclk"; 136 136 }; 137 137 138 138 scu@1e000000 {