[PATCH 1/2] ARM: OMAP: Add fuctional clock enabler for iva2
Signed-off-by: Hiroshi DOYU <[EMAIL PROTECTED]>
---
arch/arm/mach-omap2/clock34xx.h |5 +++--
arch/arm/mach-omap2/cm-regbits-34xx.h |1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h
index d00ef1e..4d9a67b 100644
--- a/arch/arm/mach-omap2/clock34xx.h
+++ b/arch/arm/mach-omap2/clock34xx.h
@@ -1046,12 +1046,13 @@ static struct clk iva2_ck = {
.name = "iva2_ck",
.parent = &dpll2_m2_ck,
.init = &omap2_init_clksel_parent,
+ .enable_reg = OMAP_CM_REGADDR(OMAP3430_IVA2_MOD, CM_FCLKEN),
+ .enable_bit = OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_SHIFT,
.clksel_reg = OMAP_CM_REGADDR(OMAP3430_IVA2_MOD,
OMAP3430_CM_IDLEST_PLL),
.clksel_mask= OMAP3430_ST_IVA2_CLK_MASK,
.clksel = iva2_clksel,
- .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES |
- PARENT_CONTROLS_CLOCK,
+ .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES,
.recalc = &omap2_clksel_recalc,
};
diff --git a/arch/arm/mach-omap2/cm-regbits-34xx.h
b/arch/arm/mach-omap2/cm-regbits-34xx.h
index 9249129..3c38395 100644
--- a/arch/arm/mach-omap2/cm-regbits-34xx.h
+++ b/arch/arm/mach-omap2/cm-regbits-34xx.h
@@ -56,6 +56,7 @@
/* CM_FCLKEN_IVA2 */
#define OMAP3430_CM_FCLKEN_IVA2_EN_IVA2(1 << 0)
+#define OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_SHIFT 0
/* CM_CLKEN_PLL_IVA2 */
#define OMAP3430_IVA2_DPLL_RAMPTIME_SHIFT 8
--
1.5.4.3.325.g6d216
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] Tiny fix. No comma after KERN_INFO.
Signed-off-by: Roman Tereshonkov <[EMAIL PROTECTED]> --- drivers/misc/sti/sdti.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/misc/sti/sdti.c b/drivers/misc/sti/sdti.c index 9b20ccd..adfbcbc 100644 --- a/drivers/misc/sti/sdti.c +++ b/drivers/misc/sti/sdti.c @@ -120,7 +120,7 @@ static int __init omap_sdti_init(void) i = sti_readl(SDTI_REVISION); snprintf(buf, sizeof(buf), "OMAP SDTI support loaded (HW v%u.%u)\n", (i >> 4) & 0x0f, i & 0x0f); - printk(KERN_INFO, "%s", buf); + printk(KERN_INFO "%s", buf); omap_sti_channel_write_trace(strlen(buf), 0xc3, buf, 239); return 0; -- 1.5.3.7 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] I2C: Fix twl4030 timeouts on omap3430
* Tony Lindgren <[EMAIL PROTECTED]> [080331 17:30]: > * Tony Lindgren <[EMAIL PROTECTED]> [080331 13:43]: > > * Tony Lindgren <[EMAIL PROTECTED]> [080328 10:41]: > > > Hi all, > > > > > > This helps with the annoying I2C timeouts. Does anybody have an idea > > > why the twl4030 chip does not like doing multiple transfers in a row? > > > > > > To me the only difference seems to be that clocks are idled between > > > writing the twl4030 register and reading the register value. > > > > I'll push this today with a REVISIT comment added. > > Looks like this kills twl4030 interrupts, so I've reverted it. After looking into this problem a bit more, looks like twl4030 reads to anything in "POWER ID" (modules 0x10 and higher) will hang twl4030 eventually and I2C controller gets stuck in mode where STP never clears. Repeated reads to "USB ID", "AUD ID" or "AUX ID" will not hang twl4030. Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] I2C: Fix twl4030 timeouts on omap3430
On Tue, Apr 01, 2008 at 03:43:56PM +0300, ext Tony Lindgren wrote: > * Tony Lindgren <[EMAIL PROTECTED]> [080331 17:30]: > > * Tony Lindgren <[EMAIL PROTECTED]> [080331 13:43]: > > > * Tony Lindgren <[EMAIL PROTECTED]> [080328 10:41]: > > > > Hi all, > > > > > > > > This helps with the annoying I2C timeouts. Does anybody have an idea > > > > why the twl4030 chip does not like doing multiple transfers in a row? > > > > > > > > To me the only difference seems to be that clocks are idled between > > > > writing the twl4030 register and reading the register value. > > > > > > I'll push this today with a REVISIT comment added. > > > > Looks like this kills twl4030 interrupts, so I've reverted it. > > After looking into this problem a bit more, looks like twl4030 reads > to anything in "POWER ID" (modules 0x10 and higher) will hang twl4030 > eventually and I2C controller gets stuck in mode where STP never clears. > > Repeated reads to "USB ID", "AUD ID" or "AUX ID" will not hang twl4030. > I remember seeing something similar when doing the powerbutton code. Klaus Pedersen found out that leaving CFG_BOOT to its reset value solved the problem. Unfortunately this breaks MADC and USB afaics, so it's not a real solution. CFG_BOOT is programmed in power_companion_init(). Cheers, Peter. -- goa is a state of mind -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] ARM: OMAP: Add fuctional clock enabler for iva2
On Tue, 1 Apr 2008, Hiroshi DOYU wrote: > Signed-off-by: Hiroshi DOYU <[EMAIL PROTECTED]> > --- > arch/arm/mach-omap2/clock34xx.h |5 +++-- > arch/arm/mach-omap2/cm-regbits-34xx.h |1 + > 2 files changed, 4 insertions(+), 2 deletions(-) Thanks Hiroshi, Acked-by: Paul Walmsley <[EMAIL PROTECTED]> - Paul -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] I2C: Fix twl4030 timeouts on omap3430
* Tony Lindgren <[EMAIL PROTECTED]> [080401 16:39]:
> * Peter 'p2' De Schrijver <[EMAIL PROTECTED]> [080401 16:01]:
> > On Tue, Apr 01, 2008 at 03:43:56PM +0300, ext Tony Lindgren wrote:
> > > * Tony Lindgren <[EMAIL PROTECTED]> [080331 17:30]:
> > > > * Tony Lindgren <[EMAIL PROTECTED]> [080331 13:43]:
> > > > > * Tony Lindgren <[EMAIL PROTECTED]> [080328 10:41]:
> > > > > > Hi all,
> > > > > >
> > > > > > This helps with the annoying I2C timeouts. Does anybody have an idea
> > > > > > why the twl4030 chip does not like doing multiple transfers in a
> > > > > > row?
> > > > > >
> > > > > > To me the only difference seems to be that clocks are idled between
> > > > > > writing the twl4030 register and reading the register value.
> > > > >
> > > > > I'll push this today with a REVISIT comment added.
> > > >
> > > > Looks like this kills twl4030 interrupts, so I've reverted it.
> > >
> > > After looking into this problem a bit more, looks like twl4030 reads
> > > to anything in "POWER ID" (modules 0x10 and higher) will hang twl4030
> > > eventually and I2C controller gets stuck in mode where STP never clears.
> > >
> > > Repeated reads to "USB ID", "AUD ID" or "AUX ID" will not hang twl4030.
> > >
> >
> > I remember seeing something similar when doing the powerbutton code.
> > Klaus Pedersen found out that leaving CFG_BOOT to its reset value solved
> > the problem. Unfortunately this breaks MADC and USB afaics, so it's not
> > a real solution. CFG_BOOT is programmed in power_companion_init().
>
> Great, this helped a lot! Looks like power_companion_init() tries to get
> osc_ck without checking for clkg_get() return value, and osc_ck does not
> exist in clock34xx.h. So R_CFG_BOOT gets set to default 26MHz value :)
>
> Will post a patch when available.
Thanks again, here's a patch, I've pushed it also.
Tony
From: Tony Lindgren <[EMAIL PROTECTED]>
Date: Tue, 1 Apr 2008 16:58:02 +0300
Subject: [PATCH] I2C: Fix twl4030 clock init
Without this patch twl4030 clock can get programmed to incorrect rate
which can eventually hang twl4030 reads. Also minor formatting fixes.
Signed-off-by: Tony Lindgren <[EMAIL PROTECTED]>
--- a/drivers/i2c/chips/twl4030-core.c
+++ b/drivers/i2c/chips/twl4030-core.c
@@ -672,11 +672,20 @@ static int power_companion_init(void)
u32 rate, ctrl = HFCLK_FREQ_26_MHZ;
int e = 0;
- osc = clk_get(NULL,"osc_ck");
+ if (cpu_is_omap2430())
+ osc = clk_get(NULL, "osc_ck");
+ else
+ osc = clk_get(NULL, "osc_sys_ck");
+ if (IS_ERR(osc)) {
+ printk(KERN_ERR "Skipping twl3040 internal clock init and "
+"using bootloader value (unknown osc rate)\n");
+ return 0;
+ }
+
rate = clk_get_rate(osc);
clk_put(osc);
- switch(rate) {
+ switch (rate) {
case 1920 : ctrl = HFCLK_FREQ_19p2_MHZ; break;
case 2600 : ctrl = HFCLK_FREQ_26_MHZ; break;
case 3840 : ctrl = HFCLK_FREQ_38p4_MHZ; break;
@@ -684,7 +693,7 @@ static int power_companion_init(void)
ctrl |= HIGH_PERF_SQ;
e |= unprotect_pm_master();
- /* effect->MADC+USB ck en */
+ /* effect->MADC+USB ck en */
e |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, ctrl, R_CFG_BOOT);
e |= protect_pm_master();
Re: [PATCH] I2C: Fix twl4030 timeouts on omap3430
* Peter 'p2' De Schrijver <[EMAIL PROTECTED]> [080401 16:01]: > On Tue, Apr 01, 2008 at 03:43:56PM +0300, ext Tony Lindgren wrote: > > * Tony Lindgren <[EMAIL PROTECTED]> [080331 17:30]: > > > * Tony Lindgren <[EMAIL PROTECTED]> [080331 13:43]: > > > > * Tony Lindgren <[EMAIL PROTECTED]> [080328 10:41]: > > > > > Hi all, > > > > > > > > > > This helps with the annoying I2C timeouts. Does anybody have an idea > > > > > why the twl4030 chip does not like doing multiple transfers in a row? > > > > > > > > > > To me the only difference seems to be that clocks are idled between > > > > > writing the twl4030 register and reading the register value. > > > > > > > > I'll push this today with a REVISIT comment added. > > > > > > Looks like this kills twl4030 interrupts, so I've reverted it. > > > > After looking into this problem a bit more, looks like twl4030 reads > > to anything in "POWER ID" (modules 0x10 and higher) will hang twl4030 > > eventually and I2C controller gets stuck in mode where STP never clears. > > > > Repeated reads to "USB ID", "AUD ID" or "AUX ID" will not hang twl4030. > > > > I remember seeing something similar when doing the powerbutton code. > Klaus Pedersen found out that leaving CFG_BOOT to its reset value solved > the problem. Unfortunately this breaks MADC and USB afaics, so it's not > a real solution. CFG_BOOT is programmed in power_companion_init(). Great, this helped a lot! Looks like power_companion_init() tries to get osc_ck without checking for clkg_get() return value, and osc_ck does not exist in clock34xx.h. So R_CFG_BOOT gets set to default 26MHz value :) Will post a patch when available. Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [RFC/PATH] OMAP: HSMMC: Fixes for 1.8V MMC2 interface
Hi, I did not see any board level code to power up the second slot along with this patch. Where is the code that enables 1.8V to the second slot? Regards, Madhu > -Original Message- > From: [EMAIL PROTECTED] > [mailto:[EMAIL PROTECTED] On Behalf Of Seth Forshee > Sent: Tuesday, April 01, 2008 6:22 AM > To: Francisco Alecrim > Cc: linux-omap@vger.kernel.org > Subject: Re: [RFC/PATH] OMAP: HSMMC: Fixes for 1.8V MMC2 interface > > On Mon, Mar 31, 2008 at 11:45:21PM +0300, Francisco Alecrim wrote: > > Hello Seth, > >It's fine and work for 3430! Maybe you should resend > changing the > > commit message. It's too big. > > > > Remove "RFC" from subject. > > > > What do you think? > > > > if(changes) > >Acked-by: Francisco Alecrim <[EMAIL PROTECTED]> > > Thank you for reviewing/testing. I wanted to get > verification for OMAP3430 > before I officially submitted the patch, and since you have > done that I will > submit it now. > -- > To unsubscribe from this list: send the line "unsubscribe > linux-omap" in > the body of a message to [EMAIL PROTECTED] > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [RFC/PATH] OMAP: HSMMC: Fixes for 1.8V MMC2 interface
On Tue, Apr 01, 2008 at 08:44:47PM +0530, Madhusudhan Chikkature Rajashekar wrote: > Hi, > > I did not see any board level code to power up the second slot along with > this patch. > Where is the code that enables 1.8V to the second slot? I am working with a custom board that isn't supported in the git repo, and I don't have access to any other board that I could test such changes with. These are just the chages I found were necessary to support the 1.8V-only host, regardless of whatever board support is needed. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [RFC/PATH] OMAP: HSMMC: Fixes for 1.8V MMC2 interface
ext Seth Forshee wrote: On Tue, Apr 01, 2008 at 08:44:47PM +0530, Madhusudhan Chikkature Rajashekar wrote: Hi, I did not see any board level code to power up the second slot along with this patch. Where is the code that enables 1.8V to the second slot? I am working with a custom board that isn't supported in the git repo, and I don't have access to any other board that I could test such changes with. These are just the chages I found were necessary to support the 1.8V-only host, regardless of whatever board support is needed. That's the same problem here!! I have a custom board too!! However, pushing patches [1] and [2] we will be able to enable the second controller with some modifications in board-sdp-mmc.c. [1] - OMAP: HSMMC: Fixes for 1.8V MMC2 interface [2] - [PATCH 1/1] PLAT: OMAP: Add device configuration to support second HSMMC slot on OMAP 2430 and 3430 boards. -- Francisco Keppler Silva Alecrim - INdT Phone: +55 92 2126-1017 Mobile: +55 92 9152-7000 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [RFC/PATH] OMAP: HSMMC: Fixes for 1.8V MMC2 interface
> -Original Message- > From: Francisco Alecrim [mailto:[EMAIL PROTECTED] > Sent: Wednesday, April 02, 2008 6:17 AM > To: Madhusudhan Chikkature Rajashekar; linux-omap@vger.kernel.org > Subject: Re: [RFC/PATH] OMAP: HSMMC: Fixes for 1.8V MMC2 interface > > ext Seth Forshee wrote: > > On Tue, Apr 01, 2008 at 08:44:47PM +0530, Madhusudhan > Chikkature Rajashekar wrote: > > > >> Hi, > >> > >> I did not see any board level code to power up the second > slot along with this patch. > >> Where is the code that enables 1.8V to the second slot? > >> > > > > I am working with a custom board that isn't supported in > the git repo, and I > > don't have access to any other board that I could test such > changes with. > > These are just the chages I found were necessary to support > the 1.8V-only > > host, regardless of whatever board support is needed. > > That's the same problem here!! I have a custom board too!! However, > pushing patches [1] and [2] we will be able to enable the second > controller with some modifications in board-sdp-mmc.c. Yes. ThatÂ’s what I meant. Some changes in the sdp board file would be required to Enable power to slot2 through triton LDOs. Currently I am tied up with some work, I will patch that when I get some time unless someone else sends a patch by then. > > [1] - OMAP: HSMMC: Fixes for 1.8V MMC2 interface > [2] - [PATCH 1/1] PLAT: OMAP: Add device configuration to > support second > HSMMC slot on OMAP 2430 and 3430 boards. > > -- > Francisco Keppler Silva Alecrim - INdT > Phone: +55 92 2126-1017 > Mobile: +55 92 9152-7000 > > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
