leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix duplicate usb4 regression for dra74 variants

Browse Source 
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.
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAmDMRNoRHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXOAxA//Q043bQVZ547EYeXjQ8ztlri3nuIb1x1b
 cSG82dPrZb8dfNeSOVhbEMeaRYyRXsPgfhW8bJdvrKNITrQj9sIqP9S4txqCcJCC
 RebuhHti+yhkDvzIEo6r+FqWRUPUQMzKtp1dISZ7FUKJ8T7xd/TCfjdxkyDctrnj
 nabbHVMAzAUokgM/iG6XlUBco3jiMmM1skG9xnpbYOFzva8FCNhDFw1zRLjOfHGZ
 a/KQFaqj35KE0Y1ONQp/SojQD9CXrYT4S7j/kZ1vu6mXA1pG7UzsUcoem54rQBnl
 AXRXbWbdzoIpkAHdJVGXlbx3T3GXfDlmTaYcjd1u7GGhua0/kJy1L0d2keNJLl2X
 hcue4xfztE15SY87MB91n2l5M/DYt4rWnkZeTcCqedP7E+jPOyH01KWLCRdplL8v
 kzbLIlqyB68LSJdEhbNSn5zebGqzxOF/fPWdBcilKthvOPemnI2ME7uYxBBefSSj
 sQdnuNK6NqeEpjt1BqP+TJtEhNCncxQO7i8GpaMXxWdkmwdXMs7Jg3tiHRaft0kD
 Ojxoo0xgnpUVcjiuTYCv9P1rEF+73VAj6INblGHblbJsk2W8HXomZgrhrOx6JAfj
 xSEF+bFRGiOQspb49LbtA3D/H5i4VWijLacgnGO9HsrImUgepnSfuSiKSAFxIrNH
 La8dMwtITM4=
 =pfkv
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQJDBAABCgAtFiEElf+HevZ4QCAJmMQ+jBrnPN6EHHcFAmDT448PHG9sb2ZAbGl4
 b20ubmV0AAoJEIwa5zzehBx3UuEP/0gaCPMXBXzx1LQ0pUHDYFY6kDC1mSBQ/oxN
 F0v60aJ9wyfHQaVw2nwWiWt9vZEAG4CdYI9Gb1nBqtI5CBOYjdzOekHU/su2dDnc
 GTBCRbZFVIuAAPIlo+/+ktMaSu/PTgkWshXU3WBby00JCp8n0sgP+B2xAh3wUU3h
 65yoKyXp8Kzbfrsp/7w9bIqdqxbrf8tsT7bJ2Vozo7+42m1TLk3bEkxohBvCTNn6
 7K6wgbS9XKWRP5k7D2gjeOsEEsZTZMtwkqOyGGIpfGadqqL736RlXxQMqrP+/VE5
 S3SjNrNF4/wXTHVR12pCdFNuiQtuet8yxyhGN/QLeDEv7TeO+C7g6W3pBj7yjUQ1
 Bpqe32ur8lrt4wC8z+He4Pgi2o86wbsRK4sHV08jUQD52G9FzpffMgtob3vHNWrC
 Mmsr1eirq9PNHj4gCJLSzfpwk9jh26UJHUQYqfxbU8DRrCgv2LINKeHPreJh3kOh
 xGfFf8jHr7TwvR/WmesUuWroy+ckdPkH63luovDGCMCopb/1a7JbZ6VHmXYsB9kC
 e7Ee5kgJtuyB99s62JfI7Pl7Hzja99af9dh6cnpAHPzQ4vDI4QTcmZf3cIhXQwHw
 9/cVxHQouCPZEl3jQLnpLdCEvTPjHCMqT9h5LFnbwWlKWiWJMv2cXRdocrV1wVfx
 NpwkNoP8
 =zTsh
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2021-06-23 18:44:45 -07:00
commit 3d6fe39ac6
5 changed files with 50 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/boot/dts/am5718.dtsi
View File

@ -17,17 +17,13 @@
* VCP1, VCP2
* MLB
* ISS
* USB3, USB4
* USB3
*/
&usb3_tm {
status = "disabled";
};
&usb4_tm {
status = "disabled";
};
&atl_tm {
status = "disabled";
};

22
arch/arm/boot/dts/dra7-l4.dtsi
View File

