| Message ID | 1438368120-23860-1-git-send-email-kaloz@openwrt.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi guys, Just noticed this never got neither merged or declined ;) It should still apply, but if needed, I can refresh it and send a v2. Best, Imre On Fri, 31 Jul 2015 20:42:00 +0200, Imre Kaloz <kaloz@openwrt.org> wrote: > Some of the GPIO configs were wrong in the submitted DTS files, > this patch fixes all affected boards. > > Signed-off-by: Imre Kaloz <kaloz@openwrt.org> > > Cc: <stable@vger.kernel.org> # v4.1 + > --- > arch/arm/boot/dts/armada-385-linksys.dtsi | 6 +++--- > arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi > b/arch/arm/boot/dts/armada-385-linksys.dtsi > index 74a9c6b..1b0075f 100644 > --- a/arch/arm/boot/dts/armada-385-linksys.dtsi > +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi > @@ -243,7 +243,7 @@ > button@2 { > label = "Factory Reset Button"; > linux,code = <KEY_RESTART>; > - gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; > + gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; > }; > }; > @@ -258,7 +258,7 @@ > }; > sata { > - gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>; > + gpios = <&gpio1 22 GPIO_ACTIVE_LOW>; > default-state = "off"; > }; > }; > @@ -311,7 +311,7 @@ > &pinctrl { > keys_pin: keys-pin { > - marvell,pins = "mpp24", "mpp47"; > + marvell,pins = "mpp24", "mpp29"; > marvell,function = "gpio"; > }; > diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts > b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts > index fdd187c..e767735 100644 > --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts > +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts > @@ -302,13 +302,13 @@ > button@1 { > label = "WPS"; > linux,code = <KEY_WPS_BUTTON>; > - gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>; > + gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; > }; > button@2 { > label = "Factory Reset Button"; > linux,code = <KEY_RESTART>; > - gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>; > + gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; > }; > };
Hi Imre, On mer., mars 30 2016, "Imre Kaloz" <kaloz@openwrt.org> wrote: > Hi guys, > > Just noticed this never got neither merged or declined ;) Thanks for the reminder. The patch was sent the day I did the pull request, maybe that's why I missed it. Except that, I see no reason to not having appled it. Sorry for that. > > It should still apply, but if needed, I can refresh it and send a v2. Now it is applied on mvebu/dt Thanks, Gregory > > > Best, > > Imre > > On Fri, 31 Jul 2015 20:42:00 +0200, Imre Kaloz <kaloz@openwrt.org> wrote: > >> Some of the GPIO configs were wrong in the submitted DTS files, >> this patch fixes all affected boards. >> >> Signed-off-by: Imre Kaloz <kaloz@openwrt.org> >> >> Cc: <stable@vger.kernel.org> # v4.1 + >> --- >> arch/arm/boot/dts/armada-385-linksys.dtsi | 6 +++--- >> arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 4 ++-- >> 2 files changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi >> b/arch/arm/boot/dts/armada-385-linksys.dtsi >> index 74a9c6b..1b0075f 100644 >> --- a/arch/arm/boot/dts/armada-385-linksys.dtsi >> +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi >> @@ -243,7 +243,7 @@ >> button@2 { >> label = "Factory Reset Button"; >> linux,code = <KEY_RESTART>; >> - gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; >> + gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; >> }; >> }; >> @@ -258,7 +258,7 @@ >> }; >> sata { >> - gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>; >> + gpios = <&gpio1 22 GPIO_ACTIVE_LOW>; >> default-state = "off"; >> }; >> }; >> @@ -311,7 +311,7 @@ >> &pinctrl { >> keys_pin: keys-pin { >> - marvell,pins = "mpp24", "mpp47"; >> + marvell,pins = "mpp24", "mpp29"; >> marvell,function = "gpio"; >> }; >> diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts >> b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts >> index fdd187c..e767735 100644 >> --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts >> +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts >> @@ -302,13 +302,13 @@ >> button@1 { >> label = "WPS"; >> linux,code = <KEY_WPS_BUTTON>; >> - gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>; >> + gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; >> }; >> button@2 { >> label = "Factory Reset Button"; >> linux,code = <KEY_RESTART>; >> - gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>; >> + gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; >> }; >> };
Hi Gregory,
On Wed, 30 Mar 2016 11:32:31 +0200, Gregory CLEMENT
<gregory.clement@free-electrons.com> wrote:
> Now it is applied on mvebu/dt
Thank you very much. I'll send another patch to handle the WRT1900ACS (aka
Shelby) today then. It's pretty much the same as the Cobra, I hope the
mwlwifi driver will be merged soon and I can submit the bindings for that
as well.
Imre
diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi index 74a9c6b..1b0075f 100644 --- a/arch/arm/boot/dts/armada-385-linksys.dtsi +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi @@ -243,7 +243,7 @@ button@2 { label = "Factory Reset Button"; linux,code = <KEY_RESTART>; - gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; + gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; }; }; @@ -258,7 +258,7 @@ }; sata { - gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>; + gpios = <&gpio1 22 GPIO_ACTIVE_LOW>; default-state = "off"; }; }; @@ -311,7 +311,7 @@ &pinctrl { keys_pin: keys-pin { - marvell,pins = "mpp24", "mpp47"; + marvell,pins = "mpp24", "mpp29"; marvell,function = "gpio"; }; diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts index fdd187c..e767735 100644 --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts @@ -302,13 +302,13 @@ button@1 { label = "WPS"; linux,code = <KEY_WPS_BUTTON>; - gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>; + gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; }; button@2 { label = "Factory Reset Button"; linux,code = <KEY_RESTART>; - gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>; + gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; }; };
Some of the GPIO configs were wrong in the submitted DTS files, this patch fixes all affected boards. Signed-off-by: Imre Kaloz <kaloz@openwrt.org> Cc: <stable@vger.kernel.org> # v4.1 + --- arch/arm/boot/dts/armada-385-linksys.dtsi | 6 +++--- arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)