From fe6d0a8ba3ba0f750da048eec8a7d82612a5bb41 Mon Sep 17 00:00:00 2001 From: Alexandre Pereira da Silva Date: Wed, 13 Jun 2012 19:28:23 -0300 Subject: [PATCH] --- yaml --- r: 313151 b: refs/heads/master c: 112e9adda4ddcd56895f20c4c886d2493d7907f3 h: refs/heads/master i: 313149: 57c5c560b2c2997377e62d02766080ae1f9fd3b1 313147: 8d4b044e432295af752216ccb719e742b410e8bf 313143: 8c7d215318d79cc1a954632d6681e6c148e6ec88 313135: 61dc7d3db69f6c989919aec98465d5e2dc283018 313119: da2123d8be6c20b9848da14ea360c5f2dbfe2f5b 313087: b17da3d4326b274296571833e1333e3dd8b50c02 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-lpc32xx/phy3250.c | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 7d3b58dffdfe..c79777ab1a92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 72b78cf713176f376f369df8ccca865c5d51c42b +refs/heads/master: 112e9adda4ddcd56895f20c4c886d2493d7907f3 diff --git a/trunk/arch/arm/mach-lpc32xx/phy3250.c b/trunk/arch/arm/mach-lpc32xx/phy3250.c index 93408883eaca..d7389598c21a 100644 --- a/trunk/arch/arm/mach-lpc32xx/phy3250.c +++ b/trunk/arch/arm/mach-lpc32xx/phy3250.c @@ -272,28 +272,11 @@ static void __init lpc3250_machine_init(void) lpc32xx_serial_init(); - /* - * AMBA peripheral clocks need to be enabled prior to AMBA device - * detection or a data fault will occur, so enable the clocks - * here. - */ tmp = __raw_readl(LPC32XX_CLKPWR_MS_CTRL); tmp |= LPC32XX_CLKPWR_MSCARD_SDCARD_EN | LPC32XX_CLKPWR_MSCARD_MSDIO_PU_EN; __raw_writel(tmp, LPC32XX_CLKPWR_MS_CTRL); - tmp = __raw_readl(LPC32XX_CLKPWR_LCDCLK_CTRL); - __raw_writel((tmp | LPC32XX_CLKPWR_LCDCTRL_CLK_EN), - LPC32XX_CLKPWR_LCDCLK_CTRL); - - tmp = __raw_readl(LPC32XX_CLKPWR_SSP_CLK_CTRL); - __raw_writel((tmp | LPC32XX_CLKPWR_SSPCTRL_SSPCLK0_EN), - LPC32XX_CLKPWR_SSP_CLK_CTRL); - - tmp = __raw_readl(LPC32XX_CLKPWR_DMA_CLK_CTRL); - __raw_writel((tmp | LPC32XX_CLKPWR_DMACLKCTRL_CLK_EN), - LPC32XX_CLKPWR_DMA_CLK_CTRL); - /* Test clock needed for UDA1380 initial init */ __raw_writel(LPC32XX_CLKPWR_TESTCLK2_SEL_MOSC | LPC32XX_CLKPWR_TESTCLK_TESTCLK2_EN,