X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fpatches-3.14%2F346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch;fp=target%2Flinux%2Fbrcm63xx%2Fpatches-3.14%2F346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch;h=0000000000000000000000000000000000000000;hb=5f160f4a5521bf15350031a480f72a458e586ff7;hp=384702c80f5fec903e560c1b04e60dcd6734863d;hpb=ebd7036ca8ab04ca9c7e0dc2deb1baec3d9c8945;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/target/linux/brcm63xx/patches-3.14/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch b/target/linux/brcm63xx/patches-3.14/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch
deleted file mode 100644
index 384702c80f..0000000000
--- a/target/linux/brcm63xx/patches-3.14/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/arch/mips/bcm63xx/clk.c
-+++ b/arch/mips/bcm63xx/clk.c
-@@ -136,7 +136,11 @@ static struct clk clk_ephy = {
-  */
- static void enetsw_set(struct clk *clk, int enable)
- {
--	if (BCMCPU_IS_6328())
-+	if (BCMCPU_IS_6318()) {
-+		bcm_hwclock_set(CKCTL_6318_ROBOSW250_EN |
-+				CKCTL_6318_ROBOSW025_EN, enable);
-+		bcm_ub_hwclock_set(UB_CKCTL_6318_ROBOSW_EN, enable);
-+	} else if (BCMCPU_IS_6328())
- 		bcm_hwclock_set(CKCTL_6328_ROBOSW_EN, enable);
- 	else if (BCMCPU_IS_6362())
- 		bcm_hwclock_set(CKCTL_6362_ROBOSW_EN, enable);
-@@ -183,18 +187,22 @@ static struct clk clk_pcm = {
-  */
- static void usbh_set(struct clk *clk, int enable)
- {
--	if (BCMCPU_IS_6328())
-+	if (BCMCPU_IS_6318()) {
-+		bcm_hwclock_set(CKCTL_6318_USB_EN, enable);
-+		bcm_ub_hwclock_set(UB_CKCTL_6318_USB_EN, enable);
-+	} else if (BCMCPU_IS_6328()) {
- 		bcm_hwclock_set(CKCTL_6328_USBH_EN, enable);
--	else if (BCMCPU_IS_6348())
-+	} else if (BCMCPU_IS_6348()) {
- 		bcm_hwclock_set(CKCTL_6348_USBH_EN, enable);
--	else if (BCMCPU_IS_6362())
-+	} else if (BCMCPU_IS_6362()) {
- 		bcm_hwclock_set(CKCTL_6362_USBH_EN, enable);
--	else if (BCMCPU_IS_6368())
-+	} else if (BCMCPU_IS_6368()) {
- 		bcm_hwclock_set(CKCTL_6368_USBH_EN, enable);
--	else if (BCMCPU_IS_63268())
-+	} else if (BCMCPU_IS_63268()) {
- 		bcm_hwclock_set(CKCTL_63268_USBH_EN, enable);
--	else
-+	} else {
- 		return;
-+	}
- 
- 	if (enable)
- 		msleep(100);
-@@ -405,9 +413,9 @@ struct clk *clk_get(struct device *dev,
- 		return &clk_enetsw;
- 	if (!strcmp(id, "ephy"))
- 		return &clk_ephy;
--	if (!strcmp(id, "usbh"))
-+	if (!strcmp(id, "usbh") || (BCMCPU_IS_6318() && !strcmp(id, "usbd")))
- 		return &clk_usbh;
--	if (!strcmp(id, "usbd"))
-+	if (!strcmp(id, "usbd") && !BCMCPU_IS_6318())
- 		return &clk_usbd;
- 	if (!strcmp(id, "spi"))
- 		return &clk_spi;