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 (file)
index 511d9da..0000000
--- 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 <sshtylyov@ru.mvista.com>
-Date: Sun, 13 Mar 2011 20:06:59 +0000
-Subject: davinci: DM644x EVM: register MUSB device earlier
-
-From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
-
-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 <sshtylyov@ru.mvista.com>
-Acked-by: Felipe Balbi <balbi@ti.com>
-Tested-by: Sekhar Nori <nsekhar@ti.com>
-Signed-off-by: Kevin Hilman <khilman@ti.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- 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 10c629597ed2e5b567a1eea6bdb3c653eed75174..1ea8a74a6831961209056226e55326639dc9be39 100644 (file)
--- 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