aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.10/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch
blob: 285400622258328d17005bbd93c9a478e7f6afe9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
--- 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);
@@ -393,9 +401,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;