From: Tony Lindgren <tony@atomide.com>
Date: Wed, 4 Aug 2010 05:46:24 +0000 (+0300)
Subject: Merge branch 'for_2.6.36' of git://git.pwsan.com/linux-2.6 into omap-for-linus
X-Git-Tag: v2.6.36-rc1~488^2~7
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=331d919af416b9b92428947ef8c535a3e24c6b31;p=~shefty%2Frdma-dev.git

Merge branch 'for_2.6.36' of git://git.pwsan.com/linux-2.6 into omap-for-linus
---

331d919af416b9b92428947ef8c535a3e24c6b31
diff --cc arch/arm/mach-omap1/clock_data.c
index 9240bc1026a,ca4bd862033..af54114b8f0
--- a/arch/arm/mach-omap1/clock_data.c
+++ b/arch/arm/mach-omap1/clock_data.c
@@@ -475,27 -548,9 +548,27 @@@ static struct clk usb_dc_ck7xx = 
  	/* Direct from ULPD, no parent */
  	.rate		= 48000000,
  	.enable_reg	= OMAP1_IO_ADDRESS(SOFT_REQ_REG),
- 	.enable_bit	= 8,
+ 	.enable_bit	= SOFT_USB_OTG_DPLL_REQ_SHIFT,
  };
  
 +static struct clk uart1_7xx = {
 +	.name		= "uart1_ck",
 +	.ops		= &clkops_generic,
 +	/* Direct from ULPD, no parent */
 +	.rate		= 12000000,
 +	.enable_reg	= OMAP1_IO_ADDRESS(SOFT_REQ_REG),
 +	.enable_bit	= 9,
 +};
 +
 +static struct clk uart2_7xx = {
 +	.name		= "uart2_ck",
 +	.ops		= &clkops_generic,
 +	/* Direct from ULPD, no parent */
 +	.rate		= 12000000,
 +	.enable_reg	= OMAP1_IO_ADDRESS(SOFT_REQ_REG),
 +	.enable_bit	= 11,
 +};
 +
  static struct clk mclk_1510 = {
  	.name		= "mclk",
  	.ops		= &clkops_generic,