| Message ID | 1411232812-11594-4-git-send-email-carlo@caione.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Sep 20, 2014 at 7:06 PM, Carlo Caione <carlo@caione.org> wrote: > Reviewed-by: Guenter Roeck <linux@roeck-us.net> > Signed-off-by: Carlo Caione <carlo@caione.org> > --- > arch/arm/boot/dts/meson.dtsi | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi > index 55feb14..e6539ea 100644 > --- a/arch/arm/boot/dts/meson.dtsi > +++ b/arch/arm/boot/dts/meson.dtsi > @@ -70,6 +70,11 @@ > #size-cells = <1>; > ranges; > > + wdt: watchdog@c1109900 { > + compatible = "amlogic,meson6-wdt"; > + reg = <0xc1109900 0x8>; > + }; > + > uart_AO: serial@c81004c0 { > compatible = "amlogic,meson-uart"; > reg = <0xc81004c0 0x14>; Hi Arnd and Guenter, who is supposed to take in this patch? The basic support for the SoC is already in the arm-soc tree (thanks Arnd) and the other three patches of this patchset are going in through Guenter tree (thanks Guenter). BR,
On Friday 26 September 2014 10:04:45 Carlo Caione wrote: > Hi Arnd and Guenter, > who is supposed to take in this patch? The basic support for the SoC > is already in the arm-soc tree (thanks Arnd) and the other three > patches of this patchset are going in through Guenter tree (thanks > Guenter). > It should go through the arm-soc tree. Arnd
On Fri, Sep 26, 2014 at 11:16 AM, Arnd Bergmann <arnd@arndb.de> wrote: > On Friday 26 September 2014 10:04:45 Carlo Caione wrote: >> Hi Arnd and Guenter, >> who is supposed to take in this patch? The basic support for the SoC >> is already in the arm-soc tree (thanks Arnd) and the other three >> patches of this patchset are going in through Guenter tree (thanks >> Guenter). >> > > It should go through the arm-soc tree. Could you take it? Thanks,
On Fri, Sep 26, 2014 at 11:16 AM, Arnd Bergmann <arnd@arndb.de> wrote: > On Friday 26 September 2014 10:04:45 Carlo Caione wrote: >> Hi Arnd and Guenter, >> who is supposed to take in this patch? The basic support for the SoC >> is already in the arm-soc tree (thanks Arnd) and the other three >> patches of this patchset are going in through Guenter tree (thanks >> Guenter). >> > > It should go through the arm-soc tree. Arnd, do you want me to submit a standalone patch for this? Thanks,
diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi index 55feb14..e6539ea 100644 --- a/arch/arm/boot/dts/meson.dtsi +++ b/arch/arm/boot/dts/meson.dtsi @@ -70,6 +70,11 @@ #size-cells = <1>; ranges; + wdt: watchdog@c1109900 { + compatible = "amlogic,meson6-wdt"; + reg = <0xc1109900 0x8>; + }; + uart_AO: serial@c81004c0 { compatible = "amlogic,meson-uart"; reg = <0xc81004c0 0x14>;