]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ARM: dts: imx6ul: change standard module used for TXUL-Mainboard to TXUL-0011
authorLothar Waßmann <LW@KARO-electronics.de>
Tue, 8 Mar 2016 12:49:40 +0000 (13:49 +0100)
committerLothar Waßmann <LW@KARO-electronics.de>
Tue, 8 Mar 2016 12:49:40 +0000 (13:49 +0100)
arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dts

index d25899b71575d838f22983c8e3eb4bb6728aa35c..2451cf386ceae6b2f952da3cfd54973cb9b0cc02 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2016 Lothar Waßmann <LW@KARO-electronics.de>
  *
  * This file is dual-licensed: you can use it either under the terms
  * of the GPL or the X11 license, at your option. Note that this dual
 #include "imx6ul-tx6ul.dtsi"
 
 / {
-       model = "Ka-Ro electronics TXUL-0010 Module on TXUL Mainboard";
+       model = "Ka-Ro electronics TXUL-0011 Module on TXUL Mainboard";
        compatible = "karo,imx6ul-tx6ul", "fsl,imx6ul";
 
        aliases {
                lcdif_24bit_pins_a = &pinctrl_disp0_3;
-               mmc0 = &usdhc1;
-               /delete-property/ mmc1;
+               mmc0 = &usdhc2;
+               mmc1 = &usdhc1;
                serial2 = &uart3;
                serial4 = &uart5;
        };
+
        /delete-node/ sound;
 };
 
        };
 };
 
+&gpmi {
+       status = "disabled";
+};
+
 &i2c_gpio {
        status = "disabled";
 };
        cap-sdio-irq;
 };
 
+&usdhc2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usdhc2>;
+       bus-width = <4>;
+       no-1-8-v;
+       non-removable;
+       fsl,wp-controller;
+       status = "okay";
+};
+
 &uart1 {
        pinctrl-0 = <&pinctrl_uart1>;
        /delete-property/ fsl,uart-has-rtscts;