ARM: dts: imx6ul-tx6ul: cleanup SPI configuration

diff --git a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
index c0c8b1e5dea3f348ade09f15438b959922b630de..df4031f5584449f71b7b3e549853d7ec545a3c0c 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
@@ -56,8 +56,8 @@
                pwm0 = &pwm5;
                reg_can_xcvr = &reg_can_xcvr;
                serial2 = &uart5;
                pwm0 = &pwm5;
                reg_can_xcvr = &reg_can_xcvr;
                serial2 = &uart5;

-//             spi0 = &ecspi2;
-               spi0 = &spi_gpio;
+               spi0 = &ecspi2;
+               spi1 = &spi_gpio;

                stk5led = &user_led;
                usbh1 = &usbotg2;
                usbotg = &usbotg1;
                stk5led = &user_led;
                usbh1 = &usbotg2;
                usbotg = &usbotg1;


@@ -252,15 +252,15 @@
                        &gpio1 29 GPIO_ACTIVE_HIGH
                        &gpio1 10 GPIO_ACTIVE_HIGH
                >;
                        &gpio1 29 GPIO_ACTIVE_HIGH
                        &gpio1 10 GPIO_ACTIVE_HIGH
                >;

-               status = "okay";
+               status = "disabled";

 
 

-               spidev0: spi@0 {
+               spi@0 {

                        compatible = "spidev";
                        reg = <0>;
                        spi-max-frequency = <54000000>;
                };
 
                        compatible = "spidev";
                        reg = <0>;
                        spi-max-frequency = <54000000>;
                };
 

-               spidev1: spi@1 {
+               spi@1 {

                        compatible = "spidev";
                        reg = <1>;
                        spi-max-frequency = <54000000>;
                        compatible = "spidev";
                        reg = <1>;
                        spi-max-frequency = <54000000>;


@@ -295,7 +295,6 @@
        status = "okay";
 };
 
        status = "okay";
 };
 

-#if 0

 &ecspi2 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_ecspi2>;
 &ecspi2 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_ecspi2>;


@@ -306,19 +305,18 @@
        >;
        status = "okay";
 
        >;
        status = "okay";
 

-       spidev0: spi@0 {
+       spi@0 {

                compatible = "spidev";
                reg = <0>;
                spi-max-frequency = <54000000>;
        };
 
                compatible = "spidev";
                reg = <0>;
                spi-max-frequency = <54000000>;
        };
 

-       spidev1: spi@1 {
+       spi@1 {

                compatible = "spidev";
                reg = <1>;
                spi-max-frequency = <54000000>;
        };
 };
                compatible = "spidev";
                reg = <1>;
                spi-max-frequency = <54000000>;
        };
 };

-#endif

 
 &fec1 {
        pinctrl-names = "default";
 
 &fec1 {
        pinctrl-names = "default";