@ -4129,28 +4129,6 @@
};
};
usb4_tm: target-module@140000 { /* 0x48940000, ap 75 3c.0 */
compatible = "ti,sysc-omap4", "ti,sysc";
reg = <0x140000 0x4>,
<0x140010 0x4>;
reg-names = "rev", "sysc";
ti,sysc-mask = <SYSC_OMAP4_DMADISABLE>;
ti,sysc-midle = <SYSC_IDLE_FORCE>,
<SYSC_IDLE_NO>,
<SYSC_IDLE_SMART>,
<SYSC_IDLE_SMART_WKUP>;
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
<SYSC_IDLE_NO>,
<SYSC_IDLE_SMART>,
<SYSC_IDLE_SMART_WKUP>;
/* Domains (P, C): l3init_pwrdm, l3init_clkdm */
clocks = <&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS4_CLKCTRL 0>;
clock-names = "fck";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x140000 0x20000>;
};
target-module@170000 { /* 0x48970000, ap 21 0a.0 */
compatible = "ti,sysc-omap4", "ti,sysc";
reg = <0x170010 0x4>;

4
arch/arm/boot/dts/dra71x.dtsi
View File

@ -11,7 +11,3 @@
&rtctarget {
status = "disabled";
};
&usb4_tm {
status = "disabled";
};

4
arch/arm/boot/dts/dra72x.dtsi
View File

@ -108,7 +108,3 @@
&pcie2_rc {
compatible = "ti,dra726-pcie-rc", "ti,dra7-pcie";
};
&usb4_tm {
status = "disabled";
};

92
arch/arm/boot/dts/dra74x.dtsi
View File

@ -49,49 +49,6 @@
reg = <0x41500000 0x100>;
};
target-module@48940000 {
compatible = "ti,sysc-omap4", "ti,sysc";
reg = <0x48940000 0x4>,
<0x48940010 0x4>;
reg-names = "rev", "sysc";
ti,sysc-mask = <SYSC_OMAP4_DMADISABLE>;
ti,sysc-midle = <SYSC_IDLE_FORCE>,
<SYSC_IDLE_NO>,
<SYSC_IDLE_SMART>,
<SYSC_IDLE_SMART_WKUP>;
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
<SYSC_IDLE_NO>,
<SYSC_IDLE_SMART>,
<SYSC_IDLE_SMART_WKUP>;
clocks = <&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS4_CLKCTRL 0>;
clock-names = "fck";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x48940000 0x20000>;
omap_dwc3_4: omap_dwc3_4@0 {
compatible = "ti,dwc3";
reg = <0 0x10000>;
interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <1>;
utmi-mode = <2>;
ranges;
status = "disabled";
usb4: usb@10000 {
compatible = "snps,dwc3";
reg = <0x10000 0x17000>;
interrupts = <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "peripheral",
"host",
"otg";
maximum-speed = "high-speed";
dr_mode = "otg";
};
};
};
target-module@41501000 {
compatible = "ti,sysc-omap2", "ti,sysc";
@ -224,3 +181,52 @@
&pcie2_rc {
compatible = "ti,dra746-pcie-rc", "ti,dra7-pcie";
};
&l4_per3 {
segment@0 {
usb4_tm: target-module@140000 { /* 0x48940000, ap 75 3c.0 */
compatible = "ti,sysc-omap4", "ti,sysc";
reg = <0x140000 0x4>,
<0x140010 0x4>;
reg-names = "rev", "sysc";
ti,sysc-mask = <SYSC_OMAP4_DMADISABLE>;
ti,sysc-midle = <SYSC_IDLE_FORCE>,
<SYSC_IDLE_NO>,
<SYSC_IDLE_SMART>,
<SYSC_IDLE_SMART_WKUP>;
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
<SYSC_IDLE_NO>,
<SYSC_IDLE_SMART>,
<SYSC_IDLE_SMART_WKUP>;
/* Domains (P, C): l3init_pwrdm, l3init_clkdm */
clocks = <&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS4_CLKCTRL 0>;
clock-names = "fck";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x140000 0x20000>;
omap_dwc3_4: omap_dwc3_4@0 {
compatible = "ti,dwc3";
reg = <0 0x10000>;
interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <1>;
utmi-mode = <2>;
ranges;
status = "disabled";
usb4: usb@10000 {
compatible = "snps,dwc3";
reg = <0x10000 0x17000>;
interrupts = <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "peripheral",
"host",
"otg";
maximum-speed = "high-speed";
dr_mode = "otg";
};
};
};
};
};