Skip to content

Commit 3d6fe39

Browse files
olofjolofj
committed
Merge tag 'omap-for-v5.13/fixes-rc6-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes
Fix duplicate usb4 regression for dra74 variants USB4 is only present in DRA74x variants, and I managed to add it for the other variants too with the recent legacy platform data removal. * tag 'omap-for-v5.13/fixes-rc6-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: dra7: Fix duplicate USB4 target module node Link: https://lore.kernel.org/r/pull-1623999845-180025@atomide.com Signed-off-by: Olof Johansson <olof@lixom.net>
2 parents f2a4ba9 + 78b4b16 commit 3d6fe39

5 files changed

Lines changed: 50 additions & 78 deletions

File tree

‎arch/arm/boot/dts/am5718.dtsi‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,13 @@
1717
* VCP1, VCP2
1818
* MLB
1919
* ISS
20-
* USB3, USB4
20+
* USB3
2121
*/
2222

2323
&usb3_tm {
2424
status = "disabled";
2525
};
2626

27-
&usb4_tm {
28-
status = "disabled";
29-
};
30-
3127
&atl_tm {
3228
status = "disabled";
3329
};

‎arch/arm/boot/dts/dra7-l4.dtsi‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4129,28 +4129,6 @@
41294129
};
41304130
};
41314131

4132-
usb4_tm: target-module@140000 { /* 0x48940000, ap 75 3c.0 */
4133-
compatible = "ti,sysc-omap4", "ti,sysc";
4134-
reg = <0x140000 0x4>,
4135-
<0x140010 0x4>;
4136-
reg-names = "rev", "sysc";
4137-
ti,sysc-mask = <SYSC_OMAP4_DMADISABLE>;
4138-
ti,sysc-midle = <SYSC_IDLE_FORCE>,
4139-
<SYSC_IDLE_NO>,
4140-
<SYSC_IDLE_SMART>,
4141-
<SYSC_IDLE_SMART_WKUP>;
4142-
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
4143-
<SYSC_IDLE_NO>,
4144-
<SYSC_IDLE_SMART>,
4145-
<SYSC_IDLE_SMART_WKUP>;
4146-
/* Domains (P, C): l3init_pwrdm, l3init_clkdm */
4147-
clocks = <&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS4_CLKCTRL 0>;
4148-
clock-names = "fck";
4149-
#address-cells = <1>;
4150-
#size-cells = <1>;
4151-
ranges = <0x0 0x140000 0x20000>;
4152-
};
4153-
41544132
target-module@170000 { /* 0x48970000, ap 21 0a.0 */
41554133
compatible = "ti,sysc-omap4", "ti,sysc";
41564134
reg = <0x170010 0x4>;

‎arch/arm/boot/dts/dra71x.dtsi‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,3 @@
1111
&rtctarget {
1212
status = "disabled";
1313
};
14-
15-
&usb4_tm {
16-
status = "disabled";
17-
};

‎arch/arm/boot/dts/dra72x.dtsi‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,3 @@
108108
&pcie2_rc {
109109
compatible = "ti,dra726-pcie-rc", "ti,dra7-pcie";
110110
};
111-
112-
&usb4_tm {
113-
status = "disabled";
114-
};

‎arch/arm/boot/dts/dra74x.dtsi‎

Lines changed: 49 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -49,49 +49,6 @@
4949
reg = <0x41500000 0x100>;
5050
};
5151

52-
target-module@48940000 {
53-
compatible = "ti,sysc-omap4", "ti,sysc";
54-
reg = <0x48940000 0x4>,
55-
<0x48940010 0x4>;
56-
reg-names = "rev", "sysc";
57-
ti,sysc-mask = <SYSC_OMAP4_DMADISABLE>;
58-
ti,sysc-midle = <SYSC_IDLE_FORCE>,
59-
<SYSC_IDLE_NO>,
60-
<SYSC_IDLE_SMART>,
61-
<SYSC_IDLE_SMART_WKUP>;
62-
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
63-
<SYSC_IDLE_NO>,
64-
<SYSC_IDLE_SMART>,
65-
<SYSC_IDLE_SMART_WKUP>;
66-
clocks = <&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS4_CLKCTRL 0>;
67-
clock-names = "fck";
68-
#address-cells = <1>;
69-
#size-cells = <1>;
70-
ranges = <0x0 0x48940000 0x20000>;
71-
72-
omap_dwc3_4: omap_dwc3_4@0 {
73-
compatible = "ti,dwc3";
74-
reg = <0 0x10000>;
75-
interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>;
76-
#address-cells = <1>;
77-
#size-cells = <1>;
78-
utmi-mode = <2>;
79-
ranges;
80-
status = "disabled";
81-
usb4: usb@10000 {
82-
compatible = "snps,dwc3";
83-
reg = <0x10000 0x17000>;
84-
interrupts = <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
85-
<GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
86-
<GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>;
87-
interrupt-names = "peripheral",
88-
"host",
89-
"otg";
90-
maximum-speed = "high-speed";
91-
dr_mode = "otg";
92-
};
93-
};
94-
};
9552

9653
target-module@41501000 {
9754
compatible = "ti,sysc-omap2", "ti,sysc";
@@ -224,3 +181,52 @@
224181
&pcie2_rc {
225182
compatible = "ti,dra746-pcie-rc", "ti,dra7-pcie";
226183
};
184+
185+
&l4_per3 {
186+
segment@0 {
187+
usb4_tm: target-module@140000 { /* 0x48940000, ap 75 3c.0 */
188+
compatible = "ti,sysc-omap4", "ti,sysc";
189+
reg = <0x140000 0x4>,
190+
<0x140010 0x4>;
191+
reg-names = "rev", "sysc";
192+
ti,sysc-mask = <SYSC_OMAP4_DMADISABLE>;
193+
ti,sysc-midle = <SYSC_IDLE_FORCE>,
194+
<SYSC_IDLE_NO>,
195+
<SYSC_IDLE_SMART>,
196+
<SYSC_IDLE_SMART_WKUP>;
197+
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
198+
<SYSC_IDLE_NO>,
199+
<SYSC_IDLE_SMART>,
200+
<SYSC_IDLE_SMART_WKUP>;
201+
/* Domains (P, C): l3init_pwrdm, l3init_clkdm */
202+
clocks = <&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS4_CLKCTRL 0>;
203+
clock-names = "fck";
204+
#address-cells = <1>;
205+
#size-cells = <1>;
206+
ranges = <0x0 0x140000 0x20000>;
207+
208+
omap_dwc3_4: omap_dwc3_4@0 {
209+
compatible = "ti,dwc3";
210+
reg = <0 0x10000>;
211+
interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>;
212+
#address-cells = <1>;
213+
#size-cells = <1>;
214+
utmi-mode = <2>;
215+
ranges;
216+
status = "disabled";
217+
usb4: usb@10000 {
218+
compatible = "snps,dwc3";
219+
reg = <0x10000 0x17000>;
220+
interrupts = <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
221+
<GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
222+
<GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>;
223+
interrupt-names = "peripheral",
224+
"host",
225+
"otg";
226+
maximum-speed = "high-speed";
227+
dr_mode = "otg";
228+
};
229+
};
230+
};
231+
};
232+
};

0 commit comments

Comments
 (0)