linux-omap 2.6.37: replace various patch with upstream versions and rediff
[openembedded.git] / recipes / linux / linux-omap-psp-2.6.29 / no-3517-hack.diff
blob06b62e581a62270992da756c02091c0990bb17aa
1 --- /tmp/usb-musb.c 2009-07-23 21:42:51.000000000 +0200
2 +++ git/arch/arm/mach-omap2/usb-musb.c 2009-07-23 21:46:46.000000000 +0200
3 @@ -152,12 +152,10 @@
4 if (cpu_is_omap243x()) {
5 musb_resources[0].start = OMAP243X_HS_BASE;
6 musb_plat.clock = "usbhs_ick";
7 - } else if (1 /*TODO: cpu_is_omap3517()*/) {
8 - musb_resources[0].start = OMAP3517_HSUSB_OTG_BASE;
9 + } else if (0 /*TODO: cpu_is_omap3517()*/) {
10 musb_plat.clock = "usbotg_vbusp_ck";
11 musb_resources[1].start = INT_OMAP3517_HSUSB_OTG;
12 /* set mux config for DRVVBUS */
13 - omap_cfg_reg(E25_3517_USB0_DRVVBUS);
14 /* OMAP3517 can provide max of 500mA */
15 musb_plat.power = 250;
16 } else {