[PATCH 0/2] ARM: dts: omap4: Fix pin muxing for wl12xx

[PATCH 0/2] ARM: dts: omap4: Fix pin muxing for wl12xx

[Balaji T K]

Balaji T K (2):
  ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx
  ARM: dts: omap4-sdp: Fix pin muxing for wl12xx

 arch/arm/boot/dts/omap4-panda-common.dtsi |   20 ++++++++++----------
 arch/arm/boot/dts/omap4-sdp.dts           |   12 ++++++------
 2 files changed, 16 insertions(+), 16 deletions(-)

-- 
1.7.5.4

[PATCH 1/2] ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx

[Balaji T K]

pin mux wl12xx_gpio and wl12xx_pins should be part of omap4_pmx_core
and not omap4_pmx_wkup. So, move wl12xx_* to omap4_pmx_core.

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

SDIO card is not detected after moving pin mux to omap4_pmx_core since
sdmmc5_clk pull is disabled. Enable Pull up on sdmmc5_clk to detect SDIO card.

Signed-off-by: Balaji T K <balajitk@ti.com>
---
 arch/arm/boot/dts/omap4-panda-common.dtsi |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
index 298e850..88c6a05 100644
--- a/arch/arm/boot/dts/omap4-panda-common.dtsi
+++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
@@ -246,15 +246,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
@@ -274,7 +265,7 @@
 		pinctrl-single,pins = <
 			0x38 (PIN_INPUT | MUX_MODE3)		/* gpmc_ncs2.gpio_52 */
 			0x3a (PIN_INPUT | MUX_MODE3)		/* gpmc_ncs3.gpio_53 */
