Merge tag 'imx-dt64-tmu-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawngu...

[linux.git] / arch / arm / boot / dts / vf610-zii-scu4-aib.dts

diff --git a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
index dc8a5f37a1ef2a6029bfcbd1d77e46d4b1936a7c..d7caf618f9801486546f1ce6cd09a501b78bfdbe 100644 (file)
--- a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
+++ b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
@@ -183,11 +183,6 @@ ports {
                                        #address-cells = <1>;
                                        #size-cells = <0>;
 
-                                       port@1 {
-                                               reg = <1>;
-                                               label = "internal_j9";
-                                       };
-
                                        port@2 {
                                                reg = <2>;
                                                label = "eth_fc_1000_2";
@@ -271,11 +266,6 @@ ports {
                                        #address-cells = <1>;
                                        #size-cells = <0>;
 
-                                       port@1 {
-                                               reg = <1>;
-                                               label = "internal_j8";
-                                       };
-
                                        port@2 {
                                                reg = <2>;
                                                label = "eth_fc_1000_8";
@@ -602,6 +592,7 @@ tca9548@70 {
                #address-cells = <1>;
                #size-cells = <0>;
                reg = <0x70>;
+               i2c-mux-idle-disconnect;
 
                sff0_i2c: i2c@1 {
                        #address-cells = <1>;
@@ -640,6 +631,7 @@ tca9548@71 {
                reg = <0x71>;
                #address-cells = <1>;
                #size-cells = <0>;
+               i2c-mux-idle-disconnect;
 
                sff5_i2c: i2c@1 {
                        #address-cells = <1>;
@@ -687,7 +679,6 @@ &uart1 {
        linux,rs485-enabled-at-boot-time;
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_uart1>;
-       rs485-rts-delay = <0 200>;
        status = "okay";
 };
 
@@ -695,7 +686,6 @@ &uart2 {
        linux,rs485-enabled-at-boot-time;
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_uart2>;
-       rs485-rts-delay = <0 200>;
        status = "okay";
 };