summaryrefslogtreecommitdiff
path: root/target/linux/lantiq/patches-4.4/0065-MIPS-lantiq-improve-USB-initialization.patch
blob: acc23080f11174ad39fb59e57e5b873e4158c923 (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
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
From 14909c4e4e836925668e74fc6e0e85ba0283cbf9 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Fri, 6 Jan 2017 17:40:12 +0100
Subject: [PATCH 2/2] MIPS: lantiq: improve USB initialization

This adds code to initialize the USB controller and PHY also on Danube,
Amazon SE and AR10. This code is based on the Vendor driver from
different UGW versions and compared to the hardware documentation.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 arch/mips/lantiq/xway/reset.c   | 120 ++++++++++++++++++++++++++++++----------
 arch/mips/lantiq/xway/sysctrl.c |  20 +++++++
 2 files changed, 110 insertions(+), 30 deletions(-)

--- a/arch/mips/lantiq/xway/reset.c
+++ b/arch/mips/lantiq/xway/reset.c
@@ -72,6 +72,8 @@
 #define RCU_USBCFG_HDSEL_BIT	BIT(11)
 #define RCU_USBCFG_HOST_END_BIT	BIT(10)
 #define RCU_USBCFG_SLV_END_BIT	BIT(9)
+#define RCU_USBCFG_SLV_END_BIT_AR9	BIT(17)
+
 
 /* USB reset bits */
 #define RCU_USBRESET		0x0010
@@ -85,6 +87,8 @@
 
 #define RCU_CFG1A		0x0038
 #define RCU_CFG1B		0x003C
+#define  RCU_CFG1_TX_PEE	BIT(0)
+#define  RCU_CFG1_DIS_THR_SHIFT	15 /* Disconnect Threshold */	
 
 /* USB PMU devices */
 #define PMU_AHBM		BIT(15)
@@ -306,38 +310,91 @@ static void ltq_usb_init(void)
 	/* Power for USB cores 1 & 2 */
 	ltq_pmu_enable(PMU_AHBM);
 	ltq_pmu_enable(PMU_USB0);
-	ltq_pmu_enable(PMU_USB1);
 
-	ltq_rcu_w32(ltq_rcu_r32(RCU_CFG1A) | BIT(0), RCU_CFG1A);
-	ltq_rcu_w32(ltq_rcu_r32(RCU_CFG1B) | BIT(0), RCU_CFG1B);
+	if (of_machine_is_compatible("lantiq,ar10") ||
+	    of_machine_is_compatible("lantiq,grx390") ||
+	    of_machine_is_compatible("lantiq,ar9") ||
+	    of_machine_is_compatible("lantiq,vr9"))
+		ltq_pmu_enable(PMU_USB1);
+
+	if (of_machine_is_compatible("lantiq,vr9") ||
+	    of_machine_is_compatible("lantiq,ar10")) {
+		ltq_rcu_w32(ltq_rcu_r32(RCU_CFG1A) | RCU_CFG1_TX_PEE |
+			    7 << RCU_CFG1_DIS_THR_SHIFT, RCU_CFG1A);
+		ltq_rcu_w32(ltq_rcu_r32(RCU_CFG1B) | RCU_CFG1_TX_PEE |
+			    7 << RCU_CFG1_DIS_THR_SHIFT, RCU_CFG1B);
+	}
 
 	/* Enable USB PHY power for cores 1 & 2 */
 	ltq_pmu_enable(PMU_USB0_P);
-	ltq_pmu_enable(PMU_USB1_P);
+	if (of_machine_is_compatible("lantiq,ar10") ||
+	    of_machine_is_compatible("lantiq,grx390") ||
+	    of_machine_is_compatible("lantiq,ar9") ||
+	    of_machine_is_compatible("lantiq,vr9"))
+		ltq_pmu_enable(PMU_USB1_P);
+
+	if (of_machine_is_compatible("lantiq,ase") ||
+	    of_machine_is_compatible("lantiq,danube")) {
+		/* Configure cores to host mode */
+		ltq_rcu_w32(ltq_rcu_r32(RCU_USB1CFG) & ~RCU_USBCFG_HDSEL_BIT,
+			RCU_USB1CFG);
+
+		/* Select DMA endianness (Host-endian: big-endian) */
+		ltq_rcu_w32((ltq_rcu_r32(RCU_USB1CFG) & ~RCU_USBCFG_SLV_END_BIT)
+			| RCU_USBCFG_HOST_END_BIT, RCU_USB1CFG);
+	}
+
+	if (of_machine_is_compatible("lantiq,ar9")) {
+		/* Configure cores to host mode */
+		ltq_rcu_w32(ltq_rcu_r32(RCU_USB1CFG) & ~RCU_USBCFG_HDSEL_BIT,
+			RCU_USB1CFG);
+		ltq_rcu_w32(ltq_rcu_r32(RCU_USB2CFG) & ~RCU_USBCFG_HDSEL_BIT,
+			RCU_USB2CFG);
+
+		/* Select DMA endianness (Host-endian: big-endian) */
+		ltq_rcu_w32((ltq_rcu_r32(RCU_USB1CFG) & ~RCU_USBCFG_SLV_END_BIT_AR9)
+			| RCU_USBCFG_HOST_END_BIT, RCU_USB1CFG);
+		ltq_rcu_w32(ltq_rcu_r32((RCU_USB2CFG) & ~RCU_USBCFG_SLV_END_BIT_AR9)
+			| RCU_USBCFG_HOST_END_BIT, RCU_USB2CFG);
+	}
+
+	if (of_machine_is_compatible("lantiq,vr9") ||
+	    of_machine_is_compatible("lantiq,ar10")) {
+		/* Configure cores to host mode */
+		ltq_rcu_w32(ltq_rcu_r32(RCU_USB1CFG) & ~RCU_USBCFG_HDSEL_BIT,
+			RCU_USB1CFG);
+		ltq_rcu_w32(ltq_rcu_r32(RCU_USB2CFG) & ~RCU_USBCFG_HDSEL_BIT,
+			RCU_USB2CFG);
+
+		/* Select DMA endianness (Host-endian: big-endian) */
+		ltq_rcu_w32((ltq_rcu_r32(RCU_USB1CFG) & ~RCU_USBCFG_SLV_END_BIT)
+			| RCU_USBCFG_HOST_END_BIT, RCU_USB1CFG);
+		ltq_rcu_w32(ltq_rcu_r32((RCU_USB2CFG) & ~RCU_USBCFG_SLV_END_BIT)
+			| RCU_USBCFG_HOST_END_BIT, RCU_USB2CFG);
+	}
+
+	if (of_machine_is_compatible("lantiq,ar9")) {
+		/* Hard reset USB state machines */
+		ltq_rcu_w32(ltq_rcu_r32(RCU_USBRESET)
+			   | USBRESET_BIT | BIT(28), RCU_USBRESET);
+		udelay(50 * 1000);
+		ltq_rcu_w32(ltq_rcu_r32(RCU_USBRESET)
+			    & ~(USBRESET_BIT | BIT(28)), RCU_USBRESET);
+	} else {
+		/* Hard reset USB state machines */
+		ltq_rcu_w32(ltq_rcu_r32(RCU_USBRESET) | USBRESET_BIT, RCU_USBRESET);
+		udelay(50 * 1000);
+		ltq_rcu_w32(ltq_rcu_r32(RCU_USBRESET) & ~USBRESET_BIT, RCU_USBRESET);
+	}
 
-	/* Configure cores to host mode */
-	ltq_rcu_w32(ltq_rcu_r32(RCU_USB1CFG) & ~RCU_USBCFG_HDSEL_BIT,
-		RCU_USB1CFG);
-	ltq_rcu_w32(ltq_rcu_r32(RCU_USB2CFG) & ~RCU_USBCFG_HDSEL_BIT,
-		RCU_USB2CFG);
-
-	/* Select DMA endianness (Host-endian: big-endian) */
-	ltq_rcu_w32((ltq_rcu_r32(RCU_USB1CFG) & ~RCU_USBCFG_SLV_END_BIT)
-		| RCU_USBCFG_HOST_END_BIT, RCU_USB1CFG);
-	ltq_rcu_w32(ltq_rcu_r32((RCU_USB2CFG) & ~RCU_USBCFG_SLV_END_BIT)
-		| RCU_USBCFG_HOST_END_BIT, RCU_USB2CFG);
-
-	/* Hard reset USB state machines */
-	ltq_rcu_w32(ltq_rcu_r32(RCU_USBRESET) | USBRESET_BIT, RCU_USBRESET);
-	udelay(50 * 1000);
-	ltq_rcu_w32(ltq_rcu_r32(RCU_USBRESET) & ~USBRESET_BIT, RCU_USBRESET);
-
-	/* Soft reset USB state machines */
-	ltq_rcu_w32(ltq_rcu_r32(RCU_USBRESET2)
-		| USB1RESET_BIT | USB2RESET_BIT, RCU_USBRESET2);
-	udelay(50 * 1000);
-	ltq_rcu_w32(ltq_rcu_r32(RCU_USBRESET2)
-		& ~(USB1RESET_BIT | USB2RESET_BIT), RCU_USBRESET2);
+	if (of_machine_is_compatible("lantiq,vr9")) {
+		/* Soft reset USB state machines */
+		ltq_rcu_w32(ltq_rcu_r32(RCU_USBRESET2)
+			| USB1RESET_BIT | USB2RESET_BIT, RCU_USBRESET2);
+		udelay(50 * 1000);
+		ltq_rcu_w32(ltq_rcu_r32(RCU_USBRESET2)
+			& ~(USB1RESET_BIT | USB2RESET_BIT), RCU_USBRESET2);
+	}
 }
 
 static int __init mips_reboot_setup(void)
