| Message ID | 20200828130602.42203-4-andre.przywara@arm.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | dt-bindings: Convert SP805 to Json-schema (and fix users) | expand |
On 8/28/2020 6:05 AM, Andre Przywara wrote: > The SP805 binding sets the name for the actual watchdog clock to > "wdog_clk" (with an underscore). > > Change the name in the DTs for Broadcom platforms to match that. The > Linux and U-Boot driver use the *first* clock for this purpose anyway, > so it does not break anything. > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > --- > arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 2 +- > arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi > index 15f7b0ed3836..6a5fc55f0a4e 100644 > --- a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi > +++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi > @@ -576,7 +576,7 @@ > reg = <0x66090000 0x1000>; > interrupts = <GIC_SPI 406 IRQ_TYPE_LEVEL_HIGH>; > clocks = <&iprocslow>, <&iprocslow>; > - clock-names = "wdogclk", "apb_pclk"; > + clock-names = "wdog_clk", "apb_pclk"; > }; > > gpio_g: gpio@660a0000 { > diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi > index 0098dfdef96c..b425b12c3ed2 100644 > --- a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi > +++ b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi > @@ -438,7 +438,7 @@ > reg = <0x000c0000 0x1000>; > interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>; > clocks = <&hsls_25m_div2_clk>, <&hsls_div4_clk>; > - clock-names = "wdogclk", "apb_pclk"; > + clock-names = "wdog_clk", "apb_pclk"; > timeout-sec = <60>; > }; > > Although not currently used in the driver, this indeed should be fixed to match DT documentation and be ready for future clock support in the driver (i.e., getting clock by name). Reviewed-by: Ray Jui <ray.jui@broadcom.com>
On 8/28/20 6:05 AM, Andre Przywara wrote: > The SP805 binding sets the name for the actual watchdog clock to > "wdog_clk" (with an underscore). > > Change the name in the DTs for Broadcom platforms to match that. The > Linux and U-Boot driver use the *first* clock for this purpose anyway, > so it does not break anything. Not that it really matters because the driver does a devm_clk_get(&adev->dev, NULL), but yes, this should be fixed to conform to the binding. > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> Acked-by: Florian Fainelli <f.fainelli@gmail.com>
On Fri, 28 Aug 2020 14:05:55 +0100, Andre Przywara <andre.przywara@arm.com> wrote: > The SP805 binding sets the name for the actual watchdog clock to > "wdog_clk" (with an underscore). > > Change the name in the DTs for Broadcom platforms to match that. The > Linux and U-Boot driver use the *first* clock for this purpose anyway, > so it does not break anything. > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > --- Applied to devicetree-arm64/next, thanks! -- Florian
diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi index 15f7b0ed3836..6a5fc55f0a4e 100644 --- a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi +++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi @@ -576,7 +576,7 @@ reg = <0x66090000 0x1000>; interrupts = <GIC_SPI 406 IRQ_TYPE_LEVEL_HIGH>; clocks = <&iprocslow>, <&iprocslow>; - clock-names = "wdogclk", "apb_pclk"; + clock-names = "wdog_clk", "apb_pclk"; }; gpio_g: gpio@660a0000 { diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi index 0098dfdef96c..b425b12c3ed2 100644 --- a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi +++ b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi @@ -438,7 +438,7 @@ reg = <0x000c0000 0x1000>; interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>; clocks = <&hsls_25m_div2_clk>, <&hsls_div4_clk>; - clock-names = "wdogclk", "apb_pclk"; + clock-names = "wdog_clk", "apb_pclk"; timeout-sec = <60>; };
The SP805 binding sets the name for the actual watchdog clock to "wdog_clk" (with an underscore). Change the name in the DTs for Broadcom platforms to match that. The Linux and U-Boot driver use the *first* clock for this purpose anyway, so it does not break anything. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 2 +- arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)