Merge tag 'gvt-fixes-2021-07-15' of https://github.com/intel/gvt-linux into drm-intel...

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / ti / k3-j7200-main.dtsi

diff --git a/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi b/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi
index 19fea8a..e8a41d0 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi
@@ -301,8 +301,6 @@
        main_uart0: serial@2800000 {
                compatible = "ti,j721e-uart", "ti,am654-uart";
                reg = <0x00 0x02800000 0x00 0x100>;
-               reg-shift = <2>;
-               reg-io-width = <4>;
                interrupts = <GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH>;
                clock-frequency = <48000000>;
                current-speed = <115200>;
@@ -314,8 +312,6 @@
        main_uart1: serial@2810000 {
                compatible = "ti,j721e-uart", "ti,am654-uart";
                reg = <0x00 0x02810000 0x00 0x100>;
-               reg-shift = <2>;
-               reg-io-width = <4>;
                interrupts = <GIC_SPI 193 IRQ_TYPE_LEVEL_HIGH>;
                clock-frequency = <48000000>;
                current-speed = <115200>;
@@ -327,8 +323,6 @@
        main_uart2: serial@2820000 {
                compatible = "ti,j721e-uart", "ti,am654-uart";
                reg = <0x00 0x02820000 0x00 0x100>;
-               reg-shift = <2>;
-               reg-io-width = <4>;
                interrupts = <GIC_SPI 194 IRQ_TYPE_LEVEL_HIGH>;
                clock-frequency = <48000000>;
                current-speed = <115200>;
@@ -340,8 +334,6 @@
        main_uart3: serial@2830000 {
                compatible = "ti,j721e-uart", "ti,am654-uart";
                reg = <0x00 0x02830000 0x00 0x100>;
-               reg-shift = <2>;
-               reg-io-width = <4>;
                interrupts = <GIC_SPI 195 IRQ_TYPE_LEVEL_HIGH>;
                clock-frequency = <48000000>;
                current-speed = <115200>;
@@ -353,8 +345,6 @@
        main_uart4: serial@2840000 {
                compatible = "ti,j721e-uart", "ti,am654-uart";
                reg = <0x00 0x02840000 0x00 0x100>;
-               reg-shift = <2>;
-               reg-io-width = <4>;
                interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>;
                clock-frequency = <48000000>;
                current-speed = <115200>;
@@ -366,8 +356,6 @@
        main_uart5: serial@2850000 {
                compatible = "ti,j721e-uart", "ti,am654-uart";
                reg = <0x00 0x02850000 0x00 0x100>;
-               reg-shift = <2>;
-               reg-io-width = <4>;
                interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>;
                clock-frequency = <48000000>;
                current-speed = <115200>;
@@ -379,8 +367,6 @@
        main_uart6: serial@2860000 {
                compatible = "ti,j721e-uart", "ti,am654-uart";
                reg = <0x00 0x02860000 0x00 0x100>;
-               reg-shift = <2>;
-               reg-io-width = <4>;
                interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>;
                clock-frequency = <48000000>;
                current-speed = <115200>;
@@ -392,8 +378,6 @@
        main_uart7: serial@2870000 {
                compatible = "ti,j721e-uart", "ti,am654-uart";
                reg = <0x00 0x02870000 0x00 0x100>;
-               reg-shift = <2>;
-               reg-io-width = <4>;
                interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>;
                clock-frequency = <48000000>;
                current-speed = <115200>;
@@ -405,8 +389,6 @@
        main_uart8: serial@2880000 {
                compatible = "ti,j721e-uart", "ti,am654-uart";
                reg = <0x00 0x02880000 0x00 0x100>;
-               reg-shift = <2>;
-               reg-io-width = <4>;
                interrupts = <GIC_SPI 248 IRQ_TYPE_LEVEL_HIGH>;
                clock-frequency = <48000000>;
                current-speed = <115200>;
@@ -418,8 +400,6 @@
        main_uart9: serial@2890000 {
                compatible = "ti,j721e-uart", "ti,am654-uart";
                reg = <0x00 0x02890000 0x00 0x100>;
-               reg-shift = <2>;
-               reg-io-width = <4>;
                interrupts = <GIC_SPI 249 IRQ_TYPE_LEVEL_HIGH>;
                clock-frequency = <48000000>;
                current-speed = <115200>;
@@ -683,6 +663,7 @@
                                          "otg";
                        maximum-speed = "super-speed";
                        dr_mode = "otg";
+                       cdns,phyrst-a-enable;
                };
        };
 
@@ -696,7 +677,6 @@
                             <149>;
                interrupt-controller;
                #interrupt-cells = <2>;
-               #address-cells = <0>;
                ti,ngpio = <69>;
                ti,davinci-gpio-unbanked = <0>;
                power-domains = <&k3_pds 105 TI_SCI_PD_EXCLUSIVE>;
@@ -714,7 +694,6 @@
                             <158>;
                interrupt-controller;
                #interrupt-cells = <2>;
-               #address-cells = <0>;
                ti,ngpio = <69>;
                ti,davinci-gpio-unbanked = <0>;
                power-domains = <&k3_pds 107 TI_SCI_PD_EXCLUSIVE>;
@@ -732,7 +711,6 @@
                             <167>;
                interrupt-controller;
                #interrupt-cells = <2>;
-               #address-cells = <0>;
                ti,ngpio = <69>;
                ti,davinci-gpio-unbanked = <0>;
                power-domains = <&k3_pds 109 TI_SCI_PD_EXCLUSIVE>;
@@ -750,7 +728,6 @@
                             <176>;
                interrupt-controller;
                #interrupt-cells = <2>;
-               #address-cells = <0>;
                ti,ngpio = <69>;
                ti,davinci-gpio-unbanked = <0>;
                power-domains = <&k3_pds 111 TI_SCI_PD_EXCLUSIVE>;