[PATCH 0/3] ARM: dts: omap3-igep MMC updates for v3.13

[PATCH 0/3] ARM: dts: omap3-igep MMC updates for v3.13

[Enric Balletbo i Serra]

Hi Benoit,

This series are some updates for IGEP boards that would be great if can make
it for v3.13 (not sure if merge window is already closed as I saw your last
pull request).

The first patch is fix for mmc1 that should be configured for 4 bits not 8,
the second patch add support for the WiFi module connected to MMC2 SDIO
interface, and the third patch, updates the default processor to AM/DM37x
as most of the boards uses this processor instead of the old OMAP353x.

Best regards,

Enric Balletbo i Serra (3):
  ARM: dts: omap3-igep: Fix bus-width for mmc1.
  ARM: dts: omap3-igep: Add support for LBEE1USJYC WiFi connected to
    SDIO.
  ARM: dts: omap3-igep*: Update to use the TI AM/DM37x processor.

 arch/arm/boot/dts/omap3-igep.dtsi    | 55 ++++++++++++++++++++++++++++++------
 arch/arm/boot/dts/omap3-igep0020.dts |  4 +--
 arch/arm/boot/dts/omap3-igep0030.dts |  4 +--
 3 files changed, 51 insertions(+), 12 deletions(-)

-- 
1.8.1.2

[PATCH 1/3] ARM: dts: omap3-igep: Fix bus-width for mmc1.

[Enric Balletbo i Serra]

Both, IGEPv2 and IGEP COM MODULE have a bus-width of 4 not 8, so fix this and
do not mux data pins from mmc1_data5 to mmc1_data7.

Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com>
---
 arch/arm/boot/dts/omap3-igep.dtsi | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi
index ba1e58b..d4fecce 100644
--- a/arch/arm/boot/dts/omap3-igep.dtsi
+++ b/arch/arm/boot/dts/omap3-igep.dtsi
@@ -65,10 +65,6 @@
 			0x11a (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc1_dat1.sdmmc1_dat1 */
 			0x11c (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc1_dat2.sdmmc1_dat2 */
 			0x11e (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc1_dat3.sdmmc1_dat3 */
-			0x120 (PIN_INPUT | MUX_MODE0)		/* sdmmc1_dat4.sdmmc1_dat4 */
-			0x122 (PIN_INPUT | MUX_MODE0)		/* sdmmc1_dat5.sdmmc1_dat5 */
-			0x124 (PIN_INPUT | MUX_MODE0)		/* sdmmc1_dat6.sdmmc1_dat6 */
-			0x126 (PIN_INPUT | MUX_MODE0)		/* sdmmc1_dat7.sdmmc1_dat7 */
 		>;
 	};
 
@@ -114,7 +110,7 @@
       pinctrl-0 = <&mmc1_pins>;
       vmmc-supply = <&vmmc1>;
       vmmc_aux-supply = <&vsim>;
-      bus-width = <8>;
+      bus-width = <4>;
 };
 
 &mmc2 {
-- 
1.8.1.2

[PATCH 2/3] ARM: dts: omap3-igep: Add support for LBEE1USJYC WiFi connected to SDIO.

[Enric Balletbo i Serra]

The LBEE1USJYC is a WiFi/BT combo module used on OMAP3-based IGEP boards. In
both cases, IGEPv2 Rev. C and IGEP COM MODULE, the module is connected using
the same MMC interface and uses the same GPIOs.

Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com>
---
 arch/arm/boot/dts/omap3-igep.dtsi | 45 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi
index d4fecce..882e318 100644
--- a/arch/arm/boot/dts/omap3-igep.dtsi
+++ b/arch/arm/boot/dts/omap3-igep.dtsi
@@ -24,6 +24,25 @@
 		ti,mcbsp = <&mcbsp2>;
 		ti,codec = <&twl_audio>;
 	};
+
+	vdd33: regulator-vdd33 {
+		compatible = "regulator-fixed";
+		regulator-name = "vdd33";
+		regulator-always-on;
+	};
+
+	lbee1usjyc_vmmc: lbee1usjyc_vmmc {
+		pinctrl-names = "default";
+		pinctrl-0 = <&lbee1usjyc_pins>;
+		compatible = "regulator-fixed";
+		regulator-name = "regulator-lbee1usjyc";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		gpio = <&gpio5 10 0>;	/* gpio_138 WIFI_PDN */
+		startup-delay-us = <10000>;
+		enable-active-high;
+		vin-supply = <&vdd33>;
+	};
 };
 
 &omap3_pmx_core {
@@ -48,6 +67,15 @@
 		>;
 	};
 
