From: Greg Kroah-Hartman Date: Tue, 22 Mar 2011 22:26:38 +0000 (-0700) Subject: delete davinci patch from .37 X-Git-Tag: v2.6.37.5~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=629ebfb9255e30c51a430cb75a46c2ac9ef87402;p=thirdparty%2Fkernel%2Fstable-queue.git delete davinci patch from .37 --- diff --git a/queue-2.6.37/davinci-dm644x-evm-register-musb-device-earlier.patch b/queue-2.6.37/davinci-dm644x-evm-register-musb-device-earlier.patch deleted file mode 100644 index 511d9dacb64..00000000000 --- a/queue-2.6.37/davinci-dm644x-evm-register-musb-device-earlier.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 60d97a840175d3becb2e6de36537a5cdfc0ec3a9 Mon Sep 17 00:00:00 2001 -From: Sergei Shtylyov -Date: Sun, 13 Mar 2011 20:06:59 +0000 -Subject: davinci: DM644x EVM: register MUSB device earlier - -From: Sergei Shtylyov - -commit 60d97a840175d3becb2e6de36537a5cdfc0ec3a9 upstream. - -The MUSB driver doesn't see its platform device on DM644x EVM board anymore -since commit 73b089b052a69020b953312a624a6e1eb5b81fab (usb: musb: split davinci -to its own platform_driver) because the new probe is called as subsys_initcall() -now, and the device is registered later than that by the board code. Move the -registration to davinci_evm_init() -- it's safe to do so because the MUSB core -device still gets initialized as fs_initcall() -- which is late enough for the -I2C GPIO expander (which controls VBUS) to be initialized. - -Signed-off-by: Sergei Shtylyov -Acked-by: Felipe Balbi -Tested-by: Sekhar Nori -Signed-off-by: Kevin Hilman -Signed-off-by: Greg Kroah-Hartman - ---- - arch/arm/mach-davinci/board-dm644x-evm.c | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - ---- a/arch/arm/mach-davinci/board-dm644x-evm.c -+++ b/arch/arm/mach-davinci/board-dm644x-evm.c -@@ -440,11 +440,6 @@ evm_u35_setup(struct i2c_client *client, - gpio_request(gpio + 7, "nCF_SEL"); - gpio_direction_output(gpio + 7, 1); - -- /* irlml6401 switches over 1A, in under 8 msec; -- * now it can be managed by nDRV_VBUS ... -- */ -- davinci_setup_usb(1000, 8); -- - return 0; - } - -@@ -705,6 +700,9 @@ static __init void davinci_evm_init(void - davinci_serial_init(&uart_config); - dm644x_init_asp(&dm644x_evm_snd_data); - -+ /* irlml6401 switches over 1A, in under 8 msec */ -+ davinci_setup_usb(1000, 8); -+ - soc_info->emac_pdata->phy_id = DM644X_EVM_PHY_ID; - /* Register the fixup for PHY on DaVinci */ - phy_register_fixup_for_uid(LXT971_PHY_ID, LXT971_PHY_MASK, diff --git a/queue-2.6.37/series b/queue-2.6.37/series index 10c629597ed..1ea8a74a683 100644 --- a/queue-2.6.37/series +++ b/queue-2.6.37/series @@ -83,5 +83,4 @@ i2c-fix-typo-in-instantiating-devices-document.patch mmc-sdhci-add-ricoh-e823-pci-id.patch mmc-sdio-remember-new-card-rca-when-redetecting-card.patch x86-binutils-xen-fix-another-wrong-size-directive.patch -davinci-dm644x-evm-register-musb-device-earlier.patch hwmon-sht15-fix-integer-overflow-in-humidity-calculation.patch