Message ID | cover.1455303422.git.horms+renesas@verge.net.au |
---|---|
State | New |
Headers | show |
On Fri, Feb 12, 2016 at 8:04 PM, Simon Horman <horms+renesas@verge.net.au> wrote: > Instantiate the GPIO keys in the gose device tree. > > Based on similar work for the koelsch board by Laurent Pinchart. > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > Tested-by: Magnus Damm <damm+renesas@opensource.se> > --- > arch/arm/boot/dts/r8a7793-gose.dts | 82 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 82 insertions(+) > > diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts > index baa59fe84298..ccbc1c66cc6c 100644 > --- a/arch/arm/boot/dts/r8a7793-gose.dts > +++ b/arch/arm/boot/dts/r8a7793-gose.dts > @@ -31,6 +31,88 @@ > device_type = "memory"; > reg = <0 0x40000000 0 0x40000000>; > }; > + > + gpio-keys { > + compatible = "gpio-keys"; > + > + key-1 { > + gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; > + linux,code = <KEY_1>; > + label = "SW2-1"; > + gpio-key,wakeup; In the mean time, "gpio-key,wakeup" has been deprecated in favor of "wakeup-source". Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Sat, Feb 13, 2016 at 09:23:47PM +0100, Geert Uytterhoeven wrote: > On Fri, Feb 12, 2016 at 8:04 PM, Simon Horman > <horms+renesas@verge.net.au> wrote: > > Instantiate the GPIO keys in the gose device tree. > > > > Based on similar work for the koelsch board by Laurent Pinchart. > > > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > Tested-by: Magnus Damm <damm+renesas@opensource.se> > > --- > > arch/arm/boot/dts/r8a7793-gose.dts | 82 ++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 82 insertions(+) > > > > diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts > > index baa59fe84298..ccbc1c66cc6c 100644 > > --- a/arch/arm/boot/dts/r8a7793-gose.dts > > +++ b/arch/arm/boot/dts/r8a7793-gose.dts > > @@ -31,6 +31,88 @@ > > device_type = "memory"; > > reg = <0 0x40000000 0 0x40000000>; > > }; > > + > > + gpio-keys { > > + compatible = "gpio-keys"; > > + > > + key-1 { > > + gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; > > + linux,code = <KEY_1>; > > + label = "SW2-1"; > > + gpio-key,wakeup; > > In the mean time, "gpio-key,wakeup" has been deprecated in favor of > "wakeup-source". Is the change just a matter of s/gpio-key,wakeup/wakeup-source/ ? If so I'll sort things out.
On Mon, Feb 15, 2016 at 8:18 AM, Simon Horman <horms@verge.net.au> wrote: > On Sat, Feb 13, 2016 at 09:23:47PM +0100, Geert Uytterhoeven wrote: >> On Fri, Feb 12, 2016 at 8:04 PM, Simon Horman >> <horms+renesas@verge.net.au> wrote: >> > Instantiate the GPIO keys in the gose device tree. >> > >> > Based on similar work for the koelsch board by Laurent Pinchart. >> > >> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> >> > Tested-by: Magnus Damm <damm+renesas@opensource.se> >> > --- >> > arch/arm/boot/dts/r8a7793-gose.dts | 82 ++++++++++++++++++++++++++++++++++++++ >> > 1 file changed, 82 insertions(+) >> > >> > diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts >> > index baa59fe84298..ccbc1c66cc6c 100644 >> > --- a/arch/arm/boot/dts/r8a7793-gose.dts >> > +++ b/arch/arm/boot/dts/r8a7793-gose.dts >> > @@ -31,6 +31,88 @@ >> > device_type = "memory"; >> > reg = <0 0x40000000 0 0x40000000>; >> > }; >> > + >> > + gpio-keys { >> > + compatible = "gpio-keys"; >> > + >> > + key-1 { >> > + gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; >> > + linux,code = <KEY_1>; >> > + label = "SW2-1"; >> > + gpio-key,wakeup; >> >> In the mean time, "gpio-key,wakeup" has been deprecated in favor of >> "wakeup-source". > > Is the change just a matter of s/gpio-key,wakeup/wakeup-source/ ? > If so I'll sort things out. Yes, cfr. e.g. commit 0cc16889e77a95568806b1e45af104f75547eac9 ("ARM: dts: shmobile/r8a7xxx: replace gpio-key, wakeup with wakeup-source property") Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Fri, Feb 12, 2016 at 08:05:46PM +0100, Simon Horman wrote: > Hi Olof, Hi Kevin, Hi Arnd, > > Please consider these Renesas ARM based SoC DT updates for v4.6. > > > Changes since v1 of this pull-request: > * Drop two non-DT patches > > > The following changes since commit 92e963f50fc74041b5e9e744c330dca48e04f08d: > > Linux 4.5-rc1 (2016-01-24 13:06:47 -0800) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-for-v4.6 > > for you to fetch changes up to c3373b09ba0391bcd9e992b0a2ce52d48d33e47b: > > ARM: dts: silk: Enable SCIF_CLK frequency and pins (2016-02-09 19:43:28 +0100) > > ---------------------------------------------------------------- > Renesas ARM Based SoC DT Updates for v4.6 > > * Use SCIF and USBHS fallback compatibility strings > * Add Baud Rate Generator (BRG) support for (H)SCIF > * Enable SCIF_CLK frequency and pins > * Use GIC_* defines > * Enable audio on r8a7793/gose > * Enable HDMI vidio out on r8a7793 > * Enable i2c on r8a7793/gose > * Enable QSPI on alt > * Enable GPIO keys and leds on gise > * Enable audio on porter > * Enable DU on porter Merged, thanks. -Olof