| Message ID | 20200828130602.42203-9-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:06 AM, Andre Przywara wrote: > The SP805 DT binding requires two clocks to be specified, but the > Broadcom Cygnus DT currently only specifies one clock. > > 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. > > 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. > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > --- > arch/arm/boot/dts/bcm-cygnus.dtsi | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi > index 35bdd0969f0a..dacaef2c14ca 100644 > --- a/arch/arm/boot/dts/bcm-cygnus.dtsi > +++ b/arch/arm/boot/dts/bcm-cygnus.dtsi > @@ -234,8 +234,8 @@ > compatible = "arm,sp805" , "arm,primecell"; > reg = <0x18009000 0x1000>; > interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; > - clocks = <&axi81_clk>; > - clock-names = "apb_pclk"; > + clocks = <&axi81_clk>, <&axi81_clk>; > + clock-names = "wdog_clk", "apb_pclk"; > }; > > gpio_ccm: gpio@1800a000 { > Reviewed-by: Ray Jui <ray.jui@broadcom.com>
On 8/28/20 6:06 AM, Andre Przywara wrote: > The SP805 DT binding requires two clocks to be specified, but the > Broadcom Cygnus DT currently only specifies one clock. > > 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. > > 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. > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> Acked-by: Florian Fainelli <f.fainelli@gmail.com>
On Fri, 28 Aug 2020 14:06:00 +0100, Andre Przywara <andre.przywara@arm.com> wrote: > The SP805 DT binding requires two clocks to be specified, but the > Broadcom Cygnus DT currently only specifies one clock. > > 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. > > 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. > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > --- Applied to qspi-fixes, thanks! -- Florian
On 8/30/2020 8:55 PM, Florian Fainelli wrote: > On Fri, 28 Aug 2020 14:06:00 +0100, Andre Przywara <andre.przywara@arm.com> wrote: >> The SP805 DT binding requires two clocks to be specified, but the >> Broadcom Cygnus DT currently only specifies one clock. >> >> 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. >> >> 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. >> >> Signed-off-by: Andre Przywara <andre.przywara@arm.com> >> --- > > Applied to qspi-fixes, thanks! Applied to devicetree/next actually, likewise for the next patch.
diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi index 35bdd0969f0a..dacaef2c14ca 100644 --- a/arch/arm/boot/dts/bcm-cygnus.dtsi +++ b/arch/arm/boot/dts/bcm-cygnus.dtsi @@ -234,8 +234,8 @@ compatible = "arm,sp805" , "arm,primecell"; reg = <0x18009000 0x1000>; interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&axi81_clk>; - clock-names = "apb_pclk"; + clocks = <&axi81_clk>, <&axi81_clk>; + clock-names = "wdog_clk", "apb_pclk"; }; gpio_ccm: gpio@1800a000 {
The SP805 DT binding requires two clocks to be specified, but the Broadcom Cygnus DT currently only specifies one clock. 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. 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. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- arch/arm/boot/dts/bcm-cygnus.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)