From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andre Schwarz Date: Mon, 04 Apr 2011 12:52:25 +0200 Subject: [U-Boot] [PATCH] mpc83xx: restrict UTMI PHY configuration to 831x parts In-Reply-To: <20110401165318.ad83f32d.kim.phillips@freescale.com> References: <1289911070-21742-1-git-send-email-andre.schwarz@matrix-vision.de> <20101128091038.bdcf8fd0.kim.phillips@freescale.com> <378632743.6.1291017561200.JavaMail.open-xchange@proteus> <20101213165238.0b496e57.kim.phillips@freescale.com> <4D6BCADE.1060206@matrix-vision.de> <20110330201414.a930d14a.kim.phillips@freescale.com> <4D9432A6.4030701@matrix-vision.de> <20110401165318.ad83f32d.kim.phillips@freescale.com> Message-ID: <4D99A2E9.4010404@matrix-vision.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Kim, excellent - thanks. > i.e, to those parts that have PHY_CLK_VALID bits in their USB > CONTROL registers: > > mpc8308 WU_INT, PHY_CLK_SEL, USB_EN, WU_INT_EN, ULPI_INT_EN > mpc831x PHY_CLK_VALID, WU_INT, CLKIN_SEL, PHY_CLK_SEL, UTMI_PHY_EN, > PLL_RESET, REFSEL, OTG_PORT, KEEP_OTG_ON, LSF_EN, USB_EN, > ULPI_INT_EN > mpc834x USB_EN, ULPI_INT1_EN (MPH only), ULPI_INT0_EN > mpc837x USB_EN, ULPI_INT_EN > > (mpc832x, mpc8360 don't have a USB_EHCI_FSL compatible controller) > > this prevents non-831x parts from never completing cpu_init_f(), > because the (non-existent) PHY_CLK_VALID bit never gets set. > > Reported-by: Andre Schwarz > Signed-off-by: Kim Phillips Tested-by: Andre Schwarz Works on MPC8343 and MPC8377. > --- > arch/powerpc/cpu/mpc83xx/cpu_init.c | 4 +--- > 1 files changed, 1 insertions(+), 3 deletions(-) > > diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c > index 7a1cae7..76afba5 100644 > --- a/arch/powerpc/cpu/mpc83xx/cpu_init.c > +++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c > @@ -326,8 +326,7 @@ void cpu_init_f (volatile immap_t * im) > im->gpio[1].dat = CONFIG_SYS_GPIO2_DAT; > im->gpio[1].dir = CONFIG_SYS_GPIO2_DIR; > #endif > -#ifdef CONFIG_USB_EHCI_FSL > -#ifndef CONFIG_MPC834x > +#if defined(CONFIG_USB_EHCI_FSL)&& defined(CONFIG_MPC831x) > uint32_t temp; > struct usb_ehci *ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB_ADDR; > > @@ -340,7 +339,6 @@ void cpu_init_f (volatile immap_t * im) > udelay(1000); > } while (!(temp& PHY_CLK_VALID)); > #endif > -#endif > } > > int cpu_init_r (void) Cheers, Andr? MATRIX VISION GmbH, Talstrasse 16, DE-71570 Oppenweiler Registergericht: Amtsgericht Stuttgart, HRB 271090 Geschaeftsfuehrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner