| Message ID | 1468141867-4172-4-git-send-email-narmstrong@baylibre.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 07/10/2016 02:11 AM, Neil Armstrong wrote: > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Would this go in through one of the arm trees ? Guenter > --- > arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi > index 832815d..bcca82f 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi > @@ -136,6 +136,12 @@ > clocks = <&xtal>; > status = "disabled"; > }; > + > + watchdog@98d0 { > + compatible = "amlogic,meson-gxbb-wdt"; > + reg = <0x0 0x098d0 0x0 0x10>; > + clocks = <&xtal>; > + }; > }; > > gic: interrupt-controller@c4301000 { >
Guenter Roeck <linux@roeck-us.net> writes: > On 07/10/2016 02:11 AM, Neil Armstrong wrote: >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > > Reviewed-by: Guenter Roeck <linux@roeck-us.net> > > Would this go in through one of the arm trees ? You can take the driver through the watchdog tree, but I'll take the DT stuff through the amlogic tree (and submit via arm-soc). However, with your ack, and since this is a brand new driver, I could take the driver as well. Just let me know your preference. Thanks, Kevin
Hi Guenter, Kevin Hilman <khilman@baylibre.com> writes: > Guenter Roeck <linux@roeck-us.net> writes: > >> On 07/10/2016 02:11 AM, Neil Armstrong wrote: >>> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >> >> Reviewed-by: Guenter Roeck <linux@roeck-us.net> >> >> Would this go in through one of the arm trees ? > > You can take the driver through the watchdog tree, but I'll take the DT > stuff through the amlogic tree (and submit via arm-soc). > > However, with your ack, and since this is a brand new driver, I could > take the driver as well. Just let me know your preference. ping... do you have a prefernce here? Thanks, Kevin
On Wed, Aug 3, 2016 at 5:27 PM, Kevin Hilman <khilman@baylibre.com> wrote: > Hi Guenter, > > Kevin Hilman <khilman@baylibre.com> writes: > >> Guenter Roeck <linux@roeck-us.net> writes: >> >>> On 07/10/2016 02:11 AM, Neil Armstrong wrote: >>>> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >>> >>> Reviewed-by: Guenter Roeck <linux@roeck-us.net> >>> >>> Would this go in through one of the arm trees ? >> >> You can take the driver through the watchdog tree, but I'll take the DT >> stuff through the amlogic tree (and submit via arm-soc). >> >> However, with your ack, and since this is a brand new driver, I could >> take the driver as well. Just let me know your preference. > > ping... do you have a prefernce here? > Oops, just noticed Wim already picked these up. Ignore me, Kevin
Kevin Hilman <khilman@baylibre.com> writes: > On Wed, Aug 3, 2016 at 5:27 PM, Kevin Hilman <khilman@baylibre.com> wrote: >> Hi Guenter, >> >> Kevin Hilman <khilman@baylibre.com> writes: >> >>> Guenter Roeck <linux@roeck-us.net> writes: >>> >>>> On 07/10/2016 02:11 AM, Neil Armstrong wrote: >>>>> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >>>> >>>> Reviewed-by: Guenter Roeck <linux@roeck-us.net> >>>> >>>> Would this go in through one of the arm trees ? >>> >>> You can take the driver through the watchdog tree, but I'll take the DT >>> stuff through the amlogic tree (and submit via arm-soc). >>> >>> However, with your ack, and since this is a brand new driver, I could >>> take the driver as well. Just let me know your preference. >> >> ping... do you have a prefernce here? >> > > Oops, just noticed Wim already picked these up. > Strange, seems that Wim picked up patches 1 & 3, but this one was missed. I'll queue this for the arm-soc tree. Kevin
On 08/15/2016 01:40 PM, Kevin Hilman wrote: > Kevin Hilman <khilman@baylibre.com> writes: > >> On Wed, Aug 3, 2016 at 5:27 PM, Kevin Hilman <khilman@baylibre.com> wrote: >>> Hi Guenter, >>> >>> Kevin Hilman <khilman@baylibre.com> writes: >>> >>>> Guenter Roeck <linux@roeck-us.net> writes: >>>> >>>>> On 07/10/2016 02:11 AM, Neil Armstrong wrote: >>>>>> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >>>>> >>>>> Reviewed-by: Guenter Roeck <linux@roeck-us.net> >>>>> >>>>> Would this go in through one of the arm trees ? >>>> >>>> You can take the driver through the watchdog tree, but I'll take the DT >>>> stuff through the amlogic tree (and submit via arm-soc). >>>> >>>> However, with your ack, and since this is a brand new driver, I could >>>> take the driver as well. Just let me know your preference. >>> >>> ping... do you have a prefernce here? >>> >> >> Oops, just noticed Wim already picked these up. >> > > Strange, seems that Wim picked up patches 1 & 3, but this one was missed. I'll > queue this for the arm-soc tree. > I got a number of requests from arm maintainers to not pick up devicetree changes for arch/arm, so for my part I usually leave those alone. Guenter
Guenter Roeck <linux@roeck-us.net> writes: > On 08/15/2016 01:40 PM, Kevin Hilman wrote: >> Kevin Hilman <khilman@baylibre.com> writes: >> >>> On Wed, Aug 3, 2016 at 5:27 PM, Kevin Hilman <khilman@baylibre.com> wrote: >>>> Hi Guenter, >>>> >>>> Kevin Hilman <khilman@baylibre.com> writes: >>>> >>>>> Guenter Roeck <linux@roeck-us.net> writes: >>>>> >>>>>> On 07/10/2016 02:11 AM, Neil Armstrong wrote: >>>>>>> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >>>>>> >>>>>> Reviewed-by: Guenter Roeck <linux@roeck-us.net> >>>>>> >>>>>> Would this go in through one of the arm trees ? >>>>> >>>>> You can take the driver through the watchdog tree, but I'll take the DT >>>>> stuff through the amlogic tree (and submit via arm-soc). >>>>> >>>>> However, with your ack, and since this is a brand new driver, I could >>>>> take the driver as well. Just let me know your preference. >>>> >>>> ping... do you have a prefernce here? >>>> >>> >>> Oops, just noticed Wim already picked these up. >>> >> >> Strange, seems that Wim picked up patches 1 & 3, but this one was missed. I'll >> queue this for the arm-soc tree. >> > > I got a number of requests from arm maintainers to not pick up devicetree changes > for arch/arm, so for my part I usually leave those alone. Yeah, that's the normal way, but Wim replied to the cover letter saying he would pick up all three, so I got a bit confused. Anyways, not a big deal. I'll take it from here. Kevin
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index 832815d..bcca82f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -136,6 +136,12 @@ clocks = <&xtal>; status = "disabled"; }; + + watchdog@98d0 { + compatible = "amlogic,meson-gxbb-wdt"; + reg = <0x0 0x098d0 0x0 0x10>; + clocks = <&xtal>; + }; }; gic: interrupt-controller@c4301000 {
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 6 ++++++ 1 file changed, 6 insertions(+)