Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758107Ab3FCORA (ORCPT ); Mon, 3 Jun 2013 10:17:00 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:45640 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755177Ab3FCOQ6 (ORCPT ); Mon, 3 Jun 2013 10:16:58 -0400 Message-ID: <51ACA533.8080904@ti.com> Date: Mon, 3 Jun 2013 16:16:19 +0200 From: Benoit Cousson Organization: Texas Instruments User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130510 Thunderbird/17.0.6 MIME-Version: 1.0 To: Dan Murphy CC: , , , , , Subject: Re: [PATCH v10 1/2] ARM: dts: omap4-panda: Update the LED support for the panda DTS References: <1370015095-26746-1-git-send-email-dmurphy@ti.com> In-Reply-To: <1370015095-26746-1-git-send-email-dmurphy@ti.com> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3109 Lines: 110 Hi Dan, On 05/31/2013 05:44 PM, Dan Murphy wrote: > The GPIO for LED D1 on the omap4-panda a1-a3 rev and the omap4-panda-es > are different. > > A1-A3 = gpio_wk7 > ES = gpio_110 > > There is no change to LED D2 > > Abstract away the pinmux and the LED definitions for the two boards into > the respective DTS files. > > Signed-off-by: Dan Murphy Thanks, I've just applied it in my branch. Regards, Benoit > --- > v10 - Update gpio entries to use gpio macros - https://patchwork.kernel.org/patch/2644561/ > v9 - Removed comments for mux config - https://patchwork.kernel.org/patch/2644391/ > v8 - Rebase to latest and use pinctrl macros - https://patchwork.kernel.org/patch/2629351/ > v7 - Update headline to add spaces - https://patchwork.kernel.org/patch/2583661/ > v6 - Review comments updated - https://patchwork.kernel.org/patch/2582771/ > v5 - Provide pincrtl phandle to the gpio-led driver - https://patchwork.kernel.org/patch/2573981/ > arch/arm/boot/dts/omap4-panda-common.dtsi | 16 +++++++++++++++- > arch/arm/boot/dts/omap4-panda-es.dts | 28 ++++++++++++++++++++++++++++ > 2 files changed, 43 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi > index d5d144a..800fa4e 100644 > --- a/arch/arm/boot/dts/omap4-panda-common.dtsi > +++ b/arch/arm/boot/dts/omap4-panda-common.dtsi > @@ -16,8 +16,13 @@ > reg = <0x80000000 0x40000000>; /* 1 GB */ > }; > > - leds { > + leds: leds { > compatible = "gpio-leds"; > + pinctrl-names = "default"; > + pinctrl-0 = < > + &led_wkgpio_pins > + >; > + > heartbeat { > label = "pandaboard::status1"; > gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; > @@ -157,6 +162,15 @@ > }; > }; > > +&omap4_pmx_wkup { > + led_wkgpio_pins: pinmux_leds_wkpins { > + pinctrl-single,pins = < > + 0x1a (PIN_OUTPUT | MUX_MODE3) /* gpio_wk7 */ > + 0x1c (PIN_OUTPUT | MUX_MODE3) /* gpio_wk8 */ > + >; > + }; > +}; > + > &i2c1 { > pinctrl-names = "default"; > pinctrl-0 = <&i2c1_pins>; > diff --git a/arch/arm/boot/dts/omap4-panda-es.dts b/arch/arm/boot/dts/omap4-panda-es.dts > index 5cfdf19..56c4354 100644 > --- a/arch/arm/boot/dts/omap4-panda-es.dts > +++ b/arch/arm/boot/dts/omap4-panda-es.dts > @@ -34,3 +34,31 @@ > 0x5e (PIN_INPUT | MUX_MODE0) /* hdmi_sda.hdmi_sda */ > >; > }; > + > +&omap4_pmx_core { > + led_gpio_pins: gpio_led_pmx { > + pinctrl-single,pins = < > + 0xb6 (PIN_OUTPUT | MUX_MODE3) /* gpio_110 */ > + >; > + }; > +}; > + > +&led_wkgpio_pins { > + pinctrl-single,pins = < > + 0x1c (PIN_OUTPUT | MUX_MODE3) /* gpio_wk8 */ > + >; > +}; > + > +&leds { > + pinctrl-0 = < > + &led_gpio_pins > + &led_wkgpio_pins > + >; > + > + heartbeat { > + gpios = <&gpio4 14 GPIO_ACTIVE_HIGH>; > + }; > + mmc { > + gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; > + }; > +}; > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/