-			0x108 (PIN_OUTPUT | MUX_MODE0)		/* sdmmc5_clk.sdmmc5_clk */
+			0x108 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc5_clk.sdmmc5_clk */
 			0x10a (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc5_cmd.sdmmc5_cmd */
 			0x10c (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc5_dat0.sdmmc5_dat0 */
 			0x10e (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc5_dat1.sdmmc5_dat1 */
@@ -284,6 +275,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>;
-- 
1.7.5.4

[PATCH 2/2] ARM: dts: omap4-sdp: Fix pin muxing for wl12xx

[Balaji T K]

Mux mode for wlan/sdmmc5 should be MODE0 in pinmux_wl12xx_pins and
Enable Pull up on sdmmc5_clk to detect SDIO card.

Signed-off-by: Balaji T K <balajitk@ti.com>
---
 arch/arm/boot/dts/omap4-sdp.dts |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index 5fc3f43..dbc81fb 100644
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -300,12 +300,12 @@
 	wl12xx_pins: pinmux_wl12xx_pins {
 		pinctrl-single,pins = <
 			0x3a (PIN_INPUT | MUX_MODE3)		/* gpmc_ncs3.gpio_53 */
-			0x108 (PIN_OUTPUT | MUX_MODE3)		/* sdmmc5_clk.sdmmc5_clk */
-			0x10a (PIN_INPUT_PULLUP | MUX_MODE3)	/* sdmmc5_cmd.sdmmc5_cmd */
-			0x10c (PIN_INPUT_PULLUP | MUX_MODE3)	/* sdmmc5_dat0.sdmmc5_dat0 */
-			0x10e (PIN_INPUT_PULLUP | MUX_MODE3)	/* sdmmc5_dat1.sdmmc5_dat1 */
-			0x110 (PIN_INPUT_PULLUP | MUX_MODE3)	/* sdmmc5_dat2.sdmmc5_dat2 */
-			0x112 (PIN_INPUT_PULLUP | MUX_MODE3)	/* sdmmc5_dat3.sdmmc5_dat3 */
+			0x108 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc5_clk.sdmmc5_clk */
+			0x10a (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc5_cmd.sdmmc5_cmd */
+			0x10c (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc5_dat0.sdmmc5_dat0 */
+			0x10e (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc5_dat1.sdmmc5_dat1 */
+			0x110 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc5_dat2.sdmmc5_dat2 */
+			0x112 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc5_dat3.sdmmc5_dat3 */
 		>;
 	};
 };
-- 
1.7.5.4

Re: [PATCH 1/2] ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx

[Tony Lindgren]

* Balaji T K <balajitk@ti.com> [131121 05:51]:
> pin mux wl12xx_gpio and wl12xx_pins should be part of omap4_pmx_core
> and not omap4_pmx_wkup. So, move wl12xx_* to omap4_pmx_core.
> 
> Fix the following error message:
> pinctrl-single 4a31e040.pinmux: mux offset out of range: 0x38 (0x38)
> pinctrl-single 4a31e040.pinmux: could not add functions for pinmux_wl12xx_pins 56x
> 
> SDIO card is not detected after moving pin mux to omap4_pmx_core since
> sdmmc5_clk pull is disabled. Enable Pull up on sdmmc5_clk to detect SDIO card.

Cool, does this fix the issue with the WLAN not coming up after a warm reset
on panda?

Regards,

Tony

Re: [PATCH 1/2] ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx

[Dan Murphy]

On 11/21/2013 10:58 AM, Tony Lindgren wrote:
> * Balaji T K <balajitk@ti.com> [131121 05:51]:
>> pin mux wl12xx_gpio and wl12xx_pins should be part of omap4_pmx_core
>> and not omap4_pmx_wkup. So, move wl12xx_* to omap4_pmx_core.
>>
>> Fix the following error message:
>> pinctrl-single 4a31e040.pinmux: mux offset out of range: 0x38 (0x38)
>> pinctrl-single 4a31e040.pinmux: could not add functions for pinmux_wl12xx_pins 56x

Why is the led pins moved then?

>> SDIO card is not detected after moving pin mux to omap4_pmx_core since
>> sdmmc5_clk pull is disabled. Enable Pull up on sdmmc5_clk to detect SDIO card.
> Cool, does this fix the issue with the WLAN not coming up after a warm reset
> on panda?
>
> Regards,
>
> Tony
> --
> 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


-- 
------------------
Dan Murphy

Re: [PATCH 1/2] ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx

[Tony Lindgren]

* Dan Murphy <dmurphy@ti.com> [131121 09:28]:
> On 11/21/2013 10:58 AM, Tony Lindgren wrote:
> > * Balaji T K <balajitk@ti.com> [131121 05:51]:
> >> pin mux wl12xx_gpio and wl12xx_pins should be part of omap4_pmx_core
> >> and not omap4_pmx_wkup. So, move wl12xx_* to omap4_pmx_core.
> >>
> >> Fix the following error message:
> >> pinctrl-single 4a31e040.pinmux: mux offset out of range: 0x38 (0x38)
> >> pinctrl-single 4a31e040.pinmux: could not add functions for pinmux_wl12xx_pins 56x
> 
> Why is the led pins moved then?

Heh the patch just looks that way, looking at the curly brackets
thing do get moved properly.
 
> >> SDIO card is not detected after moving pin mux to omap4_pmx_core since
> >> sdmmc5_clk pull is disabled. Enable Pull up on sdmmc5_clk to detect SDIO card.
> > Cool, does this fix the issue with the WLAN not coming up after a warm reset
> > on panda?

Also commit f446043f1aa7 (regulator: fixed: fix regulator_list_voltage() for
regression) is needed that recently got merged. But with v3.13-rc1 +
f446043f1aa7 + this patch no luck whatsoever bringing up the wl12xx so there
must be also some regression somewhere from v3.12 on that?

Regards,

Tony

Re: [PATCH 1/2] ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx

[Balaji T K]

On Thursday 21 November 2013 10:57 PM, Dan Murphy wrote:
> On 11/21/2013 10:58 AM, Tony Lindgren wrote:
>> * Balaji T K <balajitk@ti.com> [131121 05:51]:
>>> pin mux wl12xx_gpio and wl12xx_pins should be part of omap4_pmx_core
>>> and not omap4_pmx_wkup. So, move wl12xx_* to omap4_pmx_core.
>>>
>>> Fix the following error message:
>>> pinctrl-single 4a31e040.pinmux: mux offset out of range: 0x38 (0x38)
>>> pinctrl-single 4a31e040.pinmux: could not add functions for pinmux_wl12xx_pins 56x
>
> Why is the led pins moved then?
Hi Dan,

I just moved 27 lines (wl12xx_pins, wl12xx_gpio) up, git diff generated smaller
diff stat by moving 10 line of code (led_wkgpio_pins) further down :-)

>
>>> SDIO card is not detected after moving pin mux to omap4_pmx_core since
>>> sdmmc5_clk pull is disabled. Enable Pull up on sdmmc5_clk to detect SDIO card.
>> Cool, does this fix the issue with the WLAN not coming up after a warm reset
>> on panda?
>>
>> Regards,
>>
>> Tony
>> --
>> 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
>
>

Re: [PATCH 1/2] ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx

[Balaji T K]

On Wednesday 27 November 2013 03:25 AM, Tony Lindgren wrote:
> * Dan Murphy <dmurphy@ti.com> [131121 09:28]:
>> On 11/21/2013 10:58 AM, Tony Lindgren wrote:
>>> * Balaji T K <balajitk@ti.com> [131121 05:51]:
>>>> pin mux wl12xx_gpio and wl12xx_pins should be part of omap4_pmx_core
>>>> and not omap4_pmx_wkup. So, move wl12xx_* to omap4_pmx_core.
>>>>
>>>> Fix the following error message:
>>>> pinctrl-single 4a31e040.pinmux: mux offset out of range: 0x38 (0x38)
>>>> pinctrl-single 4a31e040.pinmux: could not add functions for pinmux_wl12xx_pins 56x
>>
>> Why is the led pins moved then?
>
> Heh the patch just looks that way, looking at the curly brackets
> thing do get moved properly.
>
>>>> SDIO card is not detected after moving pin mux to omap4_pmx_core since
>>>> sdmmc5_clk pull is disabled. Enable Pull up on sdmmc5_clk to detect SDIO card.
>>> Cool, does this fix the issue with the WLAN not coming up after a warm reset
>>> on panda?
>
> Also commit f446043f1aa7 (regulator: fixed: fix regulator_list_voltage() for
> regression) is needed that recently got merged. But with v3.13-rc1 +
> f446043f1aa7 + this patch no luck whatsoever bringing up the wl12xx so there
> must be also some regression somewhere from v3.12 on that?
>
Hi Tony,

I tried loading wl12xx as modules on latest base as yours with
ti-connectivity/wl127x-fw-5-sr.bin firmware in place and I could connect
and run iperf.

> Regards,
>
> Tony
>

Re: [PATCH 1/2] ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx

[Tony Lindgren]

* Balaji T K <balajitk@ti.com> [131127 08:30]:
> On Wednesday 27 November 2013 03:25 AM, Tony Lindgren wrote:
> >* Dan Murphy <dmurphy@ti.com> [131121 09:28]:
> >>On 11/21/2013 10:58 AM, Tony Lindgren wrote:
> >>>* Balaji T K <balajitk@ti.com> [131121 05:51]:
> >>>>pin mux wl12xx_gpio and wl12xx_pins should be part of omap4_pmx_core
> >>>>and not omap4_pmx_wkup. So, move wl12xx_* to omap4_pmx_core.
> >>>>
> >>>>Fix the following error message:
> >>>>pinctrl-single 4a31e040.pinmux: mux offset out of range: 0x38 (0x38)
> >>>>pinctrl-single 4a31e040.pinmux: could not add functions for pinmux_wl12xx_pins 56x
> >>
> >>Why is the led pins moved then?
> >
> >Heh the patch just looks that way, looking at the curly brackets
> >thing do get moved properly.
> >
> >>>>SDIO card is not detected after moving pin mux to omap4_pmx_core since
> >>>>sdmmc5_clk pull is disabled. Enable Pull up on sdmmc5_clk to detect SDIO card.
> >>>Cool, does this fix the issue with the WLAN not coming up after a warm reset
> >>>on panda?
> >
> >Also commit f446043f1aa7 (regulator: fixed: fix regulator_list_voltage() for
> >regression) is needed that recently got merged. But with v3.13-rc1 +
> >f446043f1aa7 + this patch no luck whatsoever bringing up the wl12xx so there
> >must be also some regression somewhere from v3.12 on that?
> >
> Hi Tony,
> 
> I tried loading wl12xx as modules on latest base as yours with
> ti-connectivity/wl127x-fw-5-sr.bin firmware in place and I could connect
> and run iperf.

Oh OK I must have missed something then.

Does it now work after a warm reboot too? And after bringing the interface
down with "ifconfig wlan0 down" followed by "ifconfig wlan0 up"?

Regards,

Tony

Re: [PATCH 1/2] ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx

[Tony Lindgren]

* Tony Lindgren <tony@atomide.com> [131127 08:49]:
> * Balaji T K <balajitk@ti.com> [131127 08:30]:
> > On Wednesday 27 November 2013 03:25 AM, Tony Lindgren wrote:
> > >* Dan Murphy <dmurphy@ti.com> [131121 09:28]:
> > >>On 11/21/2013 10:58 AM, Tony Lindgren wrote:
> > >>>* Balaji T K <balajitk@ti.com> [131121 05:51]:
> > >>>>pin mux wl12xx_gpio and wl12xx_pins should be part of omap4_pmx_core
> > >>>>and not omap4_pmx_wkup. So, move wl12xx_* to omap4_pmx_core.
> > >>>>
> > >>>>Fix the following error message:
> > >>>>pinctrl-single 4a31e040.pinmux: mux offset out of range: 0x38 (0x38)
> > >>>>pinctrl-single 4a31e040.pinmux: could not add functions for pinmux_wl12xx_pins 56x
> > >>
> > >>Why is the led pins moved then?
> > >
> > >Heh the patch just looks that way, looking at the curly brackets
> > >thing do get moved properly.
> > >
> > >>>>SDIO card is not detected after moving pin mux to omap4_pmx_core since
> > >>>>sdmmc5_clk pull is disabled. Enable Pull up on sdmmc5_clk to detect SDIO card.
> > >>>Cool, does this fix the issue with the WLAN not coming up after a warm reset
> > >>>on panda?
> > >
> > >Also commit f446043f1aa7 (regulator: fixed: fix regulator_list_voltage() for
> > >regression) is needed that recently got merged. But with v3.13-rc1 +
> > >f446043f1aa7 + this patch no luck whatsoever bringing up the wl12xx so there
> > >must be also some regression somewhere from v3.12 on that?
> > >
> > Hi Tony,
> > 
> > I tried loading wl12xx as modules on latest base as yours with
> > ti-connectivity/wl127x-fw-5-sr.bin firmware in place and I could connect
> > and run iperf.
> 
> Oh OK I must have missed something then.
> 
> Does it now work after a warm reboot too? And after bringing the interface
> down with "ifconfig wlan0 down" followed by "ifconfig wlan0 up"?

Yes great, I can confirm that v3.13-rc1 + f446043f1aa7 (regulator: fixed: fix
regulator_list_voltage() for regression) + this patch works even after a
warm reset :) Will apply both to omap-for-v3.13/fixes-take4 with Cc stable.

Regards,

Tony