From 9f0d7a834ee176b396ba5495999ee20ec7934732 Mon Sep 17 00:00:00 2001 From: Roland Stigge Date: Sun, 1 Jul 2012 21:06:45 +0200 Subject: [PATCH] --- yaml --- r: 313159 b: refs/heads/master c: 382656d81be23853f1a1a49d6669a92f70f5938b h: refs/heads/master i: 313157: c5d2eb940eb4a9f7e59ef3338f6c3590a8d76b3e 313155: 37ce92b879f15fc31a5108f9b9f3e06ea22adfd3 313151: fe6d0a8ba3ba0f750da048eec8a7d82612a5bb41 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-lpc32xx/phy3250.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 56a7d66740bb..9e751cb8fd9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a408e8f423e91a50727e7e85461cf7677d25ebf6 +refs/heads/master: 382656d81be23853f1a1a49d6669a92f70f5938b diff --git a/trunk/arch/arm/mach-lpc32xx/phy3250.c b/trunk/arch/arm/mach-lpc32xx/phy3250.c index 5be2cbfb4d99..ff3c1f4aa500 100644 --- a/trunk/arch/arm/mach-lpc32xx/phy3250.c +++ b/trunk/arch/arm/mach-lpc32xx/phy3250.c @@ -248,18 +248,6 @@ static void __init lpc3250_machine_init(void) tmp |= LPC32XX_CLKPWR_LCDCTRL_LCDTYPE_TFT16; __raw_writel(tmp, LPC32XX_CLKPWR_LCDCLK_CTRL); - /* Set up USB power */ - tmp = __raw_readl(LPC32XX_CLKPWR_USB_CTRL); - tmp |= LPC32XX_CLKPWR_USBCTRL_HCLK_EN | - LPC32XX_CLKPWR_USBCTRL_USBI2C_EN; - __raw_writel(tmp, LPC32XX_CLKPWR_USB_CTRL); - - /* Set up I2C pull levels */ - tmp = __raw_readl(LPC32XX_CLKPWR_I2C_CLK_CTRL); - tmp |= LPC32XX_CLKPWR_I2CCLK_USBI2CHI_DRIVE | - LPC32XX_CLKPWR_I2CCLK_I2C2HI_DRIVE; - __raw_writel(tmp, LPC32XX_CLKPWR_I2C_CLK_CTRL); - lpc32xx_serial_init(); /* Test clock needed for UDA1380 initial init */