* [PATCH] OMAP4: MMC: fix power and audio issue, decouple USBC1 from MMC1
@ 2011-07-21 19:29 Bryan Buckley
2011-07-22 12:30 ` Kishore Kadiyala
0 siblings, 1 reply; 6+ messages in thread
From: Bryan Buckley @ 2011-07-21 19:29 UTC (permalink / raw)
To: linux-omap, linux-mmc
Cc: Santosh Shilimkar, Balaji T Krishnamoorthy, Kishore Kadiyala,
Moiz Sonasath, Viswanath Puttagunta, Tony Lindgren,
Madhusudhan Chikkature, Bryan Buckley
Remove OMAP4_USBC1_ICUSB_PWRDNZ_MASK during enable/disable PWRDNZ mode for
MMC1_PBIAS and associated extended-drain MMC1 I/O cell. This is in accordance
with the control module programming guide. This fixes a bug where if trying to
use gpio_98 or gpio_99 and MMC1 at the same time the GPIO signal will be
affected by a changing SDMMC1_VDDS.
Software must keep MMC1_PBIAS cell and MMC1_IO cell PWRDNZ signals low whenever
SDMMC1_VDDS ramps up/down or changes for cell protection purposes.
MMC1 is based on SDMMC1_VDDS whereas USBC1 is based on SIM_VDDS therefore
they can operate independently.
Signed-off-by: Bryan Buckley <bryan.buckley@ti.com>
---
arch/arm/mach-omap2/hsmmc.c | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
index 3842405..a6135df 100644
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -144,8 +144,7 @@ static void omap4_hsmmc1_before_set_reg(struct device *dev, int slot,
*/
reg = omap4_ctrl_pad_readl(control_pbias_offset);
reg &= ~(OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |
- OMAP4_MMC1_PWRDNZ_MASK |
- OMAP4_USBC1_ICUSB_PWRDNZ_MASK);
+ OMAP4_MMC1_PWRDNZ_MASK);
omap4_ctrl_pad_writel(reg, control_pbias_offset);
}
@@ -165,8 +164,7 @@ static void omap4_hsmmc1_after_set_reg(struct device *dev, int slot,
else
reg |= OMAP4_MMC1_PBIASLITE_VMODE_MASK;
reg |= (OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |
- OMAP4_MMC1_PWRDNZ_MASK |
- OMAP4_USBC1_ICUSB_PWRDNZ_MASK);
+ OMAP4_MMC1_PWRDNZ_MASK);
omap4_ctrl_pad_writel(reg, control_pbias_offset);
/* 4 microsec delay for comparator to generate an error*/
udelay(4);
@@ -174,16 +172,14 @@ static void omap4_hsmmc1_after_set_reg(struct device *dev, int slot,
if (reg & OMAP4_MMC1_PBIASLITE_VMODE_ERROR_MASK) {
pr_err("Pbias Voltage is not same as LDO\n");
/* Caution : On VMODE_ERROR Power Down MMC IO */
- reg &= ~(OMAP4_MMC1_PWRDNZ_MASK |
- OMAP4_USBC1_ICUSB_PWRDNZ_MASK);
+ reg &= ~(OMAP4_MMC1_PWRDNZ_MASK);
omap4_ctrl_pad_writel(reg, control_pbias_offset);
}
} else {
reg = omap4_ctrl_pad_readl(control_pbias_offset);
reg |= (OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |
OMAP4_MMC1_PWRDNZ_MASK |
- OMAP4_MMC1_PBIASLITE_VMODE_MASK |
- OMAP4_USBC1_ICUSB_PWRDNZ_MASK);
+ OMAP4_MMC1_PBIASLITE_VMODE_MASK);
omap4_ctrl_pad_writel(reg, control_pbias_offset);
}
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] OMAP4: MMC: fix power and audio issue, decouple USBC1 from MMC1
2011-07-21 19:29 [PATCH] OMAP4: MMC: fix power and audio issue, decouple USBC1 from MMC1 Bryan Buckley
@ 2011-07-22 12:30 ` Kishore Kadiyala
2011-08-12 15:13 ` Buckley, Bryan
0 siblings, 1 reply; 6+ messages in thread
From: Kishore Kadiyala @ 2011-07-22 12:30 UTC (permalink / raw)
To: Bryan Buckley
Cc: linux-omap, linux-mmc, Santosh Shilimkar, Balaji T Krishnamoorthy,
Kishore Kadiyala, Moiz Sonasath, Viswanath Puttagunta,
Tony Lindgren, Madhusudhan Chikkature
On Fri, Jul 22, 2011 at 12:59 AM, Bryan Buckley <bryan.buckley@ti.com> wrote:
> Remove OMAP4_USBC1_ICUSB_PWRDNZ_MASK during enable/disable PWRDNZ mode for
> MMC1_PBIAS and associated extended-drain MMC1 I/O cell. This is in accordance
> with the control module programming guide. This fixes a bug where if trying to
> use gpio_98 or gpio_99 and MMC1 at the same time the GPIO signal will be
> affected by a changing SDMMC1_VDDS.
>
> Software must keep MMC1_PBIAS cell and MMC1_IO cell PWRDNZ signals low whenever
> SDMMC1_VDDS ramps up/down or changes for cell protection purposes.
>
> MMC1 is based on SDMMC1_VDDS whereas USBC1 is based on SIM_VDDS therefore
> they can operate independently.
>
> Signed-off-by: Bryan Buckley <bryan.buckley@ti.com>
Good catch,
Acked-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
> ---
> arch/arm/mach-omap2/hsmmc.c | 12 ++++--------
> 1 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
> index 3842405..a6135df 100644
> --- a/arch/arm/mach-omap2/hsmmc.c
> +++ b/arch/arm/mach-omap2/hsmmc.c
> @@ -144,8 +144,7 @@ static void omap4_hsmmc1_before_set_reg(struct device *dev, int slot,
> */
> reg = omap4_ctrl_pad_readl(control_pbias_offset);
> reg &= ~(OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |
> - OMAP4_MMC1_PWRDNZ_MASK |
> - OMAP4_USBC1_ICUSB_PWRDNZ_MASK);
> + OMAP4_MMC1_PWRDNZ_MASK);
> omap4_ctrl_pad_writel(reg, control_pbias_offset);
> }
>
> @@ -165,8 +164,7 @@ static void omap4_hsmmc1_after_set_reg(struct device *dev, int slot,
> else
> reg |= OMAP4_MMC1_PBIASLITE_VMODE_MASK;
> reg |= (OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |
> - OMAP4_MMC1_PWRDNZ_MASK |
> - OMAP4_USBC1_ICUSB_PWRDNZ_MASK);
> + OMAP4_MMC1_PWRDNZ_MASK);
> omap4_ctrl_pad_writel(reg, control_pbias_offset);
> /* 4 microsec delay for comparator to generate an error*/
> udelay(4);
> @@ -174,16 +172,14 @@ static void omap4_hsmmc1_after_set_reg(struct device *dev, int slot,
> if (reg & OMAP4_MMC1_PBIASLITE_VMODE_ERROR_MASK) {
> pr_err("Pbias Voltage is not same as LDO\n");
> /* Caution : On VMODE_ERROR Power Down MMC IO */
> - reg &= ~(OMAP4_MMC1_PWRDNZ_MASK |
> - OMAP4_USBC1_ICUSB_PWRDNZ_MASK);
> + reg &= ~(OMAP4_MMC1_PWRDNZ_MASK);
> omap4_ctrl_pad_writel(reg, control_pbias_offset);
> }
> } else {
> reg = omap4_ctrl_pad_readl(control_pbias_offset);
> reg |= (OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |
> OMAP4_MMC1_PWRDNZ_MASK |
> - OMAP4_MMC1_PBIASLITE_VMODE_MASK |
> - OMAP4_USBC1_ICUSB_PWRDNZ_MASK);
> + OMAP4_MMC1_PBIASLITE_VMODE_MASK);
> omap4_ctrl_pad_writel(reg, control_pbias_offset);
> }
> }
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] OMAP4: MMC: fix power and audio issue, decouple USBC1 from MMC1
2011-07-22 12:30 ` Kishore Kadiyala
@ 2011-08-12 15:13 ` Buckley, Bryan
2011-09-09 14:04 ` T Krishnamoorthy, Balaji
0 siblings, 1 reply; 6+ messages in thread
From: Buckley, Bryan @ 2011-08-12 15:13 UTC (permalink / raw)
To: Kishore Kadiyala
Cc: linux-omap, linux-mmc, Santosh Shilimkar, Balaji T Krishnamoorthy,
Kishore Kadiyala, Moiz Sonasath, Viswanath Puttagunta,
Tony Lindgren, Madhusudhan Chikkature
On Fri, Jul 22, 2011 at 7:30 AM, Kishore Kadiyala
<kishorek.kadiyala@gmail.com> wrote:
>
> On Fri, Jul 22, 2011 at 12:59 AM, Bryan Buckley <bryan.buckley@ti.com> wrote:
> > Remove OMAP4_USBC1_ICUSB_PWRDNZ_MASK during enable/disable PWRDNZ mode for
> > MMC1_PBIAS and associated extended-drain MMC1 I/O cell. This is in accordance
> > with the control module programming guide. This fixes a bug where if trying to
> > use gpio_98 or gpio_99 and MMC1 at the same time the GPIO signal will be
> > affected by a changing SDMMC1_VDDS.
> >
> > Software must keep MMC1_PBIAS cell and MMC1_IO cell PWRDNZ signals low whenever
> > SDMMC1_VDDS ramps up/down or changes for cell protection purposes.
> >
> > MMC1 is based on SDMMC1_VDDS whereas USBC1 is based on SIM_VDDS therefore
> > they can operate independently.
> >
> > Signed-off-by: Bryan Buckley <bryan.buckley@ti.com>
>
> Good catch,
>
> Acked-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
>
Any other comments from anyone else? Noticed that this commit isn't
in any upstream branches. This patch will fix issues with people who
want to use GPIO 98/99 AND MMC1 at the same time. Would be good to
have this fix upstream.
--
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] OMAP4: MMC: fix power and audio issue, decouple USBC1 from MMC1
2011-08-12 15:13 ` Buckley, Bryan
@ 2011-09-09 14:04 ` T Krishnamoorthy, Balaji
2011-09-28 12:34 ` T Krishnamoorthy, Balaji
0 siblings, 1 reply; 6+ messages in thread
From: T Krishnamoorthy, Balaji @ 2011-09-09 14:04 UTC (permalink / raw)
To: Buckley, Bryan, Tony Lindgren
Cc: Kishore Kadiyala, linux-omap, linux-mmc, Santosh Shilimkar,
Kishore Kadiyala, Moiz Sonasath, Viswanath Puttagunta
On Fri, Aug 12, 2011 at 8:43 PM, Buckley, Bryan <bryan.buckley@ti.com> wrote:
> On Fri, Jul 22, 2011 at 7:30 AM, Kishore Kadiyala
> <kishorek.kadiyala@gmail.com> wrote:
>>
>> On Fri, Jul 22, 2011 at 12:59 AM, Bryan Buckley <bryan.buckley@ti.com> wrote:
>> > Remove OMAP4_USBC1_ICUSB_PWRDNZ_MASK during enable/disable PWRDNZ mode for
>> > MMC1_PBIAS and associated extended-drain MMC1 I/O cell. This is in accordance
>> > with the control module programming guide. This fixes a bug where if trying to
>> > use gpio_98 or gpio_99 and MMC1 at the same time the GPIO signal will be
>> > affected by a changing SDMMC1_VDDS.
>> >
>> > Software must keep MMC1_PBIAS cell and MMC1_IO cell PWRDNZ signals low whenever
>> > SDMMC1_VDDS ramps up/down or changes for cell protection purposes.
>> >
>> > MMC1 is based on SDMMC1_VDDS whereas USBC1 is based on SIM_VDDS therefore
>> > they can operate independently.
>> >
>> > Signed-off-by: Bryan Buckley <bryan.buckley@ti.com>
>>
>> Good catch,
>>
>> Acked-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
>>
>
> Any other comments from anyone else? Noticed that this commit isn't
> in any upstream branches. This patch will fix issues with people who
> want to use GPIO 98/99 AND MMC1 at the same time. Would be good to
> have this fix upstream.
>
FWIW: Tested on OMAP4 Blaze
Tested-by: Balaji T K <balajitk@ti.com>
--
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] OMAP4: MMC: fix power and audio issue, decouple USBC1 from MMC1
2011-09-09 14:04 ` T Krishnamoorthy, Balaji
@ 2011-09-28 12:34 ` T Krishnamoorthy, Balaji
2011-09-28 18:06 ` Tony Lindgren
0 siblings, 1 reply; 6+ messages in thread
From: T Krishnamoorthy, Balaji @ 2011-09-28 12:34 UTC (permalink / raw)
To: Buckley, Bryan, Tony Lindgren
Cc: Kishore Kadiyala, linux-omap, linux-mmc, Santosh Shilimkar,
Kishore Kadiyala, Moiz Sonasath, Viswanath Puttagunta
Hi Tony,
Can you queue this patch ?
On Fri, Sep 9, 2011 at 7:34 PM, T Krishnamoorthy, Balaji
<balajitk@ti.com> wrote:
> On Fri, Aug 12, 2011 at 8:43 PM, Buckley, Bryan <bryan.buckley@ti.com> wrote:
>> On Fri, Jul 22, 2011 at 7:30 AM, Kishore Kadiyala
>> <kishorek.kadiyala@gmail.com> wrote:
>>>
>>> On Fri, Jul 22, 2011 at 12:59 AM, Bryan Buckley <bryan.buckley@ti.com> wrote:
>>> > Remove OMAP4_USBC1_ICUSB_PWRDNZ_MASK during enable/disable PWRDNZ mode for
>>> > MMC1_PBIAS and associated extended-drain MMC1 I/O cell. This is in accordance
>>> > with the control module programming guide. This fixes a bug where if trying to
>>> > use gpio_98 or gpio_99 and MMC1 at the same time the GPIO signal will be
>>> > affected by a changing SDMMC1_VDDS.
>>> >
>>> > Software must keep MMC1_PBIAS cell and MMC1_IO cell PWRDNZ signals low whenever
>>> > SDMMC1_VDDS ramps up/down or changes for cell protection purposes.
>>> >
>>> > MMC1 is based on SDMMC1_VDDS whereas USBC1 is based on SIM_VDDS therefore
>>> > they can operate independently.
>>> >
>>> > Signed-off-by: Bryan Buckley <bryan.buckley@ti.com>
>>>
>>> Good catch,
>>>
>>> Acked-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
>>>
>>
>> Any other comments from anyone else? Noticed that this commit isn't
>> in any upstream branches. This patch will fix issues with people who
>> want to use GPIO 98/99 AND MMC1 at the same time. Would be good to
>> have this fix upstream.
>>
> FWIW: Tested on OMAP4 Blaze
> Tested-by: Balaji T K <balajitk@ti.com>
>
--
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] OMAP4: MMC: fix power and audio issue, decouple USBC1 from MMC1
2011-09-28 12:34 ` T Krishnamoorthy, Balaji
@ 2011-09-28 18:06 ` Tony Lindgren
0 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2011-09-28 18:06 UTC (permalink / raw)
To: T Krishnamoorthy, Balaji
Cc: Buckley, Bryan, Kishore Kadiyala, linux-omap, linux-mmc,
Santosh Shilimkar, Kishore Kadiyala, Moiz Sonasath,
Viswanath Puttagunta
* T Krishnamoorthy, Balaji <balajitk@ti.com> [110928 05:00]:
> Hi Tony,
>
> Can you queue this patch ?
Thanks, adding into fixes.
Tony
> On Fri, Sep 9, 2011 at 7:34 PM, T Krishnamoorthy, Balaji
> <balajitk@ti.com> wrote:
> > On Fri, Aug 12, 2011 at 8:43 PM, Buckley, Bryan <bryan.buckley@ti.com> wrote:
> >> On Fri, Jul 22, 2011 at 7:30 AM, Kishore Kadiyala
> >> <kishorek.kadiyala@gmail.com> wrote:
> >>>
> >>> On Fri, Jul 22, 2011 at 12:59 AM, Bryan Buckley <bryan.buckley@ti.com> wrote:
> >>> > Remove OMAP4_USBC1_ICUSB_PWRDNZ_MASK during enable/disable PWRDNZ mode for
> >>> > MMC1_PBIAS and associated extended-drain MMC1 I/O cell. This is in accordance
> >>> > with the control module programming guide. This fixes a bug where if trying to
> >>> > use gpio_98 or gpio_99 and MMC1 at the same time the GPIO signal will be
> >>> > affected by a changing SDMMC1_VDDS.
> >>> >
> >>> > Software must keep MMC1_PBIAS cell and MMC1_IO cell PWRDNZ signals low whenever
> >>> > SDMMC1_VDDS ramps up/down or changes for cell protection purposes.
> >>> >
> >>> > MMC1 is based on SDMMC1_VDDS whereas USBC1 is based on SIM_VDDS therefore
> >>> > they can operate independently.
> >>> >
> >>> > Signed-off-by: Bryan Buckley <bryan.buckley@ti.com>
> >>>
> >>> Good catch,
> >>>
> >>> Acked-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
> >>>
> >>
> >> Any other comments from anyone else? Noticed that this commit isn't
> >> in any upstream branches. This patch will fix issues with people who
> >> want to use GPIO 98/99 AND MMC1 at the same time. Would be good to
> >> have this fix upstream.
> >>
> > FWIW: Tested on OMAP4 Blaze
> > Tested-by: Balaji T K <balajitk@ti.com>
> >
--
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-09-28 18:06 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-21 19:29 [PATCH] OMAP4: MMC: fix power and audio issue, decouple USBC1 from MMC1 Bryan Buckley
2011-07-22 12:30 ` Kishore Kadiyala
2011-08-12 15:13 ` Buckley, Bryan
2011-09-09 14:04 ` T Krishnamoorthy, Balaji
2011-09-28 12:34 ` T Krishnamoorthy, Balaji
2011-09-28 18:06 ` Tony Lindgren
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).