+	/* WiFi/BT combo */
+	lbee1usjyc_pins: pinmux_lbee1usjyc_pins {
+		pinctrl-single,pins = <
+			0x136 (PIN_OUTPUT | MUX_MODE4)	/* sdmmc2_dat5.gpio_137 */
+			0x138 (PIN_OUTPUT | MUX_MODE4)	/* sdmmc2_dat6.gpio_138 */
+			0x13a (PIN_OUTPUT | MUX_MODE4)	/* sdmmc2_dat7.gpio_139 */
+		>;
+	};
+
 	mcbsp2_pins: pinmux_mcbsp2_pins {
 		pinctrl-single,pins = <
 			0x10c (PIN_INPUT | MUX_MODE0)		/* mcbsp2_fsx.mcbsp2_fsx */
@@ -68,6 +96,17 @@
 		>;
 	};
 
+	mmc2_pins: pinmux_mmc2_pins {
+		pinctrl-single,pins = <
+			0x128 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_clk.sdmmc2_clk */
+			0x12a (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_cmd.sdmmc2_cmd */
+			0x12c (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc2_dat0.sdmmc2_dat0 */
+			0x12e (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat1.sdmmc2_dat1 */
+			0x130 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat2.sdmmc2_dat2 */
+			0x132 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat3.sdmmc2_dat3 */
+		>;
+	};
+
 	smsc911x_pins: pinmux_smsc911x_pins {
 		pinctrl-single,pins = <
 			0x1a2 (PIN_INPUT | MUX_MODE4)		/* mcspi1_cs2.gpio_176 */
@@ -114,7 +153,11 @@
 };
 
 &mmc2 {
-	status = "disabled";
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc2_pins>;
+	vmmc-supply = <&lbee1usjyc_vmmc>;
+	bus-width = <4>;
+	non-removable;
 };
 
 &mmc3 {
-- 
1.8.1.2

[PATCH 3/3] ARM: dts: omap3-igep*: Update to use the TI AM/DM37x processor.

[Enric Balletbo i Serra]

Most of the boards are using the TI AM/DM37x processor, there is only a small
quantity of IGEP Processor Boards based on TI OMAP3530. So it's better use the
omap36xx.dtsi include instead of omap34xx.dtsi include.

To avoid confusion we have added to the model the (TI AM/DM37x) comment.

Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com>
---
 arch/arm/boot/dts/omap3-igep.dtsi    | 4 ++--
 arch/arm/boot/dts/omap3-igep0020.dts | 4 ++--
 arch/arm/boot/dts/omap3-igep0030.dts | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi
index 882e318..04b83ce 100644
--- a/arch/arm/boot/dts/omap3-igep.dtsi
+++ b/arch/arm/boot/dts/omap3-igep.dtsi
@@ -1,5 +1,5 @@
 /*
- * Device Tree Source for IGEP Technology devices
+ * Common device tree for IGEP boards based on AM/DM37x
  *
  * Copyright (C) 2012 Javier Martinez Canillas <javier@collabora.co.uk>
  * Copyright (C) 2012 Enric Balletbo i Serra <eballetbo@gmail.com>
@@ -10,7 +10,7 @@
  */
 /dts-v1/;
 
-#include "omap34xx.dtsi"
+#include "omap36xx.dtsi"
 
 / {
 	memory {
diff --git a/arch/arm/boot/dts/omap3-igep0020.dts b/arch/arm/boot/dts/omap3-igep0020.dts
index 750ce84..495ef0c 100644
--- a/arch/arm/boot/dts/omap3-igep0020.dts
+++ b/arch/arm/boot/dts/omap3-igep0020.dts
@@ -1,5 +1,5 @@
 /*
- * Device Tree Source for IGEPv2 board
+ * Device Tree Source for IGEPv2 Rev. (TI OMAP AM/DM37x)
  *
  * Copyright (C) 2012 Javier Martinez Canillas <javier@collabora.co.uk>
  * Copyright (C) 2012 Enric Balletbo i Serra <eballetbo@gmail.com>
@@ -12,7 +12,7 @@
 #include "omap3-igep.dtsi"
 
 / {
-	model = "IGEPv2";
+	model = "IGEPv2 (TI OMAP AM/DM37x)";
 	compatible = "isee,omap3-igep0020", "ti,omap3";
 
 	leds {
diff --git a/arch/arm/boot/dts/omap3-igep0030.dts b/arch/arm/boot/dts/omap3-igep0030.dts
index 525e6d9..02a23f8 100644
--- a/arch/arm/boot/dts/omap3-igep0030.dts
+++ b/arch/arm/boot/dts/omap3-igep0030.dts
@@ -1,5 +1,5 @@
 /*
- * Device Tree Source for IGEP COM Module
+ * Device Tree Source for IGEP COM MODULE (TI OMAP AM/DM37x)
  *
  * Copyright (C) 2012 Javier Martinez Canillas <javier@collabora.co.uk>
  * Copyright (C) 2012 Enric Balletbo i Serra <eballetbo@gmail.com>
@@ -12,7 +12,7 @@
 #include "omap3-igep.dtsi"
 
 / {
-	model = "IGEP COM Module";
+	model = "IGEP COM MODULE (TI OMAP AM/DM37x)";
 	compatible = "isee,omap3-igep0030", "ti,omap3";
 
 	leds {
-- 
1.8.1.2

Re: [PATCH 1/3] ARM: dts: omap3-igep: Fix bus-width for mmc1.

[Javier Martinez Canillas]

Hi Enric,

On Sat, Oct 19, 2013 at 9:54 PM, Enric Balletbo i Serra
<eballetbo@gmail.com> wrote:
> Both, IGEPv2 and IGEP COM MODULE have a bus-width of 4 not 8, so fix this and
> do not mux data pins from mmc1_data5 to mmc1_data7.
>

I guess you meant pins from mmc1_data4 instead mmc1_data5? (i.e: only
data0 to data3 have to be mux'ed for bus-width = <4>).

> Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com>
> ---
>  arch/arm/boot/dts/omap3-igep.dtsi | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi
> index ba1e58b..d4fecce 100644
> --- a/arch/arm/boot/dts/omap3-igep.dtsi
> +++ b/arch/arm/boot/dts/omap3-igep.dtsi
> @@ -65,10 +65,6 @@
>                         0x11a (PIN_INPUT_PULLUP | MUX_MODE0)    /* sdmmc1_dat1.sdmmc1_dat1 */
>                         0x11c (PIN_INPUT_PULLUP | MUX_MODE0)    /* sdmmc1_dat2.sdmmc1_dat2 */
>                         0x11e (PIN_INPUT_PULLUP | MUX_MODE0)    /* sdmmc1_dat3.sdmmc1_dat3 */
> -                       0x120 (PIN_INPUT | MUX_MODE0)           /* sdmmc1_dat4.sdmmc1_dat4 */
> -                       0x122 (PIN_INPUT | MUX_MODE0)           /* sdmmc1_dat5.sdmmc1_dat5 */
> -                       0x124 (PIN_INPUT | MUX_MODE0)           /* sdmmc1_dat6.sdmmc1_dat6 */
> -                       0x126 (PIN_INPUT | MUX_MODE0)           /* sdmmc1_dat7.sdmmc1_dat7 */
>                 >;
>         };
>
> @@ -114,7 +110,7 @@
>        pinctrl-0 = <&mmc1_pins>;
>        vmmc-supply = <&vmmc1>;
>        vmmc_aux-supply = <&vsim>;
> -      bus-width = <8>;
> +      bus-width = <4>;
>  };
>
>  &mmc2 {
> --
> 1.8.1.2
>

Best regards,
Javier

Re: [PATCH 2/3] ARM: dts: omap3-igep: Add support for LBEE1USJYC WiFi connected to SDIO.

[Javier Martinez Canillas]

Hi Enric,

On Sat, Oct 19, 2013 at 9:54 PM, Enric Balletbo i Serra
<eballetbo@gmail.com> wrote:
> The LBEE1USJYC is a WiFi/BT combo module used on OMAP3-based IGEP boards. In
> both cases, IGEPv2 Rev. C and IGEP COM MODULE, the module is connected using
> the same MMC interface and uses the same GPIOs.
>
> Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com>
> ---
>  arch/arm/boot/dts/omap3-igep.dtsi | 45 ++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 44 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi
> index d4fecce..882e318 100644
> --- a/arch/arm/boot/dts/omap3-igep.dtsi
> +++ b/arch/arm/boot/dts/omap3-igep.dtsi
> @@ -24,6 +24,25 @@
>                 ti,mcbsp = <&mcbsp2>;
>                 ti,codec = <&twl_audio>;
>         };
> +
> +       vdd33: regulator-vdd33 {
> +               compatible = "regulator-fixed";
> +               regulator-name = "vdd33";
> +               regulator-always-on;
> +       };
> +
> +       lbee1usjyc_vmmc: lbee1usjyc_vmmc {
> +               pinctrl-names = "default";
> +               pinctrl-0 = <&lbee1usjyc_pins>;
> +               compatible = "regulator-fixed";
> +               regulator-name = "regulator-lbee1usjyc";
> +               regulator-min-microvolt = <3300000>;
> +               regulator-max-microvolt = <3300000>;
> +               gpio = <&gpio5 10 0>;   /* gpio_138 WIFI_PDN */

Is better if you use GPIO_ACTIVE_HIGH instead of 0 here.

> +               startup-delay-us = <10000>;
> +               enable-active-high;
> +               vin-supply = <&vdd33>;
> +       };
>  };
>
>  &omap3_pmx_core {
> @@ -48,6 +67,15 @@
>                 >;
>         };
>
> +       /* WiFi/BT combo */
> +       lbee1usjyc_pins: pinmux_lbee1usjyc_pins {
> +               pinctrl-single,pins = <
> +                       0x136 (PIN_OUTPUT | MUX_MODE4)  /* sdmmc2_dat5.gpio_137 */
> +                       0x138 (PIN_OUTPUT | MUX_MODE4)  /* sdmmc2_dat6.gpio_138 */
> +                       0x13a (PIN_OUTPUT | MUX_MODE4)  /* sdmmc2_dat7.gpio_139 */
> +               >;
> +       };
> +

Is this enough to correctly reset the chip or do you also have a patch
to do the init sequence on pdata-quirks.c?

>         mcbsp2_pins: pinmux_mcbsp2_pins {
>                 pinctrl-single,pins = <
>                         0x10c (PIN_INPUT | MUX_MODE0)           /* mcbsp2_fsx.mcbsp2_fsx */
> @@ -68,6 +96,17 @@
>                 >;
>         };
>
> +       mmc2_pins: pinmux_mmc2_pins {
> +               pinctrl-single,pins = <
> +                       0x128 (PIN_INPUT_PULLUP | MUX_MODE0)    /* sdmmc2_clk.sdmmc2_clk */
> +                       0x12a (PIN_INPUT_PULLUP | MUX_MODE0)    /* sdmmc2_cmd.sdmmc2_cmd */
> +                       0x12c (PIN_INPUT_PULLUP | MUX_MODE0)    /* sdmmc2_dat0.sdmmc2_dat0 */
> +                       0x12e (PIN_INPUT_PULLUP | MUX_MODE0)    /* sdmmc2_dat1.sdmmc2_dat1 */
> +                       0x130 (PIN_INPUT_PULLUP | MUX_MODE0)    /* sdmmc2_dat2.sdmmc2_dat2 */
> +                       0x132 (PIN_INPUT_PULLUP | MUX_MODE0)    /* sdmmc2_dat3.sdmmc2_dat3 */
> +               >;
> +       };
> +
>         smsc911x_pins: pinmux_smsc911x_pins {
>                 pinctrl-single,pins = <
>                         0x1a2 (PIN_INPUT | MUX_MODE4)           /* mcspi1_cs2.gpio_176 */
> @@ -114,7 +153,11 @@
>  };
>
>  &mmc2 {
> -       status = "disabled";
> +       pinctrl-names = "default";
> +       pinctrl-0 = <&mmc2_pins>;
> +       vmmc-supply = <&lbee1usjyc_vmmc>;
> +       bus-width = <4>;
> +       non-removable;
>  };
>
>  &mmc3 {
> --
> 1.8.1.2
>

Best regards,
Javier

Re: [PATCH 0/3] ARM: dts: omap3-igep MMC updates for v3.13

[Javier Martinez Canillas]

[cc'ing current Benoit's address instead of the old one]

On Sat, Oct 19, 2013 at 9:54 PM, Enric Balletbo i Serra
<eballetbo@gmail.com> wrote:
> Hi Benoit,
>
> This series are some updates for IGEP boards that would be great if can make
> it for v3.13 (not sure if merge window is already closed as I saw your last
> pull request).
>
> The first patch is fix for mmc1 that should be configured for 4 bits not 8,
> the second patch add support for the WiFi module connected to MMC2 SDIO
> interface, and the third patch, updates the default processor to AM/DM37x
> as most of the boards uses this processor instead of the old OMAP353x.
>
> Best regards,
>

Hi Enric,

Thanks a lot for this patch-set. I don't have access to my IGEP board
right now so I can't give a try but will do as soon as possible.

I've just two minors nits that I commented on the individual patches
but I'm not sure if those justifies a v2 so:

Reviewed-by: Javier Martinez Canillas <javier@collabora.co.uk>

> Enric Balletbo i Serra (3):
>   ARM: dts: omap3-igep: Fix bus-width for mmc1.
>   ARM: dts: omap3-igep: Add support for LBEE1USJYC WiFi connected to
>     SDIO.
>   ARM: dts: omap3-igep*: Update to use the TI AM/DM37x processor.
>
>  arch/arm/boot/dts/omap3-igep.dtsi    | 55 ++++++++++++++++++++++++++++++------
>  arch/arm/boot/dts/omap3-igep0020.dts |  4 +--
>  arch/arm/boot/dts/omap3-igep0030.dts |  4 +--
>  3 files changed, 51 insertions(+), 12 deletions(-)
>
> --
> 1.8.1.2
>

Re: [PATCH 0/3] ARM: dts: omap3-igep MMC updates for v3.13

[Javier Martinez Canillas]

On Sun, Oct 20, 2013 at 1:25 AM, Javier Martinez Canillas
<martinez.javier@gmail.com> wrote:
> [cc'ing current Benoit's address instead of the old one]
>
> On Sat, Oct 19, 2013 at 9:54 PM, Enric Balletbo i Serra
> <eballetbo@gmail.com> wrote:
>> Hi Benoit,
>>
>> This series are some updates for IGEP boards that would be great if can make
>> it for v3.13 (not sure if merge window is already closed as I saw your last
>> pull request).
>>
>> The first patch is fix for mmc1 that should be configured for 4 bits not 8,
>> the second patch add support for the WiFi module connected to MMC2 SDIO
>> interface, and the third patch, updates the default processor to AM/DM37x
>> as most of the boards uses this processor instead of the old OMAP353x.
>>
>> Best regards,
>>
>
> Hi Enric,
>
> Thanks a lot for this patch-set. I don't have access to my IGEP board
> right now so I can't give a try but will do as soon as possible.
>
> I've just two minors nits that I commented on the individual patches
> but I'm not sure if those justifies a v2 so:
>
> Reviewed-by: Javier Martinez Canillas <javier@collabora.co.uk>

I also could test these patches and are working correctly.

Tested-by: Javier Martinez Canillas <javier@collabora.co.uk>

>
>> Enric Balletbo i Serra (3):
>>   ARM: dts: omap3-igep: Fix bus-width for mmc1.
>>   ARM: dts: omap3-igep: Add support for LBEE1USJYC WiFi connected to
>>     SDIO.
>>   ARM: dts: omap3-igep*: Update to use the TI AM/DM37x processor.
>>
>>  arch/arm/boot/dts/omap3-igep.dtsi    | 55 ++++++++++++++++++++++++++++++------
>>  arch/arm/boot/dts/omap3-igep0020.dts |  4 +--
>>  arch/arm/boot/dts/omap3-igep0030.dts |  4 +--
>>  3 files changed, 51 insertions(+), 12 deletions(-)
>>
>> --
>> 1.8.1.2
>>