arm64: dts: freescale: imx8mp-moduline-display-106: Use phys to replace xceiver-supply

Fix the can tranceivers to actually use the new phy description instead
of the regulator tweak.

Signed-off-by: Maud Spierings <maudspierings@gocontroll.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm64/boot/dts/freescale/imx8mp-tx8p-ml81-moduline-display-106.dts b/arch/arm64/boot/dts/freescale/imx8mp-tx8p-ml81-moduline-display-106.dts
index afd886dd590ff6f125d1d0e91aa71ae0063b5fd1..88ad422c27603b77c1099f2efe61953999c35f77 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mp-tx8p-ml81-moduline-display-106.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-tx8p-ml81-moduline-display-106.dts
@@ -36,6 +36,24 @@
                vout-supply = <&reg_5v0_sensor>;
        };
 
+       flexcan1_phy: can-phy0 {
+               compatible = "ti,tcan1051", "ti,tcan1042";
+               #phy-cells = <0>;
+               pinctrl-0 = <&pinctrl_flexcan1_stby>;
+               pinctrl-names = "default";
+               max-bitrate = <5000000>;
+               standby-gpios = <&gpio4 3 GPIO_ACTIVE_HIGH>;
+       };
+
+       flexcan2_phy: can-phy1 {
+               compatible = "ti,tcan1051", "ti,tcan1042";
+               #phy-cells = <0>;
+               pinctrl-0 = <&pinctrl_flexcan2_stby>;
+               pinctrl-names = "default";
+               max-bitrate = <5000000>;
+               standby-gpios = <&gpio5 9 GPIO_ACTIVE_HIGH>;
+       };
+
        reg_1v8_per: regulator-1v8-per {
                compatible = "regulator-fixed";
                pinctrl-0 = <&pinctrl_reg_1v8>;
@@ -85,26 +103,6 @@
                regulator-name = "6v4";
        };
 
-       reg_can1_stby: regulator-can1-stby {
-               compatible = "regulator-fixed";
-               pinctrl-0 = <&pinctrl_flexcan1_reg>;
-               pinctrl-names = "default";
-               regulator-max-microvolt = <3300000>;
-               regulator-min-microvolt = <3300000>;
-               regulator-name = "can1-stby";
-               gpio = <&gpio4 3 GPIO_ACTIVE_LOW>;
-       };
-
-       reg_can2_stby: regulator-can2-stby {
-               compatible = "regulator-fixed";
-               pinctrl-0 = <&pinctrl_flexcan2_reg>;
-               pinctrl-names = "default";
-               regulator-max-microvolt = <3300000>;
-               regulator-min-microvolt = <3300000>;
-               regulator-name = "can2-stby";
-               gpio = <&gpio5 9 GPIO_ACTIVE_LOW>;
-       };
-
        sound {
                compatible = "simple-audio-card";
                simple-audio-card,bitclock-master = <&cpudai>;
@@ -180,16 +178,16 @@
 };
 
 &flexcan1 {
+       phys = <&flexcan1_phy>;
        pinctrl-0 = <&pinctrl_flexcan1>;
        pinctrl-names = "default";
-       xceiver-supply = <&reg_can1_stby>;
        status = "okay";
 };
 
 &flexcan2 {
+       phys = <&flexcan2_phy>;
        pinctrl-0 = <&pinctrl_flexcan2>;
        pinctrl-names = "default";
-       xceiver-supply = <&reg_can2_stby>;
        status = "okay";
 };
 
@@ -278,7 +276,7 @@
                >;
        };
 
-       pinctrl_flexcan1_reg: flexcan1reggrp {
+       pinctrl_flexcan1_stby: flexcan1stbygrp {
                fsl,pins = <
                        MX8MP_IOMUXC_SAI1_RXD1__GPIO4_IO03
                                (MX8MP_DSE_X2 | MX8MP_FSEL_FAST | MX8MP_PULL_UP | MX8MP_PULL_ENABLE)
@@ -294,7 +292,7 @@
                >;
        };
 
-       pinctrl_flexcan2_reg: flexcan2reggrp {
+       pinctrl_flexcan2_stby: flexcan2stbygrp {
                fsl,pins = <
                        MX8MP_IOMUXC_ECSPI1_SS0__GPIO5_IO09
                                (MX8MP_DSE_X2 | MX8MP_FSEL_FAST | MX8MP_PULL_UP | MX8MP_PULL_ENABLE)