[PATCH 0/4] ARM: OMAP3: cm-t35/cm-t3730 fixes

[PATCH 0/4] ARM: OMAP3: cm-t35/cm-t3730 fixes

[Igor Grinberg]

This patch series fixes several issues on boards in subj.
It is based on Tony's board branch at [1].

[1] git://github.com/tmlind/linux.git


Igor Grinberg (4):
  ARM: OMAP3: cm-t35: add regulator supply for ads7846
  ARM: OMAP3: cm-t35: fix DSS regulator supply
  ARM: OMAP3: cm-t35: fix audio
  arm: omap3: cm-t35: add reset for sb-t35 usb hub

 arch/arm/mach-omap2/board-cm-t35.c |   50 ++++++++++++++++++++++++++++-------
 1 files changed, 40 insertions(+), 10 deletions(-)

-- 
1.7.3.4

[PATCH 1/4] ARM: OMAP3: cm-t35: add regulator supply for ads7846

[Igor Grinberg]

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
---
 arch/arm/mach-omap2/board-cm-t35.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index e15d39b..6d93db0 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -343,6 +343,10 @@ static struct regulator_consumer_supply cm_t35_vdvi_supply[] = {
 	REGULATOR_SUPPLY("vdvi", "omapdss"),
 };
 
+static struct regulator_consumer_supply cm_t35_vio_supplies[] = {
+	REGULATOR_SUPPLY("vcc", "spi1.0"),
+};
+
 /* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */
 static struct regulator_init_data cm_t35_vmmc1 = {
 	.constraints = {
@@ -373,6 +377,19 @@ static struct regulator_init_data cm_t35_vsim = {
 	.consumer_supplies	= cm_t35_vsim_supply,
 };
 
+static struct regulator_init_data cm_t35_vio = {
+	.constraints = {
+		.min_uV			= 1800000,
+		.max_uV			= 1800000,
+		.apply_uV		= true,
+		.valid_modes_mask	= REGULATOR_MODE_NORMAL
+					| REGULATOR_MODE_STANDBY,
+		.valid_ops_mask		= REGULATOR_CHANGE_MODE,
+	},
+	.num_consumer_supplies	= ARRAY_SIZE(cm_t35_vio_supplies),
+	.consumer_supplies	= cm_t35_vio_supplies,
+};
+
 static uint32_t cm_t35_keymap[] = {
 	KEY(0, 0, KEY_A),	KEY(0, 1, KEY_B),	KEY(0, 2, KEY_LEFT),
 	KEY(1, 0, KEY_UP),	KEY(1, 1, KEY_ENTER),	KEY(1, 2, KEY_DOWN),
@@ -456,6 +473,7 @@ static struct twl4030_platform_data cm_t35_twldata = {
 	.gpio		= &cm_t35_gpio_data,
 	.vmmc1		= &cm_t35_vmmc1,
 	.vsim		= &cm_t35_vsim,
+	.vio		= &cm_t35_vio,
 };
 
 static void __init cm_t35_init_i2c(void)
-- 
1.7.3.4

[PATCH 1/4] ARM: OMAP3: cm-t35: add regulator supply for ads7846

[Tony Lindgren]

* Igor Grinberg <grinberg@compulab.co.il> [111019 02:05]:
> 
> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
> ---
>  arch/arm/mach-omap2/board-cm-t35.c |   18 ++++++++++++++++++
>  1 files changed, 18 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
> index e15d39b..6d93db0 100644
> --- a/arch/arm/mach-omap2/board-cm-t35.c
> +++ b/arch/arm/mach-omap2/board-cm-t35.c
> @@ -343,6 +343,10 @@ static struct regulator_consumer_supply cm_t35_vdvi_supply[] = {
>  	REGULATOR_SUPPLY("vdvi", "omapdss"),
>  };
>  
> +static struct regulator_consumer_supply cm_t35_vio_supplies[] = {
> +	REGULATOR_SUPPLY("vcc", "spi1.0"),
> +};
> +
>  /* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */
>  static struct regulator_init_data cm_t35_vmmc1 = {
>  	.constraints = {
> @@ -373,6 +377,19 @@ static struct regulator_init_data cm_t35_vsim = {
>  	.consumer_supplies	= cm_t35_vsim_supply,
>  };
>  
> +static struct regulator_init_data cm_t35_vio = {
> +	.constraints = {
> +		.min_uV			= 1800000,
> +		.max_uV			= 1800000,
> +		.apply_uV		= true,
> +		.valid_modes_mask	= REGULATOR_MODE_NORMAL
> +					| REGULATOR_MODE_STANDBY,
> +		.valid_ops_mask		= REGULATOR_CHANGE_MODE,
> +	},
> +	.num_consumer_supplies	= ARRAY_SIZE(cm_t35_vio_supplies),
> +	.consumer_supplies	= cm_t35_vio_supplies,
> +};
> +
>  static uint32_t cm_t35_keymap[] = {
>  	KEY(0, 0, KEY_A),	KEY(0, 1, KEY_B),	KEY(0, 2, KEY_LEFT),
>  	KEY(1, 0, KEY_UP),	KEY(1, 1, KEY_ENTER),	KEY(1, 2, KEY_DOWN),
> @@ -456,6 +473,7 @@ static struct twl4030_platform_data cm_t35_twldata = {
>  	.gpio		= &cm_t35_gpio_data,
>  	.vmmc1		= &cm_t35_vmmc1,
>  	.vsim		= &cm_t35_vsim,
> +	.vio		= &cm_t35_vio,
>  };
>  
>  static void __init cm_t35_init_i2c(void)

Applying to board branch for v3.3 merge window.

Tony

[PATCH 1/4] ARM: OMAP3: cm-t35: add regulator supply for ads7846

[Tony Lindgren]

* Tony Lindgren <tony@atomide.com> [111104 16:05]:
> * Igor Grinberg <grinberg@compulab.co.il> [111019 02:05]:
> 
> Applying to board branch for v3.3 merge window.

Hmm, actually I suggest you respin patches 2 and 3 so they apply
on their own to current fixes branch. Then update 1 and 4 to
apply on top of those.

This way we can apply 2 and 3 during the -rc cycle, and then
queue 1 and 4 for the next merge window.

Regards,

Tony

[PATCH 1/4] ARM: OMAP3: cm-t35: add regulator supply for ads7846

[Igor Grinberg]

Hi Tony,

On 11/05/11 01:57, Tony Lindgren wrote:
> * Tony Lindgren <tony@atomide.com> [111104 16:05]:
>> * Igor Grinberg <grinberg@compulab.co.il> [111019 02:05]:
>>
>> Applying to board branch for v3.3 merge window.
> 
> Hmm, actually I suggest you respin patches 2 and 3 so they apply
> on their own to current fixes branch. Then update 1 and 4 to
> apply on top of those.
> 
> This way we can apply 2 and 3 during the -rc cycle, and then
> queue 1 and 4 for the next merge window.

Well, actually all them are fixes, although it cannot be understood
from the subject.
I will adjust the subjects (and may be the commit messages also)
to be more specific and resend.

Thanks

-- 
Regards,
Igor.

[PATCH 1/4] ARM: OMAP3: cm-t35: add regulator supply for ads7846

[Tony Lindgren]

* Igor Grinberg <grinberg@compulab.co.il> [111106 04:45]:
> Hi Tony,
> 
> On 11/05/11 01:57, Tony Lindgren wrote:
> > * Tony Lindgren <tony@atomide.com> [111104 16:05]:
> >> * Igor Grinberg <grinberg@compulab.co.il> [111019 02:05]:
> >>
> >> Applying to board branch for v3.3 merge window.
> > 
> > Hmm, actually I suggest you respin patches 2 and 3 so they apply
> > on their own to current fixes branch. Then update 1 and 4 to
> > apply on top of those.
> > 
> > This way we can apply 2 and 3 during the -rc cycle, and then
> > queue 1 and 4 for the next merge window.
> 
> Well, actually all them are fixes, although it cannot be understood
> from the subject.
> I will adjust the subjects (and may be the commit messages also)
> to be more specific and resend.

Hmm 1 & 4 are "features that never worked" type fixes, so they
have flame potential. Those have to wait for the next merge window.

Patches 2 & 3 could be justified as fixes during the -rc cycle.

Or I can just apply all of them into board branch to wait for the
next merge window.

Tony

[PATCH 1/4] ARM: OMAP3: cm-t35: add regulator supply for ads7846

[Igor Grinberg]

On 11/07/11 22:31, Tony Lindgren wrote:
> * Igor Grinberg <grinberg@compulab.co.il> [111106 04:45]:
>> Hi Tony,
>>
>> On 11/05/11 01:57, Tony Lindgren wrote:
>>> * Tony Lindgren <tony@atomide.com> [111104 16:05]:
>>>> * Igor Grinberg <grinberg@compulab.co.il> [111019 02:05]:
>>>>
>>>> Applying to board branch for v3.3 merge window.
>>>
>>> Hmm, actually I suggest you respin patches 2 and 3 so they apply
>>> on their own to current fixes branch. Then update 1 and 4 to
>>> apply on top of those.
>>>
>>> This way we can apply 2 and 3 during the -rc cycle, and then
>>> queue 1 and 4 for the next merge window.
>>
>> Well, actually all them are fixes, although it cannot be understood
>> from the subject.
>> I will adjust the subjects (and may be the commit messages also)
>> to be more specific and resend.
> 
> Hmm 1 & 4 are "features that never worked" type fixes, so they
> have flame potential. Those have to wait for the next merge window.

Not exactly:

1/4 is a fix that I should have submitted more than a year ago,
just after the ads7846 got support for the regulators:
---------
commit 91143379b01b2020d8878d627ebe9dfb9d6eb4c8
Author: Grazvydas Ignotas <notasas@gmail.com>
Date:   Thu Feb 25 02:04:56 2010 -0800

    Input: ads7846 - add regulator support
    
    The ADS7846/TSC2046 touchscreen controllers can (and usually are)
    connected to various regulators for power, so add regulator support.
    
    Valid regulator will now be required, so boards without complete
    regulator setup should either disable regulator framework or enable
    CONFIG_REGULATOR_DUMMY.
    
    Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---------

4/4 is a functionality fix, that also should have been submitted
some time ago. We had this one locally and finally I've sent it out.
With out it, the 
USB hub sometimes works, but not always.
I've came back to that issue while working on CM-T3730 and
finally sent it.

So now, when I'm sure you have all the information,
what will it be?
If you still think it should be split up - that's fine with me,
I will do the thing and resend.
Otherwise, what about the v2 I've sent?

> 
> Patches 2 & 3 could be justified as fixes during the -rc cycle.

So here we have no doubt. Good.

> 
> Or I can just apply all of them into board branch to wait for the
> next merge window.

That can be an option, if it bothers you too much,
but I prefer to have this already in 3.2.

Thanks

-- 
Regards,
Igor.

[PATCH 1/4] ARM: OMAP3: cm-t35: add regulator supply for ads7846

[Tony Lindgren]

* Igor Grinberg <grinberg@compulab.co.il> [111108 04:47]:
> On 11/07/11 22:31, Tony Lindgren wrote:
> > * Igor Grinberg <grinberg@compulab.co.il> [111106 04:45]:
> >> Hi Tony,
> >>
> >> On 11/05/11 01:57, Tony Lindgren wrote:
> >>> * Tony Lindgren <tony@atomide.com> [111104 16:05]:
> >>>> * Igor Grinberg <grinberg@compulab.co.il> [111019 02:05]:
> >>>>
> >>>> Applying to board branch for v3.3 merge window.
> >>>
> >>> Hmm, actually I suggest you respin patches 2 and 3 so they apply
> >>> on their own to current fixes branch. Then update 1 and 4 to
> >>> apply on top of those.
> >>>
> >>> This way we can apply 2 and 3 during the -rc cycle, and then
> >>> queue 1 and 4 for the next merge window.
> >>
> >> Well, actually all them are fixes, although it cannot be understood
> >> from the subject.
> >> I will adjust the subjects (and may be the commit messages also)
> >> to be more specific and resend.
> > 
> > Hmm 1 & 4 are "features that never worked" type fixes, so they
> > have flame potential. Those have to wait for the next merge window.
> 
> Not exactly:
> 
> 1/4 is a fix that I should have submitted more than a year ago,
> just after the ads7846 got support for the regulators:

Sounds like it's not that urgent then :)

> > Or I can just apply all of them into board branch to wait for the
> > next merge window.
> 
> That can be an option, if it bothers you too much,
> but I prefer to have this already in 3.2.

I'll just apply them into board branch to wait for the next merge
window then.

Thanks,

Tony

[PATCH 1/4] ARM: OMAP3: cm-t35: add regulator supply for ads7846

[Igor Grinberg]

On 11/19/11 02:14, Tony Lindgren wrote:
> * Igor Grinberg <grinberg@compulab.co.il> [111108 04:47]:
>> On 11/07/11 22:31, Tony Lindgren wrote:
>>> * Igor Grinberg <grinberg@compulab.co.il> [111106 04:45]:
>>>> Hi Tony,
>>>>
>>>> On 11/05/11 01:57, Tony Lindgren wrote:
>>>>> * Tony Lindgren <tony@atomide.com> [111104 16:05]:
>>>>>> * Igor Grinberg <grinberg@compulab.co.il> [111019 02:05]:
>>>>>>
>>>>>> Applying to board branch for v3.3 merge window.
>>>>>
>>>>> Hmm, actually I suggest you respin patches 2 and 3 so they apply
>>>>> on their own to current fixes branch. Then update 1 and 4 to
>>>>> apply on top of those.
>>>>>
>>>>> This way we can apply 2 and 3 during the -rc cycle, and then
>>>>> queue 1 and 4 for the next merge window.
>>>>
>>>> Well, actually all them are fixes, although it cannot be understood
>>>> from the subject.
>>>> I will adjust the subjects (and may be the commit messages also)
>>>> to be more specific and resend.
>>>
>>> Hmm 1 & 4 are "features that never worked" type fixes, so they
>>> have flame potential. Those have to wait for the next merge window.
>>
>> Not exactly:
>>
>> 1/4 is a fix that I should have submitted more than a year ago,
>> just after the ads7846 got support for the regulators:
> 
> Sounds like it's not that urgent then :)
> 
>>> Or I can just apply all of them into board branch to wait for the
>>> next merge window.
>>
>> That can be an option, if it bothers you too much,
>> but I prefer to have this already in 3.2.
> 
> I'll just apply them into board branch to wait for the next merge
> window then.

No problem, thanks


-- 
Regards,
Igor.

[PATCH 2/4] ARM: OMAP3: cm-t35: fix DSS regulator supply

[Igor Grinberg]

cm-t35 DSS suplies are connected to VIO.
In fact, TPS65930 does not have VPLL2.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
---
 arch/arm/mach-omap2/board-cm-t35.c |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 6d93db0..1ee056f5 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -339,12 +339,10 @@ static struct regulator_consumer_supply cm_t35_vsim_supply[] = {
 	REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.0"),
 };
 
-static struct regulator_consumer_supply cm_t35_vdvi_supply[] = {
-	REGULATOR_SUPPLY("vdvi", "omapdss"),
-};
-
 static struct regulator_consumer_supply cm_t35_vio_supplies[] = {
 	REGULATOR_SUPPLY("vcc", "spi1.0"),
+	REGULATOR_SUPPLY("vdds_dsi", "omapdss"),
+	REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"),
 };
 
 /* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */
@@ -479,12 +477,7 @@ static struct twl4030_platform_data cm_t35_twldata = {
 static void __init cm_t35_init_i2c(void)
 {
 	omap3_pmic_get_config(&cm_t35_twldata, TWL_COMMON_PDATA_USB,
-			TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2);
-
-	cm_t35_twldata.vpll2->constraints.name = "VDVI";
-	cm_t35_twldata.vpll2->num_consumer_supplies =
-						ARRAY_SIZE(cm_t35_vdvi_supply);
-	cm_t35_twldata.vpll2->consumer_supplies = cm_t35_vdvi_supply;
+			TWL_COMMON_REGULATOR_VDAC);
 
 	omap3_pmic_init("tps65930", &cm_t35_twldata);
 }
-- 
1.7.3.4

[PATCH 3/4] ARM: OMAP3: cm-t35: fix audio

[Igor Grinberg]

TWL4030 audio codec is not being registered if no platform data is
supplied. Plovide platform data for the TWL4030 audio codec.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
---
 arch/arm/mach-omap2/board-cm-t35.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 1ee056f5..18cd50c 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -477,7 +477,8 @@ static struct twl4030_platform_data cm_t35_twldata = {
 static void __init cm_t35_init_i2c(void)
 {
 	omap3_pmic_get_config(&cm_t35_twldata, TWL_COMMON_PDATA_USB,
-			TWL_COMMON_REGULATOR_VDAC);
+			      TWL_COMMON_REGULATOR_VDAC |
+			      TWL_COMMON_PDATA_AUDIO);
 
 	omap3_pmic_init("tps65930", &cm_t35_twldata);
 }
-- 
1.7.3.4

[PATCH 3/4] ARM: OMAP3: cm-t35: fix audio

[Sergei Shtylyov]

Hello.

On 19-10-2011 13:39, Igor Grinberg wrote:

> TWL4030 audio codec is not being registered if no platform data is
> supplied. Plovide platform data for the TWL4030 audio codec.

    s/Plovide/Provide/. Perhaps a committer can fix this typo.

> Signed-off-by: Igor Grinberg<grinberg@compulab.co.il>

WBR, Sergei

[PATCH 3/4] ARM: OMAP3: cm-t35: fix audio

[Igor Grinberg]

Hi Sergei,

On 10/19/11 13:03, Sergei Shtylyov wrote:
> Hello.
> 
> On 19-10-2011 13:39, Igor Grinberg wrote:
> 
>> TWL4030 audio codec is not being registered if no platform data is
>> supplied. Plovide platform data for the TWL4030 audio codec.
> 
>    s/Plovide/Provide/. Perhaps a committer can fix this typo.

This one is really nice ;)
Thanks

-- 
Regards,
Igor.

[PATCH 3/4 v2] ARM: OMAP3: cm-t35: fix audio

[Igor Grinberg]

TWL4030 audio codec is not being registered if no platform data is
supplied. Provide platform data for the TWL4030 audio codec.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
---

v2: fix the commit message (10x to Sergei)

 arch/arm/mach-omap2/board-cm-t35.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 1ee056f5..18cd50c 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -477,7 +477,8 @@ static struct twl4030_platform_data cm_t35_twldata = {
 static void __init cm_t35_init_i2c(void)
 {
 	omap3_pmic_get_config(&cm_t35_twldata, TWL_COMMON_PDATA_USB,
-			TWL_COMMON_REGULATOR_VDAC);
+			      TWL_COMMON_REGULATOR_VDAC |
+			      TWL_COMMON_PDATA_AUDIO);
 
 	omap3_pmic_init("tps65930", &cm_t35_twldata);
 }
-- 
1.7.3.4

[PATCH 4/4] arm: omap3: cm-t35: add reset for sb-t35 usb hub

[Igor Grinberg]

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
---
 arch/arm/mach-omap2/board-cm-t35.c |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 18cd50c..3201c9e 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -52,7 +52,8 @@
 #include "hsmmc.h"
 #include "common-board-devices.h"
 
-#define CM_T35_GPIO_PENDOWN	57
+#define CM_T35_GPIO_PENDOWN		57
+#define SB_T35_USB_HUB_RESET_GPIO	167
 
 #define CM_T35_SMSC911X_CS	5
 #define CM_T35_SMSC911X_GPIO	163
@@ -436,6 +437,23 @@ static struct usbhs_omap_board_data usbhs_bdata __initdata = {
 	.reset_gpio_port[2]  = -EINVAL
 };
 
+static void cm_t35_init_usbh(void)
+{
+	int err;
+
+	err = gpio_request_one(SB_T35_USB_HUB_RESET_GPIO,
+			       GPIOF_OUT_INIT_LOW, "usb hub rst");
+	if (err) {
+		pr_err("SB-T35: usb hub rst gpio request failed: %d\n", err);
+	} else {
+		udelay(10);
+		gpio_set_value(SB_T35_USB_HUB_RESET_GPIO, 1);
+		msleep(1);
+	}
+
+	usbhs_init(&usbhs_bdata);
+}
+
 static int cm_t35_twl_gpio_setup(struct device *dev, unsigned gpio,
 				 unsigned ngpio)
 {
@@ -624,7 +642,7 @@ static void __init cm_t3x_common_init(void)
 	cm_t35_init_display();
 
 	usb_musb_init(NULL);
-	usbhs_init(&usbhs_bdata);
+	cm_t35_init_usbh();
 }
 
 static void __init cm_t35_init(void)
-- 
1.7.3.4

[PATCH 4/4 v2] ARM: OMAP3: cm-t35: add reset for sb-t35 usb hub

[Igor Grinberg]

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
---
v2: fixed subject, no change functional changes

 arch/arm/mach-omap2/board-cm-t35.c |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 18cd50c..3201c9e 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -52,7 +52,8 @@
 #include "hsmmc.h"
 #include "common-board-devices.h"
 
-#define CM_T35_GPIO_PENDOWN	57
+#define CM_T35_GPIO_PENDOWN		57
+#define SB_T35_USB_HUB_RESET_GPIO	167
 
 #define CM_T35_SMSC911X_CS	5
 #define CM_T35_SMSC911X_GPIO	163
@@ -436,6 +437,23 @@ static struct usbhs_omap_board_data usbhs_bdata __initdata = {
 	.reset_gpio_port[2]  = -EINVAL
 };
 
+static void cm_t35_init_usbh(void)
+{
+	int err;
+
+	err = gpio_request_one(SB_T35_USB_HUB_RESET_GPIO,
+			       GPIOF_OUT_INIT_LOW, "usb hub rst");
+	if (err) {
+		pr_err("SB-T35: usb hub rst gpio request failed: %d\n", err);
+	} else {
+		udelay(10);
+		gpio_set_value(SB_T35_USB_HUB_RESET_GPIO, 1);
+		msleep(1);
+	}
+
+	usbhs_init(&usbhs_bdata);
+}
+
 static int cm_t35_twl_gpio_setup(struct device *dev, unsigned gpio,
 				 unsigned ngpio)
 {
@@ -624,7 +642,7 @@ static void __init cm_t3x_common_init(void)
 	cm_t35_init_display();
 
 	usb_musb_init(NULL);
-	usbhs_init(&usbhs_bdata);
+	cm_t35_init_usbh();
 }
 
 static void __init cm_t35_init(void)
-- 
1.7.3.4

[PATCH v2 0/4] ARM: OMAP3: cm-t35/cm-t3730 fixes

[Igor Grinberg]

This patch series fixes several issues on boards in subj.
It is based on Tony's fixes branch.

v2:	- Rebase on top of fixes branch
	- Elaborate more in the commit messages

Igor Grinberg (4):
  ARM: OMAP3: cm-t35: fix ads7846 touchscreen
  ARM: OMAP3: cm-t35: fix DSS regulator supply
  ARM: OMAP3: cm-t35: fix audio
  ARM: OMAP3: cm-t35: fix USB hub

 arch/arm/mach-omap2/board-cm-t35.c |   50 ++++++++++++++++++++++++++++-------
 1 files changed, 40 insertions(+), 10 deletions(-)

-- 
1.7.3.4

[PATCH v2 1/4] ARM: OMAP3: cm-t35: fix ads7846 touchscreen

[Igor Grinberg]

ads7846 driver fails to find the regulator supply and
as a result the touchscreen is not working.
Fix this by adding a regulator supply for the ads7846 driver.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
---
v2:	- Rebase on top of fixes branch
	- Elaborate on the problem in the commit message

 arch/arm/mach-omap2/board-cm-t35.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index bd1bcac..7141cb6 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -343,6 +343,10 @@ static struct regulator_consumer_supply cm_t35_vdvi_supply[] = {
 	REGULATOR_SUPPLY("vdvi", "omapdss"),
 };
 
+static struct regulator_consumer_supply cm_t35_vio_supplies[] = {
+	REGULATOR_SUPPLY("vcc", "spi1.0"),
+};
+
 /* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */
 static struct regulator_init_data cm_t35_vmmc1 = {
 	.constraints = {
@@ -373,6 +377,19 @@ static struct regulator_init_data cm_t35_vsim = {
 	.consumer_supplies	= cm_t35_vsim_supply,
 };
 
+static struct regulator_init_data cm_t35_vio = {
+	.constraints = {
+		.min_uV			= 1800000,
+		.max_uV			= 1800000,
+		.apply_uV		= true,
+		.valid_modes_mask	= REGULATOR_MODE_NORMAL
+					| REGULATOR_MODE_STANDBY,
+		.valid_ops_mask		= REGULATOR_CHANGE_MODE,
+	},
+	.num_consumer_supplies	= ARRAY_SIZE(cm_t35_vio_supplies),
+	.consumer_supplies	= cm_t35_vio_supplies,
+};
+
 static uint32_t cm_t35_keymap[] = {
 	KEY(0, 0, KEY_A),	KEY(0, 1, KEY_B),	KEY(0, 2, KEY_LEFT),
 	KEY(1, 0, KEY_UP),	KEY(1, 1, KEY_ENTER),	KEY(1, 2, KEY_DOWN),
@@ -456,6 +473,7 @@ static struct twl4030_platform_data cm_t35_twldata = {
 	.gpio		= &cm_t35_gpio_data,
 	.vmmc1		= &cm_t35_vmmc1,
 	.vsim		= &cm_t35_vsim,
+	.vio		= &cm_t35_vio,
 };
 
 static void __init cm_t35_init_i2c(void)
-- 
1.7.3.4

[PATCH v2 2/4] ARM: OMAP3: cm-t35: fix DSS regulator supply

[Igor Grinberg]

cm-t35 DSS suplies are connected to VIO.
In fact, TPS65930 does not have VPLL2.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
---
v2:	- Rebase on top of fixes branch

 arch/arm/mach-omap2/board-cm-t35.c |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 7141cb6..724a23c 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -339,12 +339,10 @@ static struct regulator_consumer_supply cm_t35_vsim_supply[] = {
 	REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.0"),
 };
 
-static struct regulator_consumer_supply cm_t35_vdvi_supply[] = {
-	REGULATOR_SUPPLY("vdvi", "omapdss"),
-};
-
 static struct regulator_consumer_supply cm_t35_vio_supplies[] = {
 	REGULATOR_SUPPLY("vcc", "spi1.0"),
+	REGULATOR_SUPPLY("vdds_dsi", "omapdss"),
+	REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"),
 };
 
 /* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */
@@ -479,12 +477,7 @@ static struct twl4030_platform_data cm_t35_twldata = {
 static void __init cm_t35_init_i2c(void)
 {
 	omap3_pmic_get_config(&cm_t35_twldata, TWL_COMMON_PDATA_USB,
-			TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2);
-
-	cm_t35_twldata.vpll2->constraints.name = "VDVI";
-	cm_t35_twldata.vpll2->num_consumer_supplies =
-						ARRAY_SIZE(cm_t35_vdvi_supply);
-	cm_t35_twldata.vpll2->consumer_supplies = cm_t35_vdvi_supply;
+			TWL_COMMON_REGULATOR_VDAC);
 
 	omap3_pmic_init("tps65930", &cm_t35_twldata);
 }
-- 
1.7.3.4

[PATCH v2 3/4] ARM: OMAP3: cm-t35: fix audio

[Igor Grinberg]

TWL4030 audio codec is not being registered if no platform data is
supplied. Provide platform data for the TWL4030 audio codec.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
---
v2: - Rebase on top of fixes branch
    - fix the commit message (10x to Sergei)

 arch/arm/mach-omap2/board-cm-t35.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 724a23c..7b71fe1 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -477,7 +477,8 @@ static struct twl4030_platform_data cm_t35_twldata = {
 static void __init cm_t35_init_i2c(void)
 {
 	omap3_pmic_get_config(&cm_t35_twldata, TWL_COMMON_PDATA_USB,
-			TWL_COMMON_REGULATOR_VDAC);
+			      TWL_COMMON_REGULATOR_VDAC |
+			      TWL_COMMON_PDATA_AUDIO);
 
 	omap3_pmic_init("tps65930", &cm_t35_twldata);
 }
-- 
1.7.3.4

[PATCH v2 4/4] ARM: OMAP3: cm-t35: fix USB hub

[Igor Grinberg]

USB hub is not functional until is reset.
Reset the USB hub on SB-T35.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
---
v2:	- Rebase on top of fixes branch
	- Elaborate on the problem in the commit message

 arch/arm/mach-omap2/board-cm-t35.c |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 7b71fe1..e02c28b 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -53,7 +53,8 @@
 #include "hsmmc.h"
 #include "common-board-devices.h"
 
-#define CM_T35_GPIO_PENDOWN	57
+#define CM_T35_GPIO_PENDOWN		57
+#define SB_T35_USB_HUB_RESET_GPIO	167
 
 #define CM_T35_SMSC911X_CS	5
 #define CM_T35_SMSC911X_GPIO	163
@@ -436,6 +437,23 @@ static struct usbhs_omap_board_data usbhs_bdata __initdata = {
 	.reset_gpio_port[2]  = -EINVAL
 };
 
+static void cm_t35_init_usbh(void)
+{
+	int err;
+
+	err = gpio_request_one(SB_T35_USB_HUB_RESET_GPIO,
+			       GPIOF_OUT_INIT_LOW, "usb hub rst");
+	if (err) {
+		pr_err("SB-T35: usb hub rst gpio request failed: %d\n", err);
+	} else {
+		udelay(10);
+		gpio_set_value(SB_T35_USB_HUB_RESET_GPIO, 1);
+		msleep(1);
+	}
+
+	usbhs_init(&usbhs_bdata);
+}
+
 static int cm_t35_twl_gpio_setup(struct device *dev, unsigned gpio,
 				 unsigned ngpio)
 {
@@ -624,7 +642,7 @@ static void __init cm_t3x_common_init(void)
 	cm_t35_init_display();
 
 	usb_musb_init(NULL);
-	usbhs_init(&usbhs_bdata);
+	cm_t35_init_usbh();
 }
 
 static void __init cm_t35_init(void)
-- 
1.7.3.4