| Message ID | 1323805272-32005-1-git-send-email-clalancette@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
ping? Tom, Aneesh, what do you think of this version? Chris Lalancette On Tue, Dec 13, 2011 at 2:41 PM, <clalancette@gmail.com> wrote: > From: Chris Lalancette <clalancette@gmail.com> > > During misc_init_r, make sure to setup the clocks > properly for the USB hub on the pandaboard. With > this in place, the USB hub and the ethernet works > on the pandaboard. > > Signed-off-by: Chris Lalancette <clalancette@gmail.com> > --- > v2: Incorporate changes from Aneesh (aneesh@ti.com) to support > USB PHY from sys_clk and PER dpll. Also use symbolic > constants instead of magic values. > > arch/arm/include/asm/arch-omap4/clocks.h | 63 ++++++++++++++++++++++++++++++ > board/ti/panda/panda.c | 59 ++++++++++++++++++++++++++++ > 2 files changed, 122 insertions(+), 0 deletions(-) >
On Thu, Dec 15, 2011 at 7:37 AM, Chris Lalancette <clalancette@gmail.com> wrote: > ping? Tom, Aneesh, what do you think of this version? Just trying to make sure folks have a chance to review and comment, sorry, looks good from my PoV. > > Chris Lalancette > > On Tue, Dec 13, 2011 at 2:41 PM, <clalancette@gmail.com> wrote: >> From: Chris Lalancette <clalancette@gmail.com> >> >> During misc_init_r, make sure to setup the clocks >> properly for the USB hub on the pandaboard. With >> this in place, the USB hub and the ethernet works >> on the pandaboard. >> >> Signed-off-by: Chris Lalancette <clalancette@gmail.com> >> --- >> v2: Incorporate changes from Aneesh (aneesh@ti.com) to support >> USB PHY from sys_clk and PER dpll. Also use symbolic >> constants instead of magic values. >> >> arch/arm/include/asm/arch-omap4/clocks.h | 63 ++++++++++++++++++++++++++++++ >> board/ti/panda/panda.c | 59 ++++++++++++++++++++++++++++ >> 2 files changed, 122 insertions(+), 0 deletions(-) >>
On Wednesday 14 December 2011 01:11 AM, clalancette@gmail.com wrote: > From: Chris Lalancette<clalancette@gmail.com> > > During misc_init_r, make sure to setup the clocks > properly for the USB hub on the pandaboard. With > this in place, the USB hub and the ethernet works > on the pandaboard. > > Signed-off-by: Chris Lalancette<clalancette@gmail.com> > --- > v2: Incorporate changes from Aneesh (aneesh@ti.com) to support > USB PHY from sys_clk and PER dpll. Also use symbolic > constants instead of magic values. > Looks good to me. Thanks a lot for incorporating the suggested changes. FWIW, Acked-by: Aneesh V <aneesh@ti.com>
On Thu, Dec 15, 2011 at 10:08 AM, Aneesh V <aneesh@ti.com> wrote: > On Wednesday 14 December 2011 01:11 AM, clalancette@gmail.com wrote: >> >> From: Chris Lalancette<clalancette@gmail.com> >> >> During misc_init_r, make sure to setup the clocks >> properly for the USB hub on the pandaboard. With >> this in place, the USB hub and the ethernet works >> on the pandaboard. >> >> Signed-off-by: Chris Lalancette<clalancette@gmail.com> >> --- >> v2: Incorporate changes from Aneesh (aneesh@ti.com) to support >> USB PHY from sys_clk and PER dpll. Also use symbolic >> constants instead of magic values. >> > > Looks good to me. Thanks a lot for incorporating the suggested changes. > > FWIW, > Acked-by: Aneesh V <aneesh@ti.com> Thanks Tom, Aneesh. Tom, I presume you will pick it up through your tree? Chris Lalancette
On Thu, Dec 15, 2011 at 9:16 AM, Chris Lalancette <clalancette@gmail.com> wrote: > On Thu, Dec 15, 2011 at 10:08 AM, Aneesh V <aneesh@ti.com> wrote: >> On Wednesday 14 December 2011 01:11 AM, clalancette@gmail.com wrote: >>> >>> From: Chris Lalancette<clalancette@gmail.com> >>> >>> During misc_init_r, make sure to setup the clocks >>> properly for the USB hub on the pandaboard. With >>> this in place, the USB hub and the ethernet works >>> on the pandaboard. >>> >>> Signed-off-by: Chris Lalancette<clalancette@gmail.com> >>> --- >>> v2: Incorporate changes from Aneesh (aneesh@ti.com) to support >>> USB PHY from sys_clk and PER dpll. Also use symbolic >>> constants instead of magic values. >>> >> >> Looks good to me. Thanks a lot for incorporating the suggested changes. >> >> FWIW, >> Acked-by: Aneesh V <aneesh@ti.com> > > Thanks Tom, Aneesh. Tom, I presume you will pick it up through your tree? Correct, thanks.
diff --git a/arch/arm/include/asm/arch-omap4/clocks.h b/arch/arm/include/asm/arch-omap4/clocks.h index c2a9b46..cd304e8 100644 --- a/arch/arm/include/asm/arch-omap4/clocks.h +++ b/arch/arm/include/asm/arch-omap4/clocks.h @@ -470,6 +470,47 @@ struct omap4_prcm_regs { }; +struct omap4_scrm_regs { + u32 revision; /* 0x0000 */ + u32 pad00[63]; + u32 clksetuptime; /* 0x0100 */ + u32 pmicsetuptime; /* 0x0104 */ + u32 pad01[2]; + u32 altclksrc; /* 0x0110 */ + u32 pad02[2]; + u32 c2cclkm; /* 0x011c */ + u32 pad03[56]; + u32 extclkreq; /* 0x0200 */ + u32 accclkreq; /* 0x0204 */ + u32 pwrreq; /* 0x0208 */ + u32 pad04[1]; + u32 auxclkreq0; /* 0x0210 */ + u32 auxclkreq1; /* 0x0214 */ + u32 auxclkreq2; /* 0x0218 */ + u32 auxclkreq3; /* 0x021c */ + u32 auxclkreq4; /* 0x0220 */ + u32 auxclkreq5; /* 0x0224 */ + u32 pad05[3]; + u32 c2cclkreq; /* 0x0234 */ + u32 pad06[54]; + u32 auxclk0; /* 0x0310 */ + u32 auxclk1; /* 0x0314 */ + u32 auxclk2; /* 0x0318 */ + u32 auxclk3; /* 0x031c */ + u32 auxclk4; /* 0x0320 */ + u32 auxclk5; /* 0x0324 */ + u32 pad07[54]; + u32 rsttime_reg; /* 0x0400 */ + u32 pad08[6]; + u32 c2crstctrl; /* 0x041c */ + u32 extpwronrstctrl; /* 0x0420 */ + u32 pad09[59]; + u32 extwarmrstst_reg; /* 0x0510 */ + u32 apewarmrstst_reg; /* 0x0514 */ + u32 pad10[1]; + u32 c2cwarmrstst_reg; /* 0x051C */ +}; + /* DPLL register offsets */ #define CM_CLKMODE_DPLL 0 #define CM_IDLEST_DPLL 0x4 @@ -652,6 +693,28 @@ struct omap4_prcm_regs { #define TPS62361_BASE_VOLT_MV 500 #define TPS62361_VSEL0_GPIO 7 +/* AUXCLKx reg fields */ +#define AUXCLK_ENABLE_MASK (1 << 8) +#define AUXCLK_SRCSELECT_SHIFT 1 +#define AUXCLK_SRCSELECT_MASK (3 << 1) +#define AUXCLK_CLKDIV_SHIFT 16 +#define AUXCLK_CLKDIV_MASK (0xF << 16) + +#define AUXCLK_SRCSELECT_SYS_CLK 0 +#define AUXCLK_SRCSELECT_CORE_DPLL 1 +#define AUXCLK_SRCSELECT_PER_DPLL 2 +#define AUXCLK_SRCSELECT_ALTERNATE 3 + +#define AUXCLK_CLKDIV_2 1 +#define AUXCLK_CLKDIV_16 0xF + +/* ALTCLKSRC */ +#define ALTCLKSRC_MODE_MASK 3 +#define ALTCLKSRC_ENABLE_INT_MASK 4 +#define ALTCLKSRC_ENABLE_EXT_MASK 8 + +#define ALTCLKSRC_MODE_ACTIVE 1 + /* Defines for DPLL setup */ #define DPLL_LOCKED_FREQ_TOLERANCE_0 0 #define DPLL_LOCKED_FREQ_TOLERANCE_500_KHZ 500 diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c index b4271fb..fc8c0b4 100644 --- a/board/ti/panda/panda.c +++ b/board/ti/panda/panda.c @@ -24,15 +24,21 @@ #include <common.h> #include <asm/arch/sys_proto.h> #include <asm/arch/mmc_host_def.h> +#include <asm/arch/clocks.h> +#include <asm/arch/gpio.h> #include "panda_mux_data.h" +#define PANDA_ULPI_PHY_TYPE_GPIO 182 + DECLARE_GLOBAL_DATA_PTR; const struct omap_sysinfo sysinfo = { "Board: OMAP4 Panda\n" }; +struct omap4_scrm_regs *const scrm = (struct omap4_scrm_regs *)0x4a30a000; + /** * @brief board_init * @@ -62,6 +68,59 @@ int board_eth_init(bd_t *bis) */ int misc_init_r(void) { + int phy_type; + u32 auxclk, altclksrc; + + /* EHCI is not supported on ES1.0 */ + if (omap_revision() == OMAP4430_ES1_0) + return 0; + + gpio_direction_input(PANDA_ULPI_PHY_TYPE_GPIO); + phy_type = gpio_get_value(PANDA_ULPI_PHY_TYPE_GPIO); + + if (phy_type == 1) { + /* ULPI PHY supplied by auxclk3 derived from sys_clk */ + debug("ULPI PHY supplied by auxclk3\n"); + + auxclk = readl(&scrm->auxclk3); + /* Select sys_clk */ + auxclk &= ~AUXCLK_SRCSELECT_MASK; + auxclk |= AUXCLK_SRCSELECT_SYS_CLK << AUXCLK_SRCSELECT_SHIFT; + /* Set the divisor to 2 */ + auxclk &= ~AUXCLK_CLKDIV_MASK; + auxclk |= AUXCLK_CLKDIV_2 << AUXCLK_CLKDIV_SHIFT; + /* Request auxilary clock #3 */ + auxclk |= AUXCLK_ENABLE_MASK; + + writel(auxclk, &scrm->auxclk3); + } else { + /* ULPI PHY supplied by auxclk1 derived from PER dpll */ + debug("ULPI PHY supplied by auxclk1\n"); + + auxclk = readl(&scrm->auxclk1); + /* Select per DPLL */ + auxclk &= ~AUXCLK_SRCSELECT_MASK; + auxclk |= AUXCLK_SRCSELECT_PER_DPLL << AUXCLK_SRCSELECT_SHIFT; + /* Set the divisor to 16 */ + auxclk &= ~AUXCLK_CLKDIV_MASK; + auxclk |= AUXCLK_CLKDIV_16 << AUXCLK_CLKDIV_SHIFT; + /* Request auxilary clock #3 */ + auxclk |= AUXCLK_ENABLE_MASK; + + writel(auxclk, &scrm->auxclk1); + } + + altclksrc = readl(&scrm->altclksrc); + + /* Activate alternate system clock supplier */ + altclksrc &= ~ALTCLKSRC_MODE_MASK; + altclksrc |= ALTCLKSRC_MODE_ACTIVE; + + /* enable clocks */ + altclksrc |= ALTCLKSRC_ENABLE_INT_MASK | ALTCLKSRC_ENABLE_EXT_MASK; + + writel(altclksrc, &scrm->altclksrc); + return 0; }