aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.8/109-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-04-23 13:55:36 +0000
committerJonas Gorski <jogo@openwrt.org>2013-04-23 13:55:36 +0000
commit50884b75bed40027c0b966b811ce71c2aecaed0a (patch)
tree5ef4da4d4811465ed5574bd3d084fbf7cb928e21 /target/linux/brcm63xx/patches-3.8/109-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch
parentc818e05fef1e8b083ebcebd484cbceed4666da5e (diff)
downloadupstream-50884b75bed40027c0b966b811ce71c2aecaed0a.tar.gz
upstream-50884b75bed40027c0b966b811ce71c2aecaed0a.tar.bz2
upstream-50884b75bed40027c0b966b811ce71c2aecaed0a.zip
bcm63xx: update patches with upstream submissions
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36407 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.8/109-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.8/109-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/target/linux/brcm63xx/patches-3.8/109-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch b/target/linux/brcm63xx/patches-3.8/109-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch
deleted file mode 100644
index 80314487d4..0000000000
--- a/target/linux/brcm63xx/patches-3.8/109-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 8e9bf528a122741f0171b89c297b63041116d704 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Mon, 28 Jan 2013 20:06:20 +0100
-Subject: [PATCH 02/11] MIPS: BCM63XX: add USB device clock enable delay to
- clock code
-
-This patch adds the required 10 micro seconds delay to the USB device
-clock enable operation. Put this where the correct clock knowledege is,
-which is in the clock code, and remove this delay from the bcm63xx_udc
-gadget driver where it was before.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
----
- arch/mips/bcm63xx/clk.c | 5 +++++
- drivers/usb/gadget/bcm63xx_udc.c | 1 -
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
---- a/arch/mips/bcm63xx/clk.c
-+++ b/arch/mips/bcm63xx/clk.c
-@@ -182,6 +182,11 @@ static void usbd_set(struct clk *clk, in
- bcm_hwclock_set(CKCTL_6328_USBD_EN, enable);
- else if (BCMCPU_IS_6368())
- bcm_hwclock_set(CKCTL_6368_USBD_EN, enable);
-+ else
-+ return;
-+
-+ if (enable)
-+ udelay(10);
- }
-
- static struct clk clk_usbd = {
---- a/drivers/usb/gadget/bcm63xx_udc.c
-+++ b/drivers/usb/gadget/bcm63xx_udc.c
-@@ -386,7 +386,6 @@ static inline void set_clocks(struct bcm
- if (is_enabled) {
- clk_enable(udc->usbh_clk);
- clk_enable(udc->usbd_clk);
-- udelay(10);
- } else {
- clk_disable(udc->usbd_clk);
- clk_disable(udc->usbh_clk);