Skip to contentSkip to conversation

ARM: dts: move wl12xx pins to the proper pinmux for pandaboard

PATCH In review Andrey Konovalov 3 participants 3 messages Oct 11, 2013 – Oct 23, 2013 1 message not in the archive Device tree bindings

lore
Share & tools
lore

Andrey Konovalov

author
#0 lore raw

PATCH 1/1 ARM: dts: move wl12xx pins to the proper pinmux for pandaboard

Commit 851320e (ARM: dts: Fix muxing and regulator for wl12xx on the SDIO bus for pandaboard) put the wl12xx pins into omap4_pmx_wkup. This is not correct, and results in the following messages at the boot time:

pinctrl-single 4a31e040.pinmux: mux offset out of range: 0x38 (0x38) pinctrl-single 4a31e040.pinmux: could not add functions for pinmux_wl12xx_pins 56x

Actually these pins belong to omap4_pmx_core.

Signed-off-by Andrey Konovalov <[email protected]>
---
 arch/arm/boot/dts/omap4-panda-common.dtsi |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)
arch/arm/boot/dts/omap4-panda-common.dtsi +10 -9
index 814ab67..712ddbf 100644
@@ -239,15 +239,6 @@
 			0xf0 (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c4_sda */
 		>;
 	};
-};
-
-&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 */
-		>;
-	};
 
 	/*
 	 * wl12xx GPIO outputs for WLAN_EN, BT_EN, FM_EN, BT_WAKEUP

@@ -277,6 +268,16 @@
 	};
 };
 
+&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>;

-- 1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): [email protected]

Acked-by
#2 lore raw
Quoted 8 lines · Andrey Konovalov

Commit 851320e (ARM: dts: Fix muxing and regulator for wl12xx on the SDIO bus for pandaboard) put the wl12xx pins into omap4_pmx_wkup. This is not correct, and results in the following messages at the boot time:

pinctrl-single 4a31e040.pinmux: mux offset out of range: 0x38 (0x38) pinctrl-single 4a31e040.pinmux: could not add functions for pinmux_wl12xx_pins 56x

Actually these pins belong to omap4_pmx_core.

Oops indeed. I wonder how that happened..

Acked-by Tony Lindgren <[email protected]>
Quoted 34 lines
Signed-off-by Andrey Konovalov <[email protected]>
---
 arch/arm/boot/dts/omap4-panda-common.dtsi |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)
arch/arm/boot/dts/omap4-panda-common.dtsi +4 -9
index 814ab67..712ddbf 100644
@@ -239,15 +239,6 @@
 			0xf0 (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c4_sda */
 		>;
 	};
-};
-
-&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 */
-		>;
-	};
 
 	/*
 	 * wl12xx GPIO outputs for WLAN_EN, BT_EN, FM_EN, BT_WAKEUP

@@ -277,6 +268,16 @@
 	};
 };
 
+&omap4_pmx_wkup {
+	led_wkgpio_pins: pinmux_leds_wkpins {
+		pinctrl-single,pins = <
+			0x1a (PIN_OUTPUT | MUX_MODE3)	/* gpio_wk7 */

arch/arm/boot/dts/omap4-panda-common.dtsi

Quoted 10 lines
arch/arm/boot/dts/omap4-panda-common.dtsi +6 -1
+			0x1c (PIN_OUTPUT | MUX_MODE3)	/* gpio_wk8 */
+		>;
+	};
+
+};
+
 &i2c1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c1_pins>;
-- 1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#3 lore raw
In reply to a message not in the archive

Hi Andrey,

Quoted 11 lines · Andrey Konovalov

Commit 851320e (ARM: dts: Fix muxing and regulator for wl12xx on the SDIO bus for pandaboard) put the wl12xx pins into omap4_pmx_wkup. This is not correct, and results in the following messages at the boot time:

pinctrl-single 4a31e040.pinmux: mux offset out of range: 0x38 (0x38) pinctrl-single 4a31e040.pinmux: could not add functions for
pinmux_wl12xx_pins 56x

Actually these pins belong to omap4_pmx_core.

Signed-off-by Andrey Konovalov <[email protected]>

That patch does not apply on any on my branches. Could you rebase it on top of my for_3.13/dts branch.

Thanks,
Benoit

Signature · 8 lines
Benoît Cousson
BayLibre
Embedded Linux Technology Lab
www.baylibre.com
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html