@@ -363,8 +420,11 @@ static int __init mips_reboot_setup(void
 	if (!ltq_rcu_membase)
 		panic("Failed to remap core memory");
 
-	if (of_machine_is_compatible("lantiq,ar9") ||
-	    of_machine_is_compatible("lantiq,vr9"))
+	if (of_machine_is_compatible("lantiq,danube") ||
+	    of_machine_is_compatible("lantiq,ase") ||
+	    of_machine_is_compatible("lantiq,ar9") ||
+	    of_machine_is_compatible("lantiq,vr9") ||
+	    of_machine_is_compatible("lantiq,ar10"))
 		ltq_usb_init();
 
 	if (of_machine_is_compatible("lantiq,vr9"))
--- a/arch/mips/lantiq/xway/sysctrl.c
+++ b/arch/mips/lantiq/xway/sysctrl.c
@@ -254,6 +254,25 @@ static void pmu_disable(struct clk *clk)
 		pr_warn("deactivating PMU module failed!");
 }
 
+static void usb_set_clock(void)
+{
+	unsigned int val = ltq_cgu_r32(ifccr);
+
+	if (of_machine_is_compatible("lantiq,ar10") ||
+	    of_machine_is_compatible("lantiq,grx390")) {
+		val &= ~0x03; /* XTAL divided by 3 */
+	} else if (of_machine_is_compatible("lantiq,ar9") ||
+		   of_machine_is_compatible("lantiq,vr9")) {
+		/* TODO: this depends on the XTAL frequency */
+		val |= 0x03; /* XTAL divided by 3 */
+	} else if (of_machine_is_compatible("lantiq,ase")) {
+		val |= 0x20; /* from XTAL */
+	} else if (of_machine_is_compatible("lantiq,danube")) {
+		val |= 0x30; /* 12 MHz, generated from 36 MHz */
+	}
+	ltq_cgu_w32(val, ifccr);
+}
+
 /* the pci enable helper */
 static int pci_enable(struct clk *clk)
 {
@@ -608,4 +627,5 @@ void __init ltq_soc_init(void)
 
 	if (of_machine_is_compatible("lantiq,vr9"))
 		xbar_fpi_burst_disable();
+	usb_set_clock();
 }