Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: dra7: Separate AM57 dtsi files

AM5 and DRA7 SoC families have different set of modules
in them so the SoC sepecific dtsi files need to be separated.

e.g. Some of the major differences between AM576 and DRA76

DRA76x AM576x

USB3 x
USB4 x
ATL x
VCP x
MLB x
ISS x
PRU-ICSS1 x
PRU-ICSS2 x

This patch only deals with disabling USB3, USB4 and ATL for
AM57 variants.

Signed-off-by: Roger Quadros <rogerq@ti.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

authored by

Roger Quadros and committed by
Tony Lindgren
bcbb63b8 09f83754

+108 -11
+32
arch/arm/boot/dts/am5718.dtsi
··· 1 + // SPDX-License-Identifier: GPL-2.0 2 + /* 3 + * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ 4 + */ 5 + 6 + #include "dra72x.dtsi" 7 + 8 + / { 9 + compatible = "ti,am5718", "ti,dra7"; 10 + }; 11 + 12 + /* 13 + * These modules are not present on AM5718 14 + * 15 + * ATL 16 + * VCP1, VCP2 17 + * MLB 18 + * ISS 19 + * USB3, USB4 20 + */ 21 + 22 + &usb3_tm { 23 + status = "disabled"; 24 + }; 25 + 26 + &usb4_tm { 27 + status = "disabled"; 28 + }; 29 + 30 + &atl_tm { 31 + status = "disabled"; 32 + };
+1 -1
arch/arm/boot/dts/am571x-idk.dts
··· 7 7 */ 8 8 /dts-v1/; 9 9 10 - #include "dra72x.dtsi" 10 + #include "am5718.dtsi" 11 11 #include <dt-bindings/gpio/gpio.h> 12 12 #include <dt-bindings/interrupt-controller/irq.h> 13 13 #include "dra7-mmc-iodelay.dtsi"
+33
arch/arm/boot/dts/am5728.dtsi
··· 1 + // SPDX-License-Identifier: GPL-2.0 2 + /* 3 + * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ 4 + */ 5 + 6 + #include "dra74x.dtsi" 7 + 8 + / { 9 + compatible = "ti,am5728", "ti,dra7"; 10 + }; 11 + 12 + /* 13 + * These modules are not present on AM5728 14 + * 15 + * EVE1, EVE2 16 + * ATL 17 + * VCP1, VCP2 18 + * MLB 19 + * ISS 20 + * USB3, USB4 21 + */ 22 + 23 + &usb3_tm { 24 + status = "disabled"; 25 + }; 26 + 27 + &usb4_tm { 28 + status = "disabled"; 29 + }; 30 + 31 + &atl_tm { 32 + status = "disabled"; 33 + };
+2 -3
arch/arm/boot/dts/am572x-idk.dts
··· 8 8 9 9 /dts-v1/; 10 10 11 - #include "dra74x.dtsi" 11 + #include "am5728.dtsi" 12 12 #include "dra7-mmc-iodelay.dtsi" 13 13 #include "dra74x-mmc-iodelay.dtsi" 14 14 #include "am572x-idk-common.dtsi" 15 15 16 16 / { 17 17 model = "TI AM5728 IDK"; 18 - compatible = "ti,am5728-idk", "ti,am5728", "ti,dra742", "ti,dra74", 19 - "ti,dra7"; 18 + compatible = "ti,am5728-idk", "ti,am5728", "ti,dra7"; 20 19 }; 21 20 22 21 &mmc1 {
+33
arch/arm/boot/dts/am5748.dtsi
··· 1 + // SPDX-License-Identifier: GPL-2.0 2 + /* 3 + * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ 4 + */ 5 + 6 + #include "dra76x.dtsi" 7 + 8 + / { 9 + compatible = "ti,am5748", "ti,dra762", "ti,dra7"; 10 + }; 11 + 12 + /* 13 + * These modules are not present on AM5748 14 + * 15 + * EVE1, EVE2 16 + * ATL 17 + * VCP1, VCP2 18 + * MLB 19 + * ISS 20 + * USB3, USB4 21 + */ 22 + 23 + &usb3_tm { 24 + status = "disabled"; 25 + }; 26 + 27 + &usb4_tm { 28 + status = "disabled"; 29 + }; 30 + 31 + &atl_tm { 32 + status = "disabled"; 33 + };
+2 -2
arch/arm/boot/dts/am574x-idk.dts
··· 6 6 7 7 /dts-v1/; 8 8 9 - #include "dra76x.dtsi" 9 + #include "am5748.dtsi" 10 10 #include "dra7-mmc-iodelay.dtsi" 11 11 #include "dra76x-mmc-iodelay.dtsi" 12 12 #include "am572x-idk-common.dtsi" 13 13 14 14 / { 15 15 model = "TI AM5748 IDK"; 16 - compatible = "ti,am5728-idk", "ti,dra762", "ti,dra7"; 16 + compatible = "ti,am5748-idk", "ti,am5748", "ti,dra762", "ti,dra7"; 17 17 }; 18 18 19 19 &qspi {
+1 -1
arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
··· 7 7 */ 8 8 /dts-v1/; 9 9 10 - #include "dra74x.dtsi" 10 + #include "am5728.dtsi" 11 11 #include "am57xx-commercial-grade.dtsi" 12 12 #include "dra74x-mmc-iodelay.dtsi" 13 13 #include <dt-bindings/gpio/gpio.h>
+1 -1
arch/arm/boot/dts/am57xx-cl-som-am57x.dts
··· 13 13 14 14 #include <dt-bindings/gpio/gpio.h> 15 15 #include <dt-bindings/interrupt-controller/irq.h> 16 - #include "dra74x.dtsi" 16 + #include "am5728.dtsi" 17 17 18 18 / { 19 19 model = "CompuLab CL-SOM-AM57x";
+3 -3
arch/arm/boot/dts/dra7-l4.dtsi
··· 2499 2499 ranges = <0x0 0x3a000 0x1000>; 2500 2500 }; 2501 2501 2502 - target-module@3c000 { /* 0x4843c000, ap 23 08.0 */ 2502 + atl_tm: target-module@3c000 { /* 0x4843c000, ap 23 08.0 */ 2503 2503 compatible = "ti,sysc-omap4", "ti,sysc"; 2504 2504 reg = <0x3c000 0x4>; 2505 2505 reg-names = "rev"; ··· 4099 4099 }; 4100 4100 }; 4101 4101 4102 - target-module@100000 { /* 0x48900000, ap 85 04.0 */ 4102 + usb3_tm: target-module@100000 { /* 0x48900000, ap 85 04.0 */ 4103 4103 compatible = "ti,sysc-omap4", "ti,sysc"; 4104 4104 ti,hwmods = "usb_otg_ss3"; 4105 4105 reg = <0x100000 0x4>, ··· 4148 4148 }; 4149 4149 }; 4150 4150 4151 - target-module@140000 { /* 0x48940000, ap 75 3c.0 */ 4151 + usb4_tm: target-module@140000 { /* 0x48940000, ap 75 3c.0 */ 4152 4152 compatible = "ti,sysc-omap4", "ti,sysc"; 4153 4153 ti,hwmods = "usb_otg_ss4"; 4154 4154 reg = <0x140000 0x4>,