[PATCH] ARM: OMAP3: igep0020: Set WIFI/BT GPIO pins in correct mux mode

[PATCH] ARM: OMAP3: igep0020: Set WIFI/BT GPIO pins in correct mux mode

[Anders Hedlund]

Configure the WIFI/BT GPIO pin muxes unless the bootloader hasn't already
done so.

Signed-off-by: Anders Hedlund <anders.j.hedlund@gmail.com>
Cc: Jonas Zetterberg <jozz@jozz.se>
Cc: Enric Balletbo i Serra <eballetbo@gmail.com>
---
 arch/arm/mach-omap2/board-igep0020.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index dbc705a..17e45bc 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -579,6 +579,13 @@ static void __init igep_wlan_bt_init(void)
 	} else
 		return;
 
+#ifdef CONFIG_OMAP_MUX
+	/* Make sure that the GPIO pins are muxed correctly */
+	omap_mux_init_gpio(igep_wlan_bt_gpios[0].gpio, OMAP_PIN_OUTPUT);
+	omap_mux_init_gpio(igep_wlan_bt_gpios[1].gpio, OMAP_PIN_OUTPUT);
+	omap_mux_init_gpio(igep_wlan_bt_gpios[2].gpio, OMAP_PIN_OUTPUT);
+#endif
+
 	err = gpio_request_array(igep_wlan_bt_gpios,
 				 ARRAY_SIZE(igep_wlan_bt_gpios));
 	if (err) {
-- 
1.7.10.4

Re: [PATCH] ARM: OMAP3: igep0020: Set WIFI/BT GPIO pins in correct mux mode

[Enric Balletbo Serra]

Hi,

Thanks for the patch, just one comment below.

2012/10/29 Anders Hedlund <anders.j.hedlund@gmail.com>:
> Configure the WIFI/BT GPIO pin muxes unless the bootloader hasn't already
> done so.
>
> Signed-off-by: Anders Hedlund <anders.j.hedlund@gmail.com>
> Cc: Jonas Zetterberg <jozz@jozz.se>
> Cc: Enric Balletbo i Serra <eballetbo@gmail.com>
> ---
>  arch/arm/mach-omap2/board-igep0020.c |    7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
> index dbc705a..17e45bc 100644
> --- a/arch/arm/mach-omap2/board-igep0020.c
> +++ b/arch/arm/mach-omap2/board-igep0020.c
> @@ -579,6 +579,13 @@ static void __init igep_wlan_bt_init(void)
>         } else
>                 return;
>
> +#ifdef CONFIG_OMAP_MUX

The ifdef is not required here (the mux.h file does this for you)

> +       /* Make sure that the GPIO pins are muxed correctly */
> +       omap_mux_init_gpio(igep_wlan_bt_gpios[0].gpio, OMAP_PIN_OUTPUT);
> +       omap_mux_init_gpio(igep_wlan_bt_gpios[1].gpio, OMAP_PIN_OUTPUT);
> +       omap_mux_init_gpio(igep_wlan_bt_gpios[2].gpio, OMAP_PIN_OUTPUT);
> +#endif
> +
>         err = gpio_request_array(igep_wlan_bt_gpios,
>                                  ARRAY_SIZE(igep_wlan_bt_gpios));
>         if (err) {
> --
> 1.7.10.4
>

Tony, after corrections, as this is a fix could be included ?  Or we
need to wait to the next merge window.

The problem is, with recent u-boot these pins are not muxed because
u-boot sets only the minimum required for uboot functionality and
kernel boot. In kernel these pins must be muxed in order to get the
wifi and bluetooth work.

( CCing: Javier Martinez and Matthias Brugger )

[PATCH v2] ARM: OMAP3: igep0020: Set WIFI/BT GPIO pins in correct mux mode

[Anders Hedlund]

Setup the WIFI/BT GPIO pin muxes to enable WIFI/BT functionality.

Signed-off-by: Anders Hedlund <anders.j.hedlund@gmail.com>
Cc: Jonas Zetterberg <jozz@jozz.se>
Cc: Enric Balletbo i Serra <eballetbo@gmail.com>
Cc: Javier Martinez Canillas <martinez.javier@gmail.com>
Cc: Matthias Brugger <mbrugger@iseebcn.com>
---
 arch/arm/mach-omap2/board-igep0020.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 2821448..2a21947 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -583,6 +583,11 @@ static void __init igep_wlan_bt_init(void)
 	} else
 		return;
 
+	/* Make sure that the GPIO pins are muxed correctly */
+	omap_mux_init_gpio(igep_wlan_bt_gpios[0].gpio, OMAP_PIN_OUTPUT);
+	omap_mux_init_gpio(igep_wlan_bt_gpios[1].gpio, OMAP_PIN_OUTPUT);
+	omap_mux_init_gpio(igep_wlan_bt_gpios[2].gpio, OMAP_PIN_OUTPUT);
+
 	err = gpio_request_array(igep_wlan_bt_gpios,
 				 ARRAY_SIZE(igep_wlan_bt_gpios));
 	if (err) {
-- 
1.7.10.4

Re: [PATCH] ARM: OMAP3: igep0020: Set WIFI/BT GPIO pins in correct mux mode

[Tony Lindgren]

* Enric Balletbo Serra <eballetbo@gmail.com> [121029 11:33]:
> 
> Tony, after corrections, as this is a fix could be included ?  Or we
> need to wait to the next merge window.
> 
> The problem is, with recent u-boot these pins are not muxed because
> u-boot sets only the minimum required for uboot functionality and
> kernel boot. In kernel these pins must be muxed in order to get the
> wifi and bluetooth work.

OK I'll add it to omap-for-v3.7-rc4/fixes-part2 with updated description
for the regression. Will also move the maintainers entry there from
the board branch.

Regards,

Tony