| Message ID | 1374708923-11956-3-git-send-email-markus.mayer@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 24 July 2013 16:35, Markus Mayer <markus.mayer@linaro.org> wrote: > This patch adds the device tree bindings for the bcm281xx reboot code. > > Signed-off-by: Markus Mayer <markus.mayer@linaro.org> > Reviewed-by: Tim Kryger <tim.kryger@linaro.org> > Acked-by: Christian Daudt <csd@broadcom.com> > --- > .../devicetree/bindings/arm/bcm/bcm,kona-wdt.txt | 15 +++++++++++++++ > arch/arm/boot/dts/bcm11351.dtsi | 7 ++++++- > 2 files changed, 21 insertions(+), 1 deletion(-) > create mode 100644 Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt > > diff --git a/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt b/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt > new file mode 100644 > index 0000000..bb7be64 > --- /dev/null > +++ b/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt > @@ -0,0 +1,15 @@ > +Broadcom Kona Family Watchdog Timer > +----------------------------------- > + > +This watchdog timer is used in the following Broadcom SoCs: > + BCM11130, BCM11140, BCM11351, BCM28145, BCM28155 > + > +Required properties: > + - compatible = "brcm,kona-wdt"; > + - reg: memory range > + > +Example: > + watchdog@35002f40 { > + compatible = "brcm,kona-wdt"; > + reg = <0x35002f40 0x6c>; > + }; > diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi > index c0cdf66..a1c1881 100644 > --- a/arch/arm/boot/dts/bcm11351.dtsi > +++ b/arch/arm/boot/dts/bcm11351.dtsi > @@ -1,5 +1,5 @@ > /* > - * Copyright (C) 2012 Broadcom Corporation > + * Copyright (C) 2012-2013 Broadcom Corporation > * > * This program is free software; you can redistribute it and/or > * modify it under the terms of the GNU General Public License as > @@ -56,6 +56,11 @@ > cache-level = <2>; > }; > > + watchdog@35002f40 { > + compatible = "bcm,kona-wdt"; This oversight in the compatible string has been fixed. > + reg = <0x35002f40 0x6c>; > + }; > + > timer@35006000 { > compatible = "bcm,kona-timer"; > reg = <0x35006000 0x1000>; > -- > 1.7.9.5 > >
There are some minor changes necessary for this patch. > This patch adds the device tree bindings for the bcm281xx reboot code. > diff --git a/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt b/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt > new file mode 100644 > index 0000000..bb7be64 > --- /dev/null > +++ b/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt Name changed to brcm,kona-wdt.txt. > @@ -0,0 +1,15 @@ > +Broadcom Kona Family Watchdog Timer > +----------------------------------- > + > +This watchdog timer is used in the following Broadcom SoCs: > + BCM11130, BCM11140, BCM11351, BCM28145, BCM28155 > + > +Required properties: > + - compatible = "brcm,kona-wdt"; Change to: - compatible = "brcm,bcm11351-wdt", "brcm,kona-wdt"; > + - reg: memory range > + > +Example: > + watchdog@35002f40 { > + compatible = "brcm,kona-wdt"; Change to: compatible = "brcm,bcm11351-wdt", "brcm,kona-wdt"; > + reg = <0x35002f40 0x6c>; > + }; > diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi > index c0cdf66..a1c1881 100644 > --- a/arch/arm/boot/dts/bcm11351.dtsi > +++ b/arch/arm/boot/dts/bcm11351.dtsi > @@ -1,5 +1,5 @@ > /* > - * Copyright (C) 2012 Broadcom Corporation > + * Copyright (C) 2012-2013 Broadcom Corporation > * > * This program is free software; you can redistribute it and/or > * modify it under the terms of the GNU General Public License as > @@ -56,6 +56,11 @@ > cache-level = <2>; > }; > > + watchdog@35002f40 { > + compatible = "bcm,kona-wdt"; Change to: compatible = "brcm,bcm11351-wdt", "brcm,kona-wdt"; > + reg = <0x35002f40 0x6c>; > + }; > + > timer@35006000 { > compatible = "bcm,kona-timer"; > reg = <0x35006000 0x1000>; > -- > 1.7.9.5 > >
diff --git a/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt b/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt new file mode 100644 index 0000000..bb7be64 --- /dev/null +++ b/Documentation/devicetree/bindings/arm/bcm/bcm,kona-wdt.txt @@ -0,0 +1,15 @@ +Broadcom Kona Family Watchdog Timer +----------------------------------- + +This watchdog timer is used in the following Broadcom SoCs: + BCM11130, BCM11140, BCM11351, BCM28145, BCM28155 + +Required properties: + - compatible = "brcm,kona-wdt"; + - reg: memory range + +Example: + watchdog@35002f40 { + compatible = "brcm,kona-wdt"; + reg = <0x35002f40 0x6c>; + }; diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi index c0cdf66..a1c1881 100644 --- a/arch/arm/boot/dts/bcm11351.dtsi +++ b/arch/arm/boot/dts/bcm11351.dtsi @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Broadcom Corporation + * Copyright (C) 2012-2013 Broadcom Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -56,6 +56,11 @@ cache-level = <2>; }; + watchdog@35002f40 { + compatible = "bcm,kona-wdt"; + reg = <0x35002f40 0x6c>; + }; + timer@35006000 { compatible = "bcm,kona-timer"; reg = <0x35006000 0x1000>;