* [PATCH] ARM: OMAP3: igep0020: Set WIFI/BT GPIO pins in correct mux mode
@ 2012-10-29 17:51 Anders Hedlund
2012-10-29 18:31 ` Enric Balletbo Serra
2012-10-29 19:25 ` [PATCH v2] " Anders Hedlund
0 siblings, 2 replies; 6+ messages in thread
From: Anders Hedlund @ 2012-10-29 17:51 UTC (permalink / raw)
To: tony, linux-omap; +Cc: Anders Hedlund, Jonas Zetterberg, Enric Balletbo i Serra
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: OMAP3: igep0020: Set WIFI/BT GPIO pins in correct mux mode
2012-10-29 17:51 [PATCH] ARM: OMAP3: igep0020: Set WIFI/BT GPIO pins in correct mux mode Anders Hedlund
@ 2012-10-29 18:31 ` Enric Balletbo Serra
2012-11-07 22:00 ` Tony Lindgren
2012-10-29 19:25 ` [PATCH v2] " Anders Hedlund
1 sibling, 1 reply; 6+ messages in thread
From: Enric Balletbo Serra @ 2012-10-29 18:31 UTC (permalink / raw)
To: Anders Hedlund
Cc: tony, linux-omap, Jonas Zetterberg, Javier Martinez Canillas,
Matthias Brugger
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 )
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: OMAP3: igep0020: Set WIFI/BT GPIO pins in correct mux mode
2012-10-29 18:31 ` Enric Balletbo Serra
@ 2012-11-07 22:00 ` Tony Lindgren
0 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2012-11-07 22:00 UTC (permalink / raw)
To: Enric Balletbo Serra
Cc: Anders Hedlund, linux-omap, Jonas Zetterberg,
Javier Martinez Canillas, Matthias Brugger
* 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] ARM: OMAP3: igep0020: Set WIFI/BT GPIO pins in correct mux mode
2012-10-29 17:51 [PATCH] ARM: OMAP3: igep0020: Set WIFI/BT GPIO pins in correct mux mode Anders Hedlund
2012-10-29 18:31 ` Enric Balletbo Serra
@ 2012-10-29 19:25 ` Anders Hedlund
1 sibling, 0 replies; 6+ messages in thread
From: Anders Hedlund @ 2012-10-29 19:25 UTC (permalink / raw)
To: tony, linux-omap
Cc: Anders Hedlund, Jonas Zetterberg, Enric Balletbo i Serra,
Javier Martinez Canillas, Matthias Brugger
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [RESEND/PATCHv3] arm: dts: omap5-evm: Add keypad support
@ 2012-10-29 10:40 Sourav Poddar
2012-10-29 18:59 ` [PATCH v2] ARM: OMAP3: igep0020: Set WIFI/BT GPIO pins in correct mux mode Anders Hedlund
0 siblings, 1 reply; 6+ messages in thread
From: Sourav Poddar @ 2012-10-29 10:40 UTC (permalink / raw)
To: b-cousson
Cc: linux-omap, devicetree-discuss, linux-kernel, sourav.poddar,
Felipe Balbi, Santosh Shilimkar
Add keypad data node in omap5-evm.
Based on I2C support patch for omap5, which has been
already posted as a different series.
Tested on omap5430 evm with 3.7-rc1 kernel.
Cc: Felipe Balbi <balbi@ti.com>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Tested on omap5430 sdp with 3.7-rc1 kernel.
Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
---
arch/arm/boot/dts/omap5-evm.dts | 95 +++++++++++++++++++++++++++++++++++++++
1 files changed, 95 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/omap5-evm.dts b/arch/arm/boot/dts/omap5-evm.dts
index c663eba..b812d6d 100644
--- a/arch/arm/boot/dts/omap5-evm.dts
+++ b/arch/arm/boot/dts/omap5-evm.dts
@@ -140,3 +140,98 @@
&mcbsp3 {
status = "disabled";
};
+
+&i2c5 {
+ clock-frequency = <400000>;
+
+ smsc@38 {
+ compatible = "smscece1099";
+ reg = <0x38>;
+ clock = <0x13>;
+ keypad {
+ compatible = "smsc,keypad";
+ interrupt-parent = <&gpio5>;
+ interrupts = <23>; /* gpio line 151 */
+ keypad,num-rows = <8>;
+ keypad,num-columns = <16>;
+ linux,keymap = < 0x20041 /* KEY_F7 */
+ 0x30001 /* KEY_ESC */
+ 0x4003e /* KEY_F4 */
+ 0x50022 /* KEY_G */
+ 0x70023 /* KEY_H */
+ 0x9009a /* KEY_CYCLEWINDOWS */
+ 0xc000e /* KEY_BACKSPACE */
+ 0xd0057 /* KEY_F11 */
+ 0xe009f /* KEY_FORWARD */
+ 0xf006e /* KEY_INSERT */
+ 0x1020036 /* KEY_RIGHTSHIFT */
+ 0x1030011 /* KEY_W */
+ 0x1040010 /* KEY_Q */
+ 0x1050012 /* KEY_E */
+ 0x1070013 /* KEY_R */
+ 0x1080016 /* KEY_U */
+ 0x10c0017 /* KEY_I */
+ 0x10d0067 /* KEY_UP */
+ 0x10e0018 /* KEY_O */
+ 0x10f0019 /* KEY_LEFT */
+ 0x2020003 /* KEY_2 */
+ 0x2040004 /* KEY_1 */
+ 0x2050005 /* KEY_3 */
+ 0x2070008 /* KEY_4 */
+ 0x2080009 /* KEY_7 */
+ 0x20b0064 /* KEY_8 */
+ 0x20c006c /* KEY_RIGHTALT */
+ 0x20d000a /* KEY_DOWN */
+ 0x20e0001 /* KEY_0 */
+ 0x20f006a /* KEY_RIGHT */
+ 0x3010061 /* KEY_RIGHTCTRL */
+ 0x302001f /* KEY_S */
+ 0x303001e /* KEY_A */
+ 0x3040020 /* KEY_D */
+ 0x3050021 /* KEY_F */
+ 0x3070024 /* KEY_J */
+ 0x3080025 /* KEY_K */
+ 0x30c001c /* KEY_ENTER */
+ 0x30d0026 /* KEY_L */
+ 0x30e0027 /* KEY_SEMICOLON */
+ 0x400002a /* KEY_LEFTSHIFT */
+ 0x402002d /* KEY_X */
+ 0x403002c /* KEY_Z */
+ 0x404002e /* KEY_C */
+ 0x405002f /* KEY_V */
+ 0x4070032 /* KEY_M */
+ 0x4080033 /* KEY_COMMA */
+ 0x40c0039 /* KEY_SPACE */
+ 0x40d0033 /* KEY_DOT */
+ 0x40e0035 /* KEY_SLASH */
+ 0x40f006b /* KEY_END */
+ 0x501001d /* KEY_LEFTCTRL */
+ 0x5020040 /* KEY_F6 */
+ 0x503000f /* KEY_TAB */
+ 0x504003d /* KEY_F3 */
+ 0x5050014 /* KEY_T */
+ 0x5070015 /* KEY_Y */
+ 0x508001a /* KEY_LEFTBRACE */
+ 0x50d0044 /* KEY_F10 */
+ 0x50e001b /* KEY_RIGHTBRACE */
+ 0x50f0066 /* KEY_HOME */
+ 0x602003f /* KEY_F5 */
+ 0x604003c /* KEY_F2 */
+ 0x6050006 /* KEY_5 */
+ 0x60601d0 /* KEY_FN */
+ 0x6070007 /* KEY_6 */
+ 0x60a008b /* KEY_MENU */
+ 0x60c002b /* KEY_BACKSLASH */
+ 0x60d0043 /* KEY_F9 */
+ 0x7020042 /* KEY_F8 */
+ 0x703003a /* KEY_CAPSLOCK */
+ 0x704003b /* KEY_F1 */
+ 0x7050030 /* KEY_B */
+ 0x7070031 /* KEY_N */
+ 0x70b0038 /* KEY_LEFTALT */
+ 0x70d0058 /* KEY_F12 */
+ 0x70f006f >; /* KEY_DELETE */
+ linux,input-no-autorepeat;
+ };
+ };
+};
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2] ARM: OMAP3: igep0020: Set WIFI/BT GPIO pins in correct mux mode
2012-10-29 10:40 [RESEND/PATCHv3] arm: dts: omap5-evm: Add keypad support Sourav Poddar
@ 2012-10-29 18:59 ` Anders Hedlund
2012-10-29 21:23 ` Anders Hedlund
0 siblings, 1 reply; 6+ messages in thread
From: Anders Hedlund @ 2012-10-29 18:59 UTC (permalink / raw)
To: tony, linux-omap
Cc: Anders Hedlund, Jonas Zetterberg, Enric Balletbo i Serra,
Javier Martinez Canillas, Matthias Brugger
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] ARM: OMAP3: igep0020: Set WIFI/BT GPIO pins in correct mux mode
2012-10-29 18:59 ` [PATCH v2] ARM: OMAP3: igep0020: Set WIFI/BT GPIO pins in correct mux mode Anders Hedlund
@ 2012-10-29 21:23 ` Anders Hedlund
0 siblings, 0 replies; 6+ messages in thread
From: Anders Hedlund @ 2012-10-29 21:23 UTC (permalink / raw)
To: tony, linux-omap
Cc: Anders Hedlund, Jonas Zetterberg, Enric Balletbo i Serra,
Javier Martinez Canillas, Matthias Brugger
Hi Tony and all,
Sorry... please ignore this one. Sent with incorrect Message-Id. A new
(hopefully correct) patch mail has already been sent...
Br,
Anders
2012/10/29 Anders Hedlund <anders.j.hedlund@gmail.com>:
> 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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-11-07 22:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-29 17:51 [PATCH] ARM: OMAP3: igep0020: Set WIFI/BT GPIO pins in correct mux mode Anders Hedlund
2012-10-29 18:31 ` Enric Balletbo Serra
2012-11-07 22:00 ` Tony Lindgren
2012-10-29 19:25 ` [PATCH v2] " Anders Hedlund
-- strict thread matches above, loose matches on Subject: below --
2012-10-29 10:40 [RESEND/PATCHv3] arm: dts: omap5-evm: Add keypad support Sourav Poddar
2012-10-29 18:59 ` [PATCH v2] ARM: OMAP3: igep0020: Set WIFI/BT GPIO pins in correct mux mode Anders Hedlund
2012-10-29 21:23 ` Anders Hedlund
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).