ARM: dts: imx6ul: add support for TXUL modules on TXUL-Mainboard

Add .dts files for the TXUL module variants TXUL-5010, TXUL-5011,
TXUL-8013 on the TXUL-Mainboard.

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 6d25253b2c74d166d158f18b54d54660727d6443..f61cee7fbdc59a56c6724258ea3925ce08602094 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -474,9 +474,11 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
        imx6ul-pico-hobbit.dtb \
        imx6ul-tx6ul-0010.dtb \
        imx6ul-tx6ul-0011.dtb \
        imx6ul-pico-hobbit.dtb \
        imx6ul-tx6ul-0010.dtb \
        imx6ul-tx6ul-0011.dtb \

-       imx6ul-tx6ul-mainboard.dtb \
+       imx6ul-txul-5010-mainboard.dtb \
+       imx6ul-txul-5011-mainboard.dtb \

        imx6ull-14x14-evk.dtb \
        imx6ull-14x14-evk.dtb \

-       imx6ull-txul-8013.dtb
+       imx6ull-txul-8013.dtb \
+       imx6ull-txul-8013-mainboard.dtb

 dtb-$(CONFIG_SOC_IMX7D) += \
        imx7d-cl-som-imx7.dtb \
        imx7d-colibri-eval-v3.dtb \
 dtb-$(CONFIG_SOC_IMX7D) += \
        imx7d-cl-som-imx7.dtb \
        imx7d-colibri-eval-v3.dtb \

diff --git a/arch/arm/boot/dts/imx6ul-txul-5010-mainboard.dts b/arch/arm/boot/dts/imx6ul-txul-5010-mainboard.dts
new file mode 100644 (file)
index 0000000..b2d3a51
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ul-txul-5010-mainboard.dts
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2017 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
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License
+ *     version 2 as published by the Free Software Foundation.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+#include "imx6ul-tx6ul-0010.dts"
+#include "imx6ul-txul-mainboard.dtsi"
+
+/ {
+       model = "Ka-Ro electronics TXUL-5010/-0010 Module on TXUL Mainboard";
+};

diff --git a/arch/arm/boot/dts/imx6ul-txul-5011-mainboard.dts b/arch/arm/boot/dts/imx6ul-txul-5011-mainboard.dts
new file mode 100644 (file)
index 0000000..fbdea92
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ul-txul-5011-mainboard.dts
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2017 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
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License
+ *     version 2 as published by the Free Software Foundation.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+#include "imx6ul-tx6ul-0011.dts"
+#include "imx6ul-txul-mainboard.dtsi"
+
+/ {
+       model = "Ka-Ro electronics TXUL-5011/-0011 Module on TXUL Mainboard";
+};

diff --git a/arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dts b/arch/arm/boot/dts/imx6ul-txul-mainboard.dtsi
similarity index 93%
rename from arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dts
rename to arch/arm/boot/dts/imx6ul-txul-mainboard.dtsi
index 28d055e3f3010fef8964f1aad5606cca1824e2e5..b02f3afea43f874b534b19b69f9230a1e5a2b947 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dts
+++ b/arch/arm/boot/dts/imx6ul-txul-mainboard.dtsi
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright 2015 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2017 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
  *
  * 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


@@ -39,21 +39,13 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 

-/dts-v1/;
-#include "imx6ul.dtsi"
-#include "imx6ul-tx6ul.dtsi"
-

 / {
 / {

-       model = "Ka-Ro electronics TXUL-0010 Module on TXUL Mainboard";
-       compatible = "karo,imx6ul-tx6ul", "fsl,imx6ul";
-

        aliases {
                lcdif_24bit_pins_a = &pinctrl_disp0_3;
        aliases {
                lcdif_24bit_pins_a = &pinctrl_disp0_3;

-               mmc0 = &usdhc1;
-               /delete-property/ mmc1;

                serial2 = &uart3;
                serial4 = &uart5;
        };
                serial2 = &uart3;
                serial4 = &uart5;
        };

+

        /delete-node/ sound;
 };
 
        /delete-node/ sound;
 };
 


@@ -94,7 +86,6 @@
                        pinctrl-0 = <&pinctrl_etnphy0_int>;
                        interrupt-parent = <&gpio5>;
                        interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
                        pinctrl-0 = <&pinctrl_etnphy0_int>;
                        interrupt-parent = <&gpio5>;
                        interrupts = <5 IRQ_TYPE_EDGE_FALLING>;

-                       interrupts-extended = <&gpio5 5 IRQ_TYPE_EDGE_FALLING>;

                        status = "okay";
                };
 
                        status = "okay";
                };
 


@@ -105,7 +96,6 @@
                        pinctrl-0 = <&pinctrl_etnphy1_int>;
                        interrupt-parent = <&gpio4>;
                        interrupts = <27 IRQ_TYPE_EDGE_FALLING>;
                        pinctrl-0 = <&pinctrl_etnphy1_int>;
                        interrupt-parent = <&gpio4>;
                        interrupts = <27 IRQ_TYPE_EDGE_FALLING>;

-                       interrupts-extended = <&gpio4 27 IRQ_TYPE_EDGE_FALLING>;

                        status = "okay";
                };
        };
                        status = "okay";
                };
        };


@@ -133,7 +123,7 @@
        pinctrl-0 = <&pinctrl_disp0_3>;
 };
 
        pinctrl-0 = <&pinctrl_disp0_3>;
 };
 

-&reg_usbotg_vbus{
+&reg_usbotg_vbus {

        status = "disabled";
 };
 
        status = "disabled";
 };
 

diff --git a/arch/arm/boot/dts/imx6ull-txul-8013-mainboard.dts b/arch/arm/boot/dts/imx6ull-txul-8013-mainboard.dts
new file mode 100644 (file)
index 0000000..34d42e5
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ull-txul-8013-mainboard.dts
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2017 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
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License
+ *     version 2 as published by the Free Software Foundation.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+#include "imx6ull-txul-8013.dts"
+#include "imx6ul-txul-mainboard.dtsi"
+
+/ {
+       model = "Ka-Ro electronics TXUL-8013 Module on TXUL Mainboard";
+};