From: Benoit Cousson <b-cousson@ti.com> To: grant.likely@secretlab.ca, tony@atomide.com Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, khilman@ti.com, devicetree-discuss@lists.ozlabs.org, manjugk@ti.com, Benoit Cousson <b-cousson@ti.com>, Charulatha V <charu@ti.com> Subject: [RFC PATCH 09/10] arm/dts: OMAP4: Add gpio nodes Date: Wed, 24 Aug 2011 15:09:15 +0200 [thread overview] Message-ID: <1314191356-10963-10-git-send-email-b-cousson@ti.com> (raw) In-Reply-To: <1314191356-10963-1-git-send-email-b-cousson@ti.com> Add the 6 GPIOs controller nodes. Since the GPIO driver is still under cleanup, a couple of temp hacks are needed. They will be removed as soon as the driver will be cleaned. Remove gpio static device initialisation if CONFIG_OF is defined. Signed-off-by: Benoit Cousson <b-cousson@ti.com> Cc: Grant Likely <grant.likely@secretlab.ca> Cc: Charulatha V <charu@ti.com> --- arch/arm/boot/dts/omap4.dtsi | 69 ++++++++++++++++++++++++++++++++++++++++++ arch/arm/mach-omap2/gpio.c | 2 + 2 files changed, 71 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index 231d7b4..f672927 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -110,5 +110,74 @@ compatible = "ti,omap-spinlock"; hwmods = "spinlock"; }; + + gpio1: gpio@1 { + compatible = "ti,omap4-gpio", "ti,omap-gpio"; + hwmods = "gpio1"; + /* id should not be needed with a global GPIO parent */ + id = <1>; + bank_width = <32>; + debounce; + /* XXX: big hack until the bank_count is removed */ + bank_count = <6>; + no_idle_on_suspend; + #gpio-cells = <2>; + gpio-controller; + }; + + gpio2: gpio@2 { + compatible = "ti,omap4-gpio", "ti,omap-gpio"; + hwmods = "gpio2"; + id = <2>; + bank_width = <32>; + debounce; + no_idle_on_suspend; + #gpio-cells = <2>; + gpio-controller; + }; + + gpio3: gpio@3 { + compatible = "ti,omap4-gpio", "ti,omap-gpio"; + hwmods = "gpio3"; + id = <3>; + bank_width = <32>; + debounce; + no_idle_on_suspend; + #gpio-cells = <2>; + gpio-controller; + }; + + gpio4: gpio@4 { + compatible = "ti,omap4-gpio", "ti,omap-gpio"; + hwmods = "gpio4"; + id = <4>; + bank_width = <32>; + debounce; + no_idle_on_suspend; + #gpio-cells = <2>; + gpio-controller; + }; + + gpio5: gpio@5 { + compatible = "ti,omap4-gpio", "ti,omap-gpio"; + hwmods = "gpio5"; + id = <5>; + bank_width = <32>; + debounce; + no_idle_on_suspend; + #gpio-cells = <2>; + gpio-controller; + }; + + gpio6: gpio@6 { + compatible = "ti,omap4-gpio", "ti,omap-gpio"; + hwmods = "gpio6"; + id = <6>; + bank_width = <32>; + debounce; + no_idle_on_suspend; + #gpio-cells = <2>; + gpio-controller; + }; }; }; diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c index 8cbfbc2..c51e952 100644 --- a/arch/arm/mach-omap2/gpio.c +++ b/arch/arm/mach-omap2/gpio.c @@ -16,6 +16,7 @@ * GNU General Public License for more details. */ +#ifndef CONFIG_OF #include <linux/gpio.h> #include <linux/err.h> #include <linux/slab.h> @@ -126,3 +127,4 @@ static int __init omap2_gpio_init(void) NULL); } postcore_initcall(omap2_gpio_init); +#endif -- 1.7.0.4
WARNING: multiple messages have this Message-ID (diff)
From: b-cousson@ti.com (Benoit Cousson) To: linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH 09/10] arm/dts: OMAP4: Add gpio nodes Date: Wed, 24 Aug 2011 15:09:15 +0200 [thread overview] Message-ID: <1314191356-10963-10-git-send-email-b-cousson@ti.com> (raw) In-Reply-To: <1314191356-10963-1-git-send-email-b-cousson@ti.com> Add the 6 GPIOs controller nodes. Since the GPIO driver is still under cleanup, a couple of temp hacks are needed. They will be removed as soon as the driver will be cleaned. Remove gpio static device initialisation if CONFIG_OF is defined. Signed-off-by: Benoit Cousson <b-cousson@ti.com> Cc: Grant Likely <grant.likely@secretlab.ca> Cc: Charulatha V <charu@ti.com> --- arch/arm/boot/dts/omap4.dtsi | 69 ++++++++++++++++++++++++++++++++++++++++++ arch/arm/mach-omap2/gpio.c | 2 + 2 files changed, 71 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index 231d7b4..f672927 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -110,5 +110,74 @@ compatible = "ti,omap-spinlock"; hwmods = "spinlock"; }; + + gpio1: gpio at 1 { + compatible = "ti,omap4-gpio", "ti,omap-gpio"; + hwmods = "gpio1"; + /* id should not be needed with a global GPIO parent */ + id = <1>; + bank_width = <32>; + debounce; + /* XXX: big hack until the bank_count is removed */ + bank_count = <6>; + no_idle_on_suspend; + #gpio-cells = <2>; + gpio-controller; + }; + + gpio2: gpio at 2 { + compatible = "ti,omap4-gpio", "ti,omap-gpio"; + hwmods = "gpio2"; + id = <2>; + bank_width = <32>; + debounce; + no_idle_on_suspend; + #gpio-cells = <2>; + gpio-controller; + }; + + gpio3: gpio at 3 { + compatible = "ti,omap4-gpio", "ti,omap-gpio"; + hwmods = "gpio3"; + id = <3>; + bank_width = <32>; + debounce; + no_idle_on_suspend; + #gpio-cells = <2>; + gpio-controller; + }; + + gpio4: gpio at 4 { + compatible = "ti,omap4-gpio", "ti,omap-gpio"; + hwmods = "gpio4"; + id = <4>; + bank_width = <32>; + debounce; + no_idle_on_suspend; + #gpio-cells = <2>; + gpio-controller; + }; + + gpio5: gpio at 5 { + compatible = "ti,omap4-gpio", "ti,omap-gpio"; + hwmods = "gpio5"; + id = <5>; + bank_width = <32>; + debounce; + no_idle_on_suspend; + #gpio-cells = <2>; + gpio-controller; + }; + + gpio6: gpio at 6 { + compatible = "ti,omap4-gpio", "ti,omap-gpio"; + hwmods = "gpio6"; + id = <6>; + bank_width = <32>; + debounce; + no_idle_on_suspend; + #gpio-cells = <2>; + gpio-controller; + }; }; }; diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c index 8cbfbc2..c51e952 100644 --- a/arch/arm/mach-omap2/gpio.c +++ b/arch/arm/mach-omap2/gpio.c @@ -16,6 +16,7 @@ * GNU General Public License for more details. */ +#ifndef CONFIG_OF #include <linux/gpio.h> #include <linux/err.h> #include <linux/slab.h> @@ -126,3 +127,4 @@ static int __init omap2_gpio_init(void) NULL); } postcore_initcall(omap2_gpio_init); +#endif -- 1.7.0.4
next prev parent reply other threads:[~2011-08-24 13:09 UTC|newest] Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-08-24 13:09 [RFC PATCH 00/10] OMAP: Add DT support for early init OMAP4 devices Benoit Cousson 2011-08-24 13:09 ` Benoit Cousson [not found] ` <1314191356-10963-1-git-send-email-b-cousson-l0cyMroinI0@public.gmane.org> 2011-08-24 13:09 ` [RFC PATCH 01/10] OMAP2+: l3-noc: Add support for device-tree Benoit Cousson 2011-08-24 13:09 ` Benoit Cousson 2011-09-08 18:01 ` Grant Likely 2011-09-08 18:01 ` Grant Likely [not found] ` <20110908180148.GA2967-e0URQFbLeQY2iJbIjFUEsiwD8/FfD2ys@public.gmane.org> 2011-09-08 21:59 ` Cousson, Benoit 2011-09-08 21:59 ` Cousson, Benoit 2011-09-08 23:35 ` Grant Likely 2011-09-08 23:35 ` Grant Likely 2011-08-24 13:09 ` [RFC PATCH 02/10] arm/dts: OMAP4: Add a main ocp entry bound to l3-noc driver Benoit Cousson 2011-08-24 13:09 ` Benoit Cousson [not found] ` <1314191356-10963-3-git-send-email-b-cousson-l0cyMroinI0@public.gmane.org> 2011-09-08 18:03 ` Grant Likely 2011-09-08 18:03 ` Grant Likely 2011-09-09 0:10 ` Cousson, Benoit 2011-09-09 0:10 ` Cousson, Benoit 2011-09-09 2:41 ` Grant Likely 2011-09-09 2:41 ` Grant Likely 2011-08-24 13:09 ` [RFC PATCH 03/10] documentation/dt: Add l3-noc bindings Benoit Cousson 2011-08-24 13:09 ` Benoit Cousson 2011-09-08 18:06 ` Grant Likely 2011-09-08 18:06 ` Grant Likely 2011-09-09 0:18 ` Cousson, Benoit 2011-09-09 0:18 ` Cousson, Benoit 2011-08-24 13:09 ` [RFC PATCH 06/10] hwspinlock: OMAP4: Add spinlock support in DT Benoit Cousson 2011-08-24 13:09 ` Benoit Cousson 2011-09-07 19:58 ` Ohad Ben-Cohen 2011-09-07 19:58 ` Ohad Ben-Cohen 2011-09-08 7:14 ` Cousson, Benoit 2011-09-08 7:14 ` Cousson, Benoit 2011-09-08 7:56 ` Ohad Ben-Cohen 2011-09-08 7:56 ` Ohad Ben-Cohen 2011-09-08 8:07 ` Cousson, Benoit 2011-09-08 8:07 ` Cousson, Benoit 2011-09-08 8:11 ` Ohad Ben-Cohen 2011-09-08 8:11 ` Ohad Ben-Cohen 2011-09-08 14:47 ` Arnd Bergmann 2011-09-08 14:47 ` Arnd Bergmann 2011-09-08 15:34 ` Cousson, Benoit 2011-09-08 15:34 ` Cousson, Benoit [not found] ` <4E68E09B.4050006-l0cyMroinI0@public.gmane.org> 2011-09-08 16:03 ` Arnd Bergmann 2011-09-08 16:03 ` Arnd Bergmann [not found] ` <201109081647.55377.arnd-r2nGTMty4D4@public.gmane.org> 2011-09-08 16:36 ` Ohad Ben-Cohen 2011-09-08 16:36 ` Ohad Ben-Cohen 2011-09-09 12:58 ` Arnd Bergmann 2011-09-09 12:58 ` Arnd Bergmann 2011-09-11 7:57 ` Ohad Ben-Cohen 2011-09-11 7:57 ` Ohad Ben-Cohen 2011-09-12 14:32 ` Arnd Bergmann 2011-09-12 14:32 ` Arnd Bergmann 2011-08-24 13:09 ` [RFC PATCH 04/10] arm/dts: OMAP4: Add mpu, dsp and iva nodes Benoit Cousson 2011-08-24 13:09 ` Benoit Cousson [not found] ` <1314191356-10963-5-git-send-email-b-cousson-l0cyMroinI0@public.gmane.org> 2011-09-08 18:07 ` Grant Likely 2011-09-08 18:07 ` Grant Likely 2011-08-24 13:09 ` [RFC PATCH 05/10] documentation/dt: Add mpu, dsp and iva bindings Benoit Cousson 2011-08-24 13:09 ` Benoit Cousson [not found] ` <1314191356-10963-6-git-send-email-b-cousson-l0cyMroinI0@public.gmane.org> 2011-09-08 18:09 ` Grant Likely 2011-09-08 18:09 ` Grant Likely 2011-09-09 0:30 ` Cousson, Benoit 2011-09-09 0:30 ` Cousson, Benoit 2011-09-09 2:40 ` Grant Likely 2011-09-09 2:40 ` Grant Likely 2011-08-24 13:09 ` [RFC PATCH 07/10] documentation/dt: Add spinlock bindings Benoit Cousson 2011-08-24 13:09 ` Benoit Cousson [not found] ` <1314191356-10963-8-git-send-email-b-cousson-l0cyMroinI0@public.gmane.org> 2011-09-08 18:10 ` Grant Likely 2011-09-08 18:10 ` Grant Likely 2011-09-09 0:32 ` Cousson, Benoit 2011-09-09 0:32 ` Cousson, Benoit 2011-08-24 13:09 ` [RFC PATCH 08/10] gpio/omap: Adapt GPIO driver to DT Benoit Cousson 2011-08-24 13:09 ` Benoit Cousson [not found] ` <1314191356-10963-9-git-send-email-b-cousson-l0cyMroinI0@public.gmane.org> 2011-09-08 18:15 ` Grant Likely 2011-09-08 18:15 ` Grant Likely 2011-09-09 1:48 ` Cousson, Benoit 2011-09-09 1:48 ` Cousson, Benoit 2011-08-24 13:09 ` Benoit Cousson [this message] 2011-08-24 13:09 ` [RFC PATCH 09/10] arm/dts: OMAP4: Add gpio nodes Benoit Cousson [not found] ` <1314191356-10963-10-git-send-email-b-cousson-l0cyMroinI0@public.gmane.org> 2011-09-08 18:16 ` Grant Likely 2011-09-08 18:16 ` Grant Likely 2011-08-24 13:09 ` [RFC PATCH 10/10] documentation/dt: Add OMAP GPIO properties Benoit Cousson 2011-08-24 13:09 ` Benoit Cousson [not found] ` <1314191356-10963-11-git-send-email-b-cousson-l0cyMroinI0@public.gmane.org> 2011-09-08 18:18 ` Grant Likely 2011-09-08 18:18 ` Grant Likely 2011-09-09 1:51 ` Cousson, Benoit 2011-09-09 1:51 ` Cousson, Benoit
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1314191356-10963-10-git-send-email-b-cousson@ti.com \ --to=b-cousson@ti.com \ --cc=charu@ti.com \ --cc=devicetree-discuss@lists.ozlabs.org \ --cc=grant.likely@secretlab.ca \ --cc=khilman@ti.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=manjugk@ti.com \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.