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 <[email protected]>
---
arch/arm/boot/dts/omap4-panda-common.dtsi | 22 ++++++++++++++++++-
arch/arm/boot/dts/omap4-panda-es.dts | 33 +++++++++++++++++++++++++++++
2 files changed, 54 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
index 03bd60d..0c48f6b 100644
--- a/arch/arm/boot/dts/omap4-panda-common.dtsi
+++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
@@ -16,7 +16,7 @@
reg = <0x80000000 0x40000000>; /* 1 GB */
};
- leds {
+ leds: leds {
compatible = "gpio-leds";
heartbeat {
label = "pandaboard::status1";
@@ -64,6 +64,7 @@
&mcbsp1_pins
&dss_hdmi_pins
&tpd12s015_pins
+ &led_gpio_pins
>;
twl6040_pins: pinmux_twl6040_pins {
@@ -135,6 +136,25 @@
0xf0 0x118 /* i2c4_sda PULLUP | INPUTENABLE | MODE0 */
>;
};
+
+ led_gpio_pins: pinmux_leds_pins {
+ pinctrl-single,pins = <
+ >;
+ };
+};
+
+&omap4_pmx_wkup {
+ pinctrl-names = "default";
+ pinctrl-0 = <
+ &led_wkgpio_pins
+ >;
+
+ led_wkgpio_pins: pinmux_leds_wkpins {
+ pinctrl-single,pins = <
+ 0x1a 0x3 /* gpio_wk7 OUTPUT | MODE 3 */
+ 0x1c 0x3 /* gpio_wk8 OUTPUT | MODE 3 */
+ >;
+ };
};
&i2c1 {
diff --git a/arch/arm/boot/dts/omap4-panda-es.dts b/arch/arm/boot/dts/omap4-panda-es.dts
index f1d8c21..565d37e 100644
--- a/arch/arm/boot/dts/omap4-panda-es.dts
+++ b/arch/arm/boot/dts/omap4-panda-es.dts
@@ -34,3 +34,36 @@
0x5e 0x100 /* hdmi_sda.hdmi_sda INPUT | MODE 0 */
>;
};
+
+&leds {
+ compatible = "gpio-leds";
+ heartbeat {
+ label = "pandaboard::status1";
+ gpios = <&gpio4 14 0>;
+ linux,default-trigger = "heartbeat";
+ };
+ mmc {
+ label = "pandaboard::status2";
+ gpios = <&gpio1 8 0>;
+ linux,default-trigger = "gpio";
+ };
+};
+
+&led_gpio_pins {
+ pinctrl-single,pins = <
+ 0xb6 0x3 /* gpio_110 OUTPUT | MODE 3 */
+ >;
+};
+
+&omap4_pmx_wkup {
+ pinctrl-names = "default";
+ pinctrl-0 = <
+ &led_wkgpio_pins
+ >;
+
+ led_wkgpio_pins: pinmux_leds_wkpins {
+ pinctrl-single,pins = <
+ 0x1c 0x3 /* gpio_wk8 OUTPUT | MODE 3 */
+ >;
+ };
+};
--
1.7.9.5
On 04/17/2013 10:16 PM, Dan Murphy wrote:
> The GPIO for LED D1 on the omap4-panda a1-a3 rev and the omap4-panda-es
> are different.
(..)
> diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
> index 03bd60d..0c48f6b 100644
> --- a/arch/arm/boot/dts/omap4-panda-common.dtsi
> +++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
(..)
> @@ -135,6 +136,25 @@
> 0xf0 0x118 /* i2c4_sda PULLUP | INPUTENABLE | MODE0 */
> >;
> };
> +
> + led_gpio_pins: pinmux_leds_pins {
> + pinctrl-single,pins = <
> + >;
> + };
> +};
Hi,
FYI, there was a recent discussion precisely on this topic, where Tomy
suggested to remove the empty section:
http://marc.info/?l=linux-omap&m=136546635409232&w=2
Apart from that, I just tested your patch on top of Tomy's
omap-for-v3.10/dt branch and it is working fine for me on PandaBoards
EA3, A4 and ES.
Tested-by: Vincent Stehl? <[email protected]>
Best regards,
V.
On 04/18/2013 04:30 AM, Vincent Stehl? wrote:
> On 04/17/2013 10:16 PM, Dan Murphy wrote:
>> The GPIO for LED D1 on the omap4-panda a1-a3 rev and the omap4-panda-es
>> are different.
> (..)
>> diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
>> index 03bd60d..0c48f6b 100644
>> --- a/arch/arm/boot/dts/omap4-panda-common.dtsi
>> +++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
> (..)
>> @@ -135,6 +136,25 @@
>> 0xf0 0x118 /* i2c4_sda PULLUP | INPUTENABLE | MODE0 */
>> >;
>> };
>> +
>> + led_gpio_pins: pinmux_leds_pins {
>> + pinctrl-single,pins = <
>> + >;
>> + };
>> +};
> Hi,
>
> FYI, there was a recent discussion precisely on this topic, where Tomy
> suggested to remove the empty section:
> http://marc.info/?l=linux-omap&m=136546635409232&w=2
>
> Apart from that, I just tested your patch on top of Tomy's
> omap-for-v3.10/dt branch and it is working fine for me on PandaBoards
> EA3, A4 and ES.
>
> Tested-by: Vincent Stehl? <[email protected]>
>
> Best regards,
>
> V.
>
Thanks for testing Vincent
Is there a way to append the data to an already existing node?
I do not see a clean way.
Dan
--
----------------------------------------------
Dan Murphy
* Dan Murphy <[email protected]> [130418 11:35]:
> On 04/18/2013 04:30 AM, Vincent Stehlé wrote:
> >On 04/17/2013 10:16 PM, Dan Murphy wrote:
> >>The GPIO for LED D1 on the omap4-panda a1-a3 rev and the omap4-panda-es
> >>are different.
> >(..)
> >>diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
> >>index 03bd60d..0c48f6b 100644
> >>--- a/arch/arm/boot/dts/omap4-panda-common.dtsi
> >>+++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
> >(..)
> >>@@ -135,6 +136,25 @@
> >> 0xf0 0x118 /* i2c4_sda PULLUP | INPUTENABLE | MODE0 */
> >> >;
> >> };
> >>+
> >>+ led_gpio_pins: pinmux_leds_pins {
> >>+ pinctrl-single,pins = <
> >>+ >;
> >>+ };
> >>+};
> >Hi,
> >
> >FYI, there was a recent discussion precisely on this topic, where Tomy
> >suggested to remove the empty section:
> >http://marc.info/?l=linux-omap&m=136546635409232&w=2
> >
> >Apart from that, I just tested your patch on top of Tomy's
> >omap-for-v3.10/dt branch and it is working fine for me on PandaBoards
> >EA3, A4 and ES.
> >
> >Tested-by: Vincent Stehlé <[email protected]>
> >
> >Best regards,
> >
> >V.
> >
> Thanks for testing Vincent
>
> Is there a way to append the data to an already existing node?
> I do not see a clean way.
If you have something in omap4-panda-common.dtsi and the same entry
in the omap4-panda-es.dts, the entries in omap4-panda-es.dts will
override and append the entries in omap4-panda-common.dtsi.
So I think you can avoid the empty entry that way.
Regards,
Tony
Tony
On 05/08/2013 06:47 PM, Tony Lindgren wrote:
> * Dan Murphy <[email protected]> [130418 11:35]:
>> On 04/18/2013 04:30 AM, Vincent Stehlé wrote:
>>> On 04/17/2013 10:16 PM, Dan Murphy wrote:
>>>> The GPIO for LED D1 on the omap4-panda a1-a3 rev and the omap4-panda-es
>>>> are different.
>>> (..)
>>>> diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
>>>> index 03bd60d..0c48f6b 100644
>>>> --- a/arch/arm/boot/dts/omap4-panda-common.dtsi
>>>> +++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
>>> (..)
>>>> @@ -135,6 +136,25 @@
>>>> 0xf0 0x118 /* i2c4_sda PULLUP | INPUTENABLE | MODE0 */
>>>> >;
>>>> };
>>>> +
>>>> + led_gpio_pins: pinmux_leds_pins {
>>>> + pinctrl-single,pins = <
>>>> + >;
>>>> + };
>>>> +};
>>> Hi,
>>>
>>> FYI, there was a recent discussion precisely on this topic, where Tomy
>>> suggested to remove the empty section:
>>> http://marc.info/?l=linux-omap&m=136546635409232&w=2
>>>
>>> Apart from that, I just tested your patch on top of Tomy's
>>> omap-for-v3.10/dt branch and it is working fine for me on PandaBoards
>>> EA3, A4 and ES.
>>>
>>> Tested-by: Vincent Stehlé <[email protected]>
>>>
>>> Best regards,
>>>
>>> V.
>>>
>> Thanks for testing Vincent
>>
>> Is there a way to append the data to an already existing node?
>> I do not see a clean way.
> If you have something in omap4-panda-common.dtsi and the same entry
> in the omap4-panda-es.dts, the entries in omap4-panda-es.dts will
> override and append the entries in omap4-panda-common.dtsi.
>
> So I think you can avoid the empty entry that way.
>
> Regards,
>
> Tony
Thanks but the issue is the led entry would not appear in the common file so there is nothing to override.
Can we cleanly append to omap4_pmx_core without overriding the whole node?
I don't want to recreate the pmx_core node in the es file.
Dan
--
------------------
Dan Murphy
* Dan Murphy <[email protected]> [130509 11:13]:
>
> Can we cleanly append to omap4_pmx_core without overriding the whole node?
> I don't want to recreate the pmx_core node in the es file.
Yes that should work just fine.
Regards,
Tony