* [PATCH 0/3] Minor Armada 370/XP cleanups
@ 2014-02-11 17:07 Thomas Petazzoni
2014-02-11 17:07 ` [PATCH 1/3] ARM: mvebu: remove unneeded ->map_io field for Armada 370/XP Thomas Petazzoni
` (2 more replies)
0 siblings, 3 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2014-02-11 17:07 UTC (permalink / raw)
To: linux-arm-kernel
Jason, Greg, Andrew, Sebastian,
Here are three minor cleanups, the first one for mvebu/soc, the two
other ones for mvebu/dt. I believe they are fairly self-explanatory.
Thanks!
Thomas
Thomas Petazzoni (3):
ARM: mvebu: remove unneeded ->map_io field for Armada 370/XP
ARM: mvebu: use GPIO DT defines in Armada 370/XP boards
ARM: mvebu: use input DT defines in Armada 370/XP boards
arch/arm/boot/dts/armada-370-mirabox.dts | 7 ++++---
arch/arm/boot/dts/armada-370-rd.dts | 6 ++++--
arch/arm/boot/dts/armada-xp-axpwifiap.dts | 6 ++++--
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 12 +++++++-----
arch/arm/mach-mvebu/armada-370-xp.c | 6 ------
5 files changed, 19 insertions(+), 18 deletions(-)
--
1.8.3.2
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 1/3] ARM: mvebu: remove unneeded ->map_io field for Armada 370/XP 2014-02-11 17:07 [PATCH 0/3] Minor Armada 370/XP cleanups Thomas Petazzoni @ 2014-02-11 17:07 ` Thomas Petazzoni 2014-02-11 17:43 ` Gregory CLEMENT 2014-02-11 19:34 ` Jason Cooper 2014-02-11 17:07 ` [PATCH 2/3] ARM: mvebu: use GPIO DT defines in Armada 370/XP boards Thomas Petazzoni 2014-02-11 17:07 ` [PATCH 3/3] ARM: mvebu: use input " Thomas Petazzoni 2 siblings, 2 replies; 12+ messages in thread From: Thomas Petazzoni @ 2014-02-11 17:07 UTC (permalink / raw) To: linux-arm-kernel The ->map_io() implementation of Armada 370/XP simply calls debug_ll_io_init(), which is exactly what the kernel does when ->map_io is NULL. Therefore, there is no need to have a specific ->map_io() implementation in Armada 370/XP. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- arch/arm/mach-mvebu/armada-370-xp.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c index f6c9d1d..161cf2f 100644 --- a/arch/arm/mach-mvebu/armada-370-xp.c +++ b/arch/arm/mach-mvebu/armada-370-xp.c @@ -31,11 +31,6 @@ #include "coherency.h" #include "mvebu-soc-id.h" -static void __init armada_370_xp_map_io(void) -{ - debug_ll_io_init(); -} - static void __init armada_370_xp_timer_and_clk_init(void) { of_clk_init(NULL); @@ -90,7 +85,6 @@ static const char * const armada_370_xp_dt_compat[] = { DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)") .smp = smp_ops(armada_xp_smp_ops), .init_machine = armada_370_xp_dt_init, - .map_io = armada_370_xp_map_io, .init_time = armada_370_xp_timer_and_clk_init, .restart = mvebu_restart, .dt_compat = armada_370_xp_dt_compat, -- 1.8.3.2 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 1/3] ARM: mvebu: remove unneeded ->map_io field for Armada 370/XP 2014-02-11 17:07 ` [PATCH 1/3] ARM: mvebu: remove unneeded ->map_io field for Armada 370/XP Thomas Petazzoni @ 2014-02-11 17:43 ` Gregory CLEMENT 2014-02-11 19:34 ` Jason Cooper 1 sibling, 0 replies; 12+ messages in thread From: Gregory CLEMENT @ 2014-02-11 17:43 UTC (permalink / raw) To: linux-arm-kernel On 11/02/2014 18:07, Thomas Petazzoni wrote: > The ->map_io() implementation of Armada 370/XP simply calls > debug_ll_io_init(), which is exactly what the kernel does when > ->map_io is NULL. Therefore, there is no need to have a specific > ->map_io() implementation in Armada 370/XP. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> We missed it because the change made in arch/arm/mm/mmu.c was made in the same time than our change in arch/arm/mach-mvebu/armada-370-xp.c to use debug_ll_io_init(). Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> > --- > arch/arm/mach-mvebu/armada-370-xp.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c > index f6c9d1d..161cf2f 100644 > --- a/arch/arm/mach-mvebu/armada-370-xp.c > +++ b/arch/arm/mach-mvebu/armada-370-xp.c > @@ -31,11 +31,6 @@ > #include "coherency.h" > #include "mvebu-soc-id.h" > > -static void __init armada_370_xp_map_io(void) > -{ > - debug_ll_io_init(); > -} > - > static void __init armada_370_xp_timer_and_clk_init(void) > { > of_clk_init(NULL); > @@ -90,7 +85,6 @@ static const char * const armada_370_xp_dt_compat[] = { > DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)") > .smp = smp_ops(armada_xp_smp_ops), > .init_machine = armada_370_xp_dt_init, > - .map_io = armada_370_xp_map_io, > .init_time = armada_370_xp_timer_and_clk_init, > .restart = mvebu_restart, > .dt_compat = armada_370_xp_dt_compat, > -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/3] ARM: mvebu: remove unneeded ->map_io field for Armada 370/XP 2014-02-11 17:07 ` [PATCH 1/3] ARM: mvebu: remove unneeded ->map_io field for Armada 370/XP Thomas Petazzoni 2014-02-11 17:43 ` Gregory CLEMENT @ 2014-02-11 19:34 ` Jason Cooper 1 sibling, 0 replies; 12+ messages in thread From: Jason Cooper @ 2014-02-11 19:34 UTC (permalink / raw) To: linux-arm-kernel On Tue, Feb 11, 2014 at 06:07:11PM +0100, Thomas Petazzoni wrote: > The ->map_io() implementation of Armada 370/XP simply calls > debug_ll_io_init(), which is exactly what the kernel does when > ->map_io is NULL. Therefore, there is no need to have a specific > ->map_io() implementation in Armada 370/XP. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- > arch/arm/mach-mvebu/armada-370-xp.c | 6 ------ > 1 file changed, 6 deletions(-) Applied to mvebu/soc with Gregory's Ack. thx, Jason. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/3] ARM: mvebu: use GPIO DT defines in Armada 370/XP boards 2014-02-11 17:07 [PATCH 0/3] Minor Armada 370/XP cleanups Thomas Petazzoni 2014-02-11 17:07 ` [PATCH 1/3] ARM: mvebu: remove unneeded ->map_io field for Armada 370/XP Thomas Petazzoni @ 2014-02-11 17:07 ` Thomas Petazzoni 2014-02-11 17:44 ` Gregory CLEMENT ` (2 more replies) 2014-02-11 17:07 ` [PATCH 3/3] ARM: mvebu: use input " Thomas Petazzoni 2 siblings, 3 replies; 12+ messages in thread From: Thomas Petazzoni @ 2014-02-11 17:07 UTC (permalink / raw) To: linux-arm-kernel Instead of harcoding 0 and 1 for the gpio specifications in the Armada 370/XP boards, use the <dt-bindings/gpio/gpio.h> header file and its GPIO_ACTIVE_HIGH and GPIO_ACTIVE_LOW definitions. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- arch/arm/boot/dts/armada-370-mirabox.dts | 7 ++++--- arch/arm/boot/dts/armada-370-rd.dts | 3 ++- arch/arm/boot/dts/armada-xp-axpwifiap.dts | 3 ++- arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 9 +++++---- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts index 944e878..2354fe0 100644 --- a/arch/arm/boot/dts/armada-370-mirabox.dts +++ b/arch/arm/boot/dts/armada-370-mirabox.dts @@ -9,6 +9,7 @@ */ /dts-v1/; +#include <dt-bindings/gpio/gpio.h> #include "armada-370.dtsi" / { @@ -73,19 +74,19 @@ green_pwr_led { label = "mirabox:green:pwr"; - gpios = <&gpio1 31 1>; + gpios = <&gpio1 31 GPIO_ACTIVE_LOW>; default-state = "keep"; }; blue_stat_led { label = "mirabox:blue:stat"; - gpios = <&gpio2 0 1>; + gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; default-state = "off"; }; green_stat_led { label = "mirabox:green:stat"; - gpios = <&gpio2 1 1>; + gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; default-state = "off"; }; }; diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts index abbb807..c28865d 100644 --- a/arch/arm/boot/dts/armada-370-rd.dts +++ b/arch/arm/boot/dts/armada-370-rd.dts @@ -12,6 +12,7 @@ */ /dts-v1/; +#include <dt-bindings/gpio/gpio.h> #include "armada-370.dtsi" / { @@ -101,7 +102,7 @@ button at 1 { label = "Software Button"; linux,code = <116>; - gpios = <&gpio0 6 1>; + gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; }; }; diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts index c5fe572..db1ef58 100644 --- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts +++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts @@ -16,6 +16,7 @@ */ /dts-v1/; +#include <dt-bindings/gpio/gpio.h> #include "armada-xp-mv78230.dtsi" / { @@ -158,7 +159,7 @@ button at 1 { label = "Factory Reset Button"; linux,code = <141>; /* KEY_SETUP */ - gpios = <&gpio1 1 1>; + gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; }; }; }; diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts index 99bcf76..944acfb 100644 --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts @@ -11,6 +11,7 @@ */ /dts-v1/; +#include <dt-bindings/gpio/gpio.h> #include "armada-xp-mv78260.dtsi" / { @@ -90,19 +91,19 @@ red_led { label = "red_led"; - gpios = <&gpio1 17 1>; + gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; default-state = "off"; }; yellow_led { label = "yellow_led"; - gpios = <&gpio1 19 1>; + gpios = <&gpio1 19 GPIO_ACTIVE_LOW>; default-state = "off"; }; green_led { label = "green_led"; - gpios = <&gpio1 21 1>; + gpios = <&gpio1 21 GPIO_ACTIVE_LOW>; default-state = "keep"; }; }; @@ -115,7 +116,7 @@ button at 1 { label = "Init Button"; linux,code = <116>; - gpios = <&gpio1 28 0>; + gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>; }; }; -- 1.8.3.2 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/3] ARM: mvebu: use GPIO DT defines in Armada 370/XP boards 2014-02-11 17:07 ` [PATCH 2/3] ARM: mvebu: use GPIO DT defines in Armada 370/XP boards Thomas Petazzoni @ 2014-02-11 17:44 ` Gregory CLEMENT 2014-02-11 19:41 ` Jason Cooper 2014-02-12 7:49 ` Andrew Lunn 2 siblings, 0 replies; 12+ messages in thread From: Gregory CLEMENT @ 2014-02-11 17:44 UTC (permalink / raw) To: linux-arm-kernel On 11/02/2014 18:07, Thomas Petazzoni wrote: > Instead of harcoding 0 and 1 for the gpio specifications in the Armada > 370/XP boards, use the <dt-bindings/gpio/gpio.h> header file and its > GPIO_ACTIVE_HIGH and GPIO_ACTIVE_LOW definitions. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> > --- > arch/arm/boot/dts/armada-370-mirabox.dts | 7 ++++--- > arch/arm/boot/dts/armada-370-rd.dts | 3 ++- > arch/arm/boot/dts/armada-xp-axpwifiap.dts | 3 ++- > arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 9 +++++---- > 4 files changed, 13 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts > index 944e878..2354fe0 100644 > --- a/arch/arm/boot/dts/armada-370-mirabox.dts > +++ b/arch/arm/boot/dts/armada-370-mirabox.dts > @@ -9,6 +9,7 @@ > */ > > /dts-v1/; > +#include <dt-bindings/gpio/gpio.h> > #include "armada-370.dtsi" > > / { > @@ -73,19 +74,19 @@ > > green_pwr_led { > label = "mirabox:green:pwr"; > - gpios = <&gpio1 31 1>; > + gpios = <&gpio1 31 GPIO_ACTIVE_LOW>; > default-state = "keep"; > }; > > blue_stat_led { > label = "mirabox:blue:stat"; > - gpios = <&gpio2 0 1>; > + gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; > default-state = "off"; > }; > > green_stat_led { > label = "mirabox:green:stat"; > - gpios = <&gpio2 1 1>; > + gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; > default-state = "off"; > }; > }; > diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts > index abbb807..c28865d 100644 > --- a/arch/arm/boot/dts/armada-370-rd.dts > +++ b/arch/arm/boot/dts/armada-370-rd.dts > @@ -12,6 +12,7 @@ > */ > > /dts-v1/; > +#include <dt-bindings/gpio/gpio.h> > #include "armada-370.dtsi" > > / { > @@ -101,7 +102,7 @@ > button at 1 { > label = "Software Button"; > linux,code = <116>; > - gpios = <&gpio0 6 1>; > + gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; > }; > }; > > diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts > index c5fe572..db1ef58 100644 > --- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts > +++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts > @@ -16,6 +16,7 @@ > */ > > /dts-v1/; > +#include <dt-bindings/gpio/gpio.h> > #include "armada-xp-mv78230.dtsi" > > / { > @@ -158,7 +159,7 @@ > button at 1 { > label = "Factory Reset Button"; > linux,code = <141>; /* KEY_SETUP */ > - gpios = <&gpio1 1 1>; > + gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; > }; > }; > }; > diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts > index 99bcf76..944acfb 100644 > --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts > +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts > @@ -11,6 +11,7 @@ > */ > > /dts-v1/; > +#include <dt-bindings/gpio/gpio.h> > #include "armada-xp-mv78260.dtsi" > > / { > @@ -90,19 +91,19 @@ > > red_led { > label = "red_led"; > - gpios = <&gpio1 17 1>; > + gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; > default-state = "off"; > }; > > yellow_led { > label = "yellow_led"; > - gpios = <&gpio1 19 1>; > + gpios = <&gpio1 19 GPIO_ACTIVE_LOW>; > default-state = "off"; > }; > > green_led { > label = "green_led"; > - gpios = <&gpio1 21 1>; > + gpios = <&gpio1 21 GPIO_ACTIVE_LOW>; > default-state = "keep"; > }; > }; > @@ -115,7 +116,7 @@ > button at 1 { > label = "Init Button"; > linux,code = <116>; > - gpios = <&gpio1 28 0>; > + gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>; > }; > }; > > -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/3] ARM: mvebu: use GPIO DT defines in Armada 370/XP boards 2014-02-11 17:07 ` [PATCH 2/3] ARM: mvebu: use GPIO DT defines in Armada 370/XP boards Thomas Petazzoni 2014-02-11 17:44 ` Gregory CLEMENT @ 2014-02-11 19:41 ` Jason Cooper 2014-02-12 7:49 ` Andrew Lunn 2 siblings, 0 replies; 12+ messages in thread From: Jason Cooper @ 2014-02-11 19:41 UTC (permalink / raw) To: linux-arm-kernel On Tue, Feb 11, 2014 at 06:07:12PM +0100, Thomas Petazzoni wrote: > Instead of harcoding 0 and 1 for the gpio specifications in the Armada > 370/XP boards, use the <dt-bindings/gpio/gpio.h> header file and its > GPIO_ACTIVE_HIGH and GPIO_ACTIVE_LOW definitions. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- > arch/arm/boot/dts/armada-370-mirabox.dts | 7 ++++--- > arch/arm/boot/dts/armada-370-rd.dts | 3 ++- > arch/arm/boot/dts/armada-xp-axpwifiap.dts | 3 ++- > arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 9 +++++---- > 4 files changed, 13 insertions(+), 9 deletions(-) Patches 2 and 3 applied to mvebu/dt with Gregory's Ack's. thx, Jason. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/3] ARM: mvebu: use GPIO DT defines in Armada 370/XP boards 2014-02-11 17:07 ` [PATCH 2/3] ARM: mvebu: use GPIO DT defines in Armada 370/XP boards Thomas Petazzoni 2014-02-11 17:44 ` Gregory CLEMENT 2014-02-11 19:41 ` Jason Cooper @ 2014-02-12 7:49 ` Andrew Lunn 2014-02-12 9:24 ` Thomas Petazzoni 2 siblings, 1 reply; 12+ messages in thread From: Andrew Lunn @ 2014-02-12 7:49 UTC (permalink / raw) To: linux-arm-kernel On Tue, Feb 11, 2014 at 06:07:12PM +0100, Thomas Petazzoni wrote: > Instead of harcoding 0 and 1 for the gpio specifications in the Armada > 370/XP boards, use the <dt-bindings/gpio/gpio.h> header file and its > GPIO_ACTIVE_HIGH and GPIO_ACTIVE_LOW definitions. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- > arch/arm/boot/dts/armada-370-mirabox.dts | 7 ++++--- > arch/arm/boot/dts/armada-370-rd.dts | 3 ++- > arch/arm/boot/dts/armada-xp-axpwifiap.dts | 3 ++- > arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 9 +++++---- > 4 files changed, 13 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts > index 944e878..2354fe0 100644 > --- a/arch/arm/boot/dts/armada-370-mirabox.dts > +++ b/arch/arm/boot/dts/armada-370-mirabox.dts > @@ -9,6 +9,7 @@ > */ > > /dts-v1/; > +#include <dt-bindings/gpio/gpio.h> > #include "armada-370.dtsi" Hi Thomas What i did for kirkwood is include both gpio.h and input.h in kirkwood.dtsi. Quite a few other systems do that, rather than each .dts file having to include them. However i don't have a strong opinion. Andrew ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/3] ARM: mvebu: use GPIO DT defines in Armada 370/XP boards 2014-02-12 7:49 ` Andrew Lunn @ 2014-02-12 9:24 ` Thomas Petazzoni 2014-02-12 15:52 ` Jason Cooper 0 siblings, 1 reply; 12+ messages in thread From: Thomas Petazzoni @ 2014-02-12 9:24 UTC (permalink / raw) To: linux-arm-kernel Dear Andrew Lunn, On Wed, 12 Feb 2014 08:49:46 +0100, Andrew Lunn wrote: > What i did for kirkwood is include both gpio.h and input.h in > kirkwood.dtsi. Quite a few other systems do that, rather than each > .dts file having to include them. However i don't have a strong > opinion. Right, I don't have a strong opinion on this either. I did it this way because a few other .dts files for Armada boards (Netgear NAS) were already including these header files. I guess it is clearly something that can be factorized later on as the number of Armada boards needing this grows. Thanks! Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/3] ARM: mvebu: use GPIO DT defines in Armada 370/XP boards 2014-02-12 9:24 ` Thomas Petazzoni @ 2014-02-12 15:52 ` Jason Cooper 0 siblings, 0 replies; 12+ messages in thread From: Jason Cooper @ 2014-02-12 15:52 UTC (permalink / raw) To: linux-arm-kernel On Wed, Feb 12, 2014 at 10:24:48AM +0100, Thomas Petazzoni wrote: > Dear Andrew Lunn, > > On Wed, 12 Feb 2014 08:49:46 +0100, Andrew Lunn wrote: > > > What i did for kirkwood is include both gpio.h and input.h in > > kirkwood.dtsi. Quite a few other systems do that, rather than each > > .dts file having to include them. However i don't have a strong > > opinion. > > Right, I don't have a strong opinion on this either. I did it this way > because a few other .dts files for Armada boards (Netgear NAS) were > already including these header files. > > I guess it is clearly something that can be factorized later on as the > number of Armada boards needing this grows. Same here, it's cleaner, but it can wait for cleanups next window. thx, Jason. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/3] ARM: mvebu: use input DT defines in Armada 370/XP boards 2014-02-11 17:07 [PATCH 0/3] Minor Armada 370/XP cleanups Thomas Petazzoni 2014-02-11 17:07 ` [PATCH 1/3] ARM: mvebu: remove unneeded ->map_io field for Armada 370/XP Thomas Petazzoni 2014-02-11 17:07 ` [PATCH 2/3] ARM: mvebu: use GPIO DT defines in Armada 370/XP boards Thomas Petazzoni @ 2014-02-11 17:07 ` Thomas Petazzoni 2014-02-11 17:47 ` Gregory CLEMENT 2 siblings, 1 reply; 12+ messages in thread From: Thomas Petazzoni @ 2014-02-11 17:07 UTC (permalink / raw) To: linux-arm-kernel Instead of harcoding keycodes specifications in the Armada 370/XP boards, use the <dt-bindings/input/input.h> header file and its keycode definitions. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- arch/arm/boot/dts/armada-370-rd.dts | 3 ++- arch/arm/boot/dts/armada-xp-axpwifiap.dts | 3 ++- arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts index c28865d..3e2c857 100644 --- a/arch/arm/boot/dts/armada-370-rd.dts +++ b/arch/arm/boot/dts/armada-370-rd.dts @@ -12,6 +12,7 @@ */ /dts-v1/; +#include <dt-bindings/input/input.h> #include <dt-bindings/gpio/gpio.h> #include "armada-370.dtsi" @@ -101,7 +102,7 @@ #size-cells = <0>; button at 1 { label = "Software Button"; - linux,code = <116>; + linux,code = <KEY_POWER>; gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; }; }; diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts index db1ef58..d83d7d6 100644 --- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts +++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts @@ -17,6 +17,7 @@ /dts-v1/; #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> #include "armada-xp-mv78230.dtsi" / { @@ -158,7 +159,7 @@ button at 1 { label = "Factory Reset Button"; - linux,code = <141>; /* KEY_SETUP */ + linux,code = <KEY_SETUP>; gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; }; }; diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts index 944acfb..985948c 100644 --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts @@ -12,6 +12,7 @@ /dts-v1/; #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> #include "armada-xp-mv78260.dtsi" / { @@ -115,7 +116,7 @@ button at 1 { label = "Init Button"; - linux,code = <116>; + linux,code = <KEY_POWER>; gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>; }; }; -- 1.8.3.2 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/3] ARM: mvebu: use input DT defines in Armada 370/XP boards 2014-02-11 17:07 ` [PATCH 3/3] ARM: mvebu: use input " Thomas Petazzoni @ 2014-02-11 17:47 ` Gregory CLEMENT 0 siblings, 0 replies; 12+ messages in thread From: Gregory CLEMENT @ 2014-02-11 17:47 UTC (permalink / raw) To: linux-arm-kernel Hi Thomas, On 11/02/2014 18:07, Thomas Petazzoni wrote: > Instead of harcoding keycodes specifications in the Armada 370/XP > boards, use the <dt-bindings/input/input.h> header file and its > keycode definitions. It's easier to read now, Thanks, Gregory > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> > --- > arch/arm/boot/dts/armada-370-rd.dts | 3 ++- > arch/arm/boot/dts/armada-xp-axpwifiap.dts | 3 ++- > arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 3 ++- > 3 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts > index c28865d..3e2c857 100644 > --- a/arch/arm/boot/dts/armada-370-rd.dts > +++ b/arch/arm/boot/dts/armada-370-rd.dts > @@ -12,6 +12,7 @@ > */ > > /dts-v1/; > +#include <dt-bindings/input/input.h> > #include <dt-bindings/gpio/gpio.h> > #include "armada-370.dtsi" > > @@ -101,7 +102,7 @@ > #size-cells = <0>; > button at 1 { > label = "Software Button"; > - linux,code = <116>; > + linux,code = <KEY_POWER>; > gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; > }; > }; > diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts > index db1ef58..d83d7d6 100644 > --- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts > +++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts > @@ -17,6 +17,7 @@ > > /dts-v1/; > #include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/input/input.h> > #include "armada-xp-mv78230.dtsi" > > / { > @@ -158,7 +159,7 @@ > > button at 1 { > label = "Factory Reset Button"; > - linux,code = <141>; /* KEY_SETUP */ > + linux,code = <KEY_SETUP>; > gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; > }; > }; > diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts > index 944acfb..985948c 100644 > --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts > +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts > @@ -12,6 +12,7 @@ > > /dts-v1/; > #include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/input/input.h> > #include "armada-xp-mv78260.dtsi" > > / { > @@ -115,7 +116,7 @@ > > button at 1 { > label = "Init Button"; > - linux,code = <116>; > + linux,code = <KEY_POWER>; > gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>; > }; > }; > -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2014-02-12 15:52 UTC | newest] Thread overview: 12+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-02-11 17:07 [PATCH 0/3] Minor Armada 370/XP cleanups Thomas Petazzoni 2014-02-11 17:07 ` [PATCH 1/3] ARM: mvebu: remove unneeded ->map_io field for Armada 370/XP Thomas Petazzoni 2014-02-11 17:43 ` Gregory CLEMENT 2014-02-11 19:34 ` Jason Cooper 2014-02-11 17:07 ` [PATCH 2/3] ARM: mvebu: use GPIO DT defines in Armada 370/XP boards Thomas Petazzoni 2014-02-11 17:44 ` Gregory CLEMENT 2014-02-11 19:41 ` Jason Cooper 2014-02-12 7:49 ` Andrew Lunn 2014-02-12 9:24 ` Thomas Petazzoni 2014-02-12 15:52 ` Jason Cooper 2014-02-11 17:07 ` [PATCH 3/3] ARM: mvebu: use input " Thomas Petazzoni 2014-02-11 17:47 ` Gregory CLEMENT
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).