| Message ID | 1365106576-31816-6-git-send-email-jon-hunter@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Jon Hunter <jon-hunter@ti.com> [130404 13:21]: > Add the "ti,gpio-always-on" property to the appropriate GPIO banks to > indicate which banks are always powered and will never lose logic state. This patch should be queued by Benoit as this will likely cause pointless merge conflicts with the other .dts files. Regards, Tony > Cc: Benoit Cousson <b-cousson@ti.com> > Signed-off-by: Jon Hunter <jon-hunter@ti.com> > --- > arch/arm/boot/dts/omap2420.dtsi | 4 ++++ > arch/arm/boot/dts/omap2430.dtsi | 4 ++++ > arch/arm/boot/dts/omap3.dtsi | 1 + > arch/arm/boot/dts/omap4.dtsi | 1 + > arch/arm/boot/dts/omap5.dtsi | 1 + > 5 files changed, 11 insertions(+) > > diff --git a/arch/arm/boot/dts/omap2420.dtsi b/arch/arm/boot/dts/omap2420.dtsi > index 455b239..76446ff 100644 > --- a/arch/arm/boot/dts/omap2420.dtsi > +++ b/arch/arm/boot/dts/omap2420.dtsi > @@ -34,6 +34,7 @@ > reg = <0x48018000 0x200>; > interrupts = <29>; > ti,hwmods = "gpio1"; > + ti,gpio-always-on; > #gpio-cells = <2>; > gpio-controller; > #interrupt-cells = <2>; > @@ -45,6 +46,7 @@ > reg = <0x4801a000 0x200>; > interrupts = <30>; > ti,hwmods = "gpio2"; > + ti,gpio-always-on; > #gpio-cells = <2>; > gpio-controller; > #interrupt-cells = <2>; > @@ -56,6 +58,7 @@ > reg = <0x4801c000 0x200>; > interrupts = <31>; > ti,hwmods = "gpio3"; > + ti,gpio-always-on; > #gpio-cells = <2>; > gpio-controller; > #interrupt-cells = <2>; > @@ -67,6 +70,7 @@ > reg = <0x4801e000 0x200>; > interrupts = <32>; > ti,hwmods = "gpio4"; > + ti,gpio-always-on; > #gpio-cells = <2>; > gpio-controller; > #interrupt-cells = <2>; > diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi > index 477b120..ca2c4a3 100644 > --- a/arch/arm/boot/dts/omap2430.dtsi > +++ b/arch/arm/boot/dts/omap2430.dtsi > @@ -34,6 +34,7 @@ > reg = <0x4900c000 0x200>; > interrupts = <29>; > ti,hwmods = "gpio1"; > + ti,gpio-always-on; > #gpio-cells = <2>; > gpio-controller; > #interrupt-cells = <2>; > @@ -45,6 +46,7 @@ > reg = <0x4900e000 0x200>; > interrupts = <30>; > ti,hwmods = "gpio2"; > + ti,gpio-always-on; > #gpio-cells = <2>; > gpio-controller; > #interrupt-cells = <2>; > @@ -56,6 +58,7 @@ > reg = <0x49010000 0x200>; > interrupts = <31>; > ti,hwmods = "gpio3"; > + ti,gpio-always-on; > #gpio-cells = <2>; > gpio-controller; > #interrupt-cells = <2>; > @@ -67,6 +70,7 @@ > reg = <0x49012000 0x200>; > interrupts = <32>; > ti,hwmods = "gpio4"; > + ti,gpio-always-on; > #gpio-cells = <2>; > gpio-controller; > #interrupt-cells = <2>; > diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi > index 3344f05..626406f 100644 > --- a/arch/arm/boot/dts/omap3.dtsi > +++ b/arch/arm/boot/dts/omap3.dtsi > @@ -116,6 +116,7 @@ > reg = <0x48310000 0x200>; > interrupts = <29>; > ti,hwmods = "gpio1"; > + ti,gpio-always-on; > gpio-controller; > #gpio-cells = <2>; > interrupt-controller; > diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi > index 3329140..627f6ca 100644 > --- a/arch/arm/boot/dts/omap4.dtsi > +++ b/arch/arm/boot/dts/omap4.dtsi > @@ -140,6 +140,7 @@ > reg = <0x4a310000 0x200>; > interrupts = <0 29 0x4>; > ti,hwmods = "gpio1"; > + ti,gpio-always-on; > gpio-controller; > #gpio-cells = <2>; > interrupt-controller; > diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi > index f4c71d9..82a4b03 100644 > --- a/arch/arm/boot/dts/omap5.dtsi > +++ b/arch/arm/boot/dts/omap5.dtsi > @@ -133,6 +133,7 @@ > reg = <0x4ae10000 0x200>; > interrupts = <0 29 0x4>; > ti,hwmods = "gpio1"; > + ti,gpio-always-on; > gpio-controller; > #gpio-cells = <2>; > interrupt-controller; > -- > 1.7.10.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On 04/04/2013 03:35 PM, Tony Lindgren wrote: > * Jon Hunter <jon-hunter@ti.com> [130404 13:21]: >> Add the "ti,gpio-always-on" property to the appropriate GPIO banks to >> indicate which banks are always powered and will never lose logic state. > > This patch should be queued by Benoit as this will likely cause > pointless merge conflicts with the other .dts files. Yes agreed. I mentioned that in the cover-letter. Cheers Jon
* Jon Hunter <jon-hunter@ti.com> [130404 14:05]: > > On 04/04/2013 03:35 PM, Tony Lindgren wrote: > > * Jon Hunter <jon-hunter@ti.com> [130404 13:21]: > >> Add the "ti,gpio-always-on" property to the appropriate GPIO banks to > >> indicate which banks are always powered and will never lose logic state. > > > > This patch should be queued by Benoit as this will likely cause > > pointless merge conflicts with the other .dts files. > > Yes agreed. I mentioned that in the cover-letter. OK thanks. Tony
diff --git a/arch/arm/boot/dts/omap2420.dtsi b/arch/arm/boot/dts/omap2420.dtsi index 455b239..76446ff 100644 --- a/arch/arm/boot/dts/omap2420.dtsi +++ b/arch/arm/boot/dts/omap2420.dtsi @@ -34,6 +34,7 @@ reg = <0x48018000 0x200>; interrupts = <29>; ti,hwmods = "gpio1"; + ti,gpio-always-on; #gpio-cells = <2>; gpio-controller; #interrupt-cells = <2>; @@ -45,6 +46,7 @@ reg = <0x4801a000 0x200>; interrupts = <30>; ti,hwmods = "gpio2"; + ti,gpio-always-on; #gpio-cells = <2>; gpio-controller; #interrupt-cells = <2>; @@ -56,6 +58,7 @@ reg = <0x4801c000 0x200>; interrupts = <31>; ti,hwmods = "gpio3"; + ti,gpio-always-on; #gpio-cells = <2>; gpio-controller; #interrupt-cells = <2>; @@ -67,6 +70,7 @@ reg = <0x4801e000 0x200>; interrupts = <32>; ti,hwmods = "gpio4"; + ti,gpio-always-on; #gpio-cells = <2>; gpio-controller; #interrupt-cells = <2>; diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi index 477b120..ca2c4a3 100644 --- a/arch/arm/boot/dts/omap2430.dtsi +++ b/arch/arm/boot/dts/omap2430.dtsi @@ -34,6 +34,7 @@ reg = <0x4900c000 0x200>; interrupts = <29>; ti,hwmods = "gpio1"; + ti,gpio-always-on; #gpio-cells = <2>; gpio-controller; #interrupt-cells = <2>; @@ -45,6 +46,7 @@ reg = <0x4900e000 0x200>; interrupts = <30>; ti,hwmods = "gpio2"; + ti,gpio-always-on; #gpio-cells = <2>; gpio-controller; #interrupt-cells = <2>; @@ -56,6 +58,7 @@ reg = <0x49010000 0x200>; interrupts = <31>; ti,hwmods = "gpio3"; + ti,gpio-always-on; #gpio-cells = <2>; gpio-controller; #interrupt-cells = <2>; @@ -67,6 +70,7 @@ reg = <0x49012000 0x200>; interrupts = <32>; ti,hwmods = "gpio4"; + ti,gpio-always-on; #gpio-cells = <2>; gpio-controller; #interrupt-cells = <2>; diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index 3344f05..626406f 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi @@ -116,6 +116,7 @@ reg = <0x48310000 0x200>; interrupts = <29>; ti,hwmods = "gpio1"; + ti,gpio-always-on; gpio-controller; #gpio-cells = <2>; interrupt-controller; diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index 3329140..627f6ca 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -140,6 +140,7 @@ reg = <0x4a310000 0x200>; interrupts = <0 29 0x4>; ti,hwmods = "gpio1"; + ti,gpio-always-on; gpio-controller; #gpio-cells = <2>; interrupt-controller; diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi index f4c71d9..82a4b03 100644 --- a/arch/arm/boot/dts/omap5.dtsi +++ b/arch/arm/boot/dts/omap5.dtsi @@ -133,6 +133,7 @@ reg = <0x4ae10000 0x200>; interrupts = <0 29 0x4>; ti,hwmods = "gpio1"; + ti,gpio-always-on; gpio-controller; #gpio-cells = <2>; interrupt-controller;
Add the "ti,gpio-always-on" property to the appropriate GPIO banks to indicate which banks are always powered and will never lose logic state. Cc: Benoit Cousson <b-cousson@ti.com> Signed-off-by: Jon Hunter <jon-hunter@ti.com> --- arch/arm/boot/dts/omap2420.dtsi | 4 ++++ arch/arm/boot/dts/omap2430.dtsi | 4 ++++ arch/arm/boot/dts/omap3.dtsi | 1 + arch/arm/boot/dts/omap4.dtsi | 1 + arch/arm/boot/dts/omap5.dtsi | 1 + 5 files changed, 11 insertions(+)