]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'remotes/karo-txul/karo-txul' into karo-tx-linux
authorLothar Waßmann <LW@KARO-electronics.de>
Tue, 24 Oct 2017 13:19:50 +0000 (15:19 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Tue, 24 Oct 2017 13:19:50 +0000 (15:19 +0200)
43 files changed:
Documentation/devicetree/bindings/leds/backlight/pwm-backlight.txt
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/imx28-tx28.dts
arch/arm/boot/dts/imx53-tx53-x03x.dts
arch/arm/boot/dts/imx53-tx53-x13x.dts
arch/arm/boot/dts/imx53-tx53.dtsi
arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
arch/arm/boot/dts/imx6dl-tx6s-8034-mb7.dts [new file with mode: 0644]
arch/arm/boot/dts/imx6dl-tx6s-8034.dts
arch/arm/boot/dts/imx6dl-tx6s-8035-mb7.dts [new file with mode: 0644]
arch/arm/boot/dts/imx6dl-tx6s-8035.dts
arch/arm/boot/dts/imx6dl-tx6s-8134-mb7.dts [new file with mode: 0644]
arch/arm/boot/dts/imx6dl-tx6s-8134.dts [new file with mode: 0644]
arch/arm/boot/dts/imx6dl-tx6s-8135-mb7.dts [new file with mode: 0644]
arch/arm/boot/dts/imx6dl-tx6s-8135.dts [new file with mode: 0644]
arch/arm/boot/dts/imx6dl-tx6u-801x.dts
arch/arm/boot/dts/imx6dl-tx6u-8033-mb7.dts [new file with mode: 0644]
arch/arm/boot/dts/imx6dl-tx6u-8033.dts
arch/arm/boot/dts/imx6dl-tx6u-80xx-mb7.dts [new file with mode: 0644]
arch/arm/boot/dts/imx6dl-tx6u-811x.dts
arch/arm/boot/dts/imx6dl-tx6u-81xx-mb7.dts
arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts
arch/arm/boot/dts/imx6q-tx6q-1010.dts
arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts
arch/arm/boot/dts/imx6q-tx6q-1020.dts
arch/arm/boot/dts/imx6q-tx6q-1036-mb7.dts [new file with mode: 0644]
arch/arm/boot/dts/imx6q-tx6q-1036.dts
arch/arm/boot/dts/imx6q-tx6q-10x0-mb7.dts [new file with mode: 0644]
arch/arm/boot/dts/imx6q-tx6q-1110.dts
arch/arm/boot/dts/imx6q-tx6q-11x0-mb7.dts
arch/arm/boot/dts/imx6qdl-tx6-lcd.dtsi [new file with mode: 0644]
arch/arm/boot/dts/imx6qdl-tx6-lvds.dtsi [new file with mode: 0644]
arch/arm/boot/dts/imx6qdl-tx6-mb7.dtsi [new file with mode: 0644]
arch/arm/boot/dts/imx6qdl-tx6.dtsi
arch/arm/boot/dts/imx6qp-tx6qp-8037-mb7.dts [new file with mode: 0644]
arch/arm/boot/dts/imx6qp-tx6qp-8037.dts [new file with mode: 0644]
arch/arm/boot/dts/imx6qp-tx6qp-8137-mb7.dts [new file with mode: 0644]
arch/arm/boot/dts/imx6qp-tx6qp-8137.dts [new file with mode: 0644]
drivers/mtd/nand/nand_base.c
drivers/net/ethernet/freescale/fec.h
drivers/net/ethernet/freescale/fec_main.c
drivers/video/backlight/pwm_bl.c
include/linux/mtd/nand.h

index 764db86d441ad131aceca0e15146d5c914d97919..95594c341a571e68ec4dbe5885be8ad81342af64 100644 (file)
@@ -17,6 +17,10 @@ Optional properties:
                "pwms" property (see PWM binding[0])
   - enable-gpios: contains a single GPIO specifier for the GPIO which enables
                   and disables the backlight (see GPIO binding[1])
+  - turn-on-delay-ms: delay in milliseconds between configuring the PWM
+                 and switching PWM on. This may be required to eliminate
+                 flicker when switching the PWM on after it has been
+                 disabled.
 
 [0]: Documentation/devicetree/bindings/pwm/pwm.txt
 [1]: Documentation/devicetree/bindings/gpio/gpio.txt
index b7fc3019d13b84ca12ad15bcd198f95cc22da26a..873aefbd12151d983ebea356250c5ca508f4275d 100644 (file)
@@ -383,9 +383,17 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
        imx6dl-ts4900.dtb \
        imx6dl-tx6dl-comtft.dtb \
        imx6dl-tx6s-8034.dtb \
+       imx6dl-tx6s-8034-mb7.dtb \
        imx6dl-tx6s-8035.dtb \
+       imx6dl-tx6s-8035-mb7.dtb \
+       imx6dl-tx6s-8134.dtb \
+       imx6dl-tx6s-8134-mb7.dtb \
+       imx6dl-tx6s-8135.dtb \
+       imx6dl-tx6s-8135-mb7.dtb \
        imx6dl-tx6u-801x.dtb \
+       imx6dl-tx6u-80xx-mb7.dtb \
        imx6dl-tx6u-8033.dtb \
+       imx6dl-tx6u-8033-mb7.dtb \
        imx6dl-tx6u-811x.dtb \
        imx6dl-tx6u-81xx-mb7.dtb \
        imx6dl-udoo.dtb \
@@ -440,6 +448,8 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
        imx6q-tx6q-1020.dtb \
        imx6q-tx6q-1020-comtft.dtb \
        imx6q-tx6q-1036.dtb \
+       imx6q-tx6q-1036-mb7.dtb \
+       imx6q-tx6q-10x0-mb7.dtb \
        imx6q-tx6q-1110.dtb \
        imx6q-tx6q-11x0-mb7.dtb \
        imx6q-udoo.dtb \
@@ -451,6 +461,10 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
        imx6qp-nitrogen6_som2.dtb \
        imx6qp-sabreauto.dtb \
        imx6qp-sabresd.dtb \
+       imx6qp-tx6qp-8037.dtb \
+       imx6qp-tx6qp-8037-mb7.dtb \
+       imx6qp-tx6qp-8137.dtb \
+       imx6qp-tx6qp-8137-mb7.dtb \
        imx6qp-zii-rdu2.dtb
 dtb-$(CONFIG_SOC_IMX6SL) += \
        imx6sl-evk.dtb \
index 0ebbc83852d026fbdd9684424b62a7a9d10720ea..222368f4be575f4f6f9e9a0bdaca0c673cb5e9e9 100644 (file)
@@ -1,13 +1,43 @@
 /*
  * Copyright 2012 Shawn Guo <shawn.guo@linaro.org>
- * Copyright 2013 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2013-2017 Lothar Waßmann <LW@KARO-electronics.de>
  *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 at the following locations:
+ * 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.
  *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ *  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/;
                status = "disabled";
        };
 
-       regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               reg_usb0_vbus: regulator@0 {
-                       compatible = "regulator-fixed";
-                       reg = <0>;
-                       regulator-name = "usb0_vbus";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio0 18 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-               };
+       reg_usb0_vbus: regulator-usb0-vbus {
+               compatible = "regulator-fixed";
+               regulator-name = "usb0_vbus";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               gpio = <&gpio0 18 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
 
-               reg_usb1_vbus: regulator@1 {
-                       compatible = "regulator-fixed";
-                       reg = <1>;
-                       regulator-name = "usb1_vbus";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio3 27 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-               };
+       reg_usb1_vbus: regulator-usb1-vbus {
+               compatible = "regulator-fixed";
+               regulator-name = "usb1_vbus";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               gpio = <&gpio3 27 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
 
-               reg_2p5v: regulator@2 {
-                       compatible = "regulator-fixed";
-                       reg = <2>;
-                       regulator-name = "2P5V";
-                       regulator-min-microvolt = <2500000>;
-                       regulator-max-microvolt = <2500000>;
-                       regulator-always-on;
-               };
+       reg_2p5v: regulator-2p5v {
+               compatible = "regulator-fixed";
+               regulator-name = "2P5V";
+               regulator-min-microvolt = <2500000>;
+               regulator-max-microvolt = <2500000>;
+               regulator-always-on;
+       };
 
-               reg_3p3v: regulator@3 {
-                       compatible = "regulator-fixed";
-                       reg = <3>;
-                       regulator-name = "3P3V";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-               };
+       reg_3p3v: regulator-3p3v {
+               compatible = "regulator-fixed";
+               regulator-name = "3P3V";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+       };
 
-               reg_can_xcvr: regulator@4 {
-                       compatible = "regulator-fixed";
-                       reg = <4>;
-                       regulator-name = "CAN XCVR";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&tx28_flexcan_xcvr_pins>;
-               };
+       reg_can_xcvr: regulator-can-xcvr {
+               compatible = "regulator-fixed";
+               regulator-name = "CAN XCVR";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&tx28_flexcan_xcvr_pins>;
+       };
 
-               reg_lcd: regulator@5 {
-                       compatible = "regulator-fixed";
-                       reg = <5>;
-                       regulator-name = "LCD POWER";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       gpio = <&gpio1 31 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-               };
+       reg_lcd: regulator-lcd-power {
+               compatible = "regulator-fixed";
+               regulator-name = "LCD POWER";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               gpio = <&gpio1 31 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
 
-               reg_lcd_reset: regulator@6 {
-                       compatible = "regulator-fixed";
-                       reg = <6>;
-                       regulator-name = "LCD RESET";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       gpio = <&gpio3 30 GPIO_ACTIVE_HIGH>;
-                       startup-delay-us = <300000>;
-                       enable-active-high;
-                       regulator-always-on;
-                       regulator-boot-on;
-               };
+       reg_lcd_reset: regulator-lcd-reset {
+               compatible = "regulator-fixed";
+               regulator-name = "LCD RESET";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               gpio = <&gpio3 30 GPIO_ACTIVE_HIGH>;
+               startup-delay-us = <300000>;
+               enable-active-high;
+               regulator-always-on;
+               regulator-boot-on;
        };
 
        clocks {
                pinctrl-names = "default";
                pinctrl-0 = <&tx28_pca9554_pins>;
                interrupt-parent = <&gpio3>;
-               interrupts = <28 0>;
+               interrupts = <28 IRQ_TYPE_NONE>;
                gpio-controller;
                #gpio-cells = <2>;
                interrupt-controller;
                pinctrl-names = "default";
                pinctrl-0 = <&tx28_tsc2007_pins>;
                interrupt-parent = <&gpio3>;
-               interrupts = <20 0>;
+               interrupts = <20 IRQ_TYPE_EDGE_FALLING>;
                pendown-gpio = <&gpio3 20 GPIO_ACTIVE_LOW>;
                ti,x-plate-ohms = /bits/ 16 <660>;
        };
        ds1339: rtc@68 {
                compatible = "mxim,ds1339";
                reg = <0x68>;
+               trickle-resistor-ohms = <250>;
+               trickle-diode-disable;
        };
 };
 
index 0ecb43d88522318701304fad35e3c214cfcb276e..eb5b452699a9581d94e50f0a04737c1d66a3c025 100644 (file)
@@ -1,12 +1,42 @@
 /*
- * Copyright 2013 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2013-2017 Lothar Waßmann <LW@KARO-electronics.de>
  *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 at the following locations:
+ * 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.
  *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ *  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/;
                default-brightness-level = <50>;
        };
 
-       regulators {
-               reg_lcd_pwr: regulator@5 {
-                       compatible = "regulator-fixed";
-                       reg = <5>;
-                       regulator-name = "LCD POWER";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       regulator-boot-on;
-               };
+       reg_lcd_pwr: regulator-lcd-pwr {
+               compatible = "regulator-fixed";
+               regulator-name = "LCD POWER";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               regulator-boot-on;
+       };
 
-               reg_lcd_reset: regulator@6 {
-                       compatible = "regulator-fixed";
-                       reg = <6>;
-                       regulator-name = "LCD RESET";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       regulator-boot-on;
-               };
+       reg_lcd_reset: regulator-lcd-reset {
+               compatible = "regulator-fixed";
+               regulator-name = "LCD RESET";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               regulator-boot-on;
        };
 };
 
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_tsc2007>;
                interrupt-parent = <&gpio3>;
-               interrupts = <26 0>;
+               interrupts = <26 IRQ_TYPE_EDGE_FALLING>;
                gpios = <&gpio3 26 GPIO_ACTIVE_LOW>;
                ti,x-plate-ohms = <660>;
                wakeup-source;
index 3cf682a681f40a986e8eb3142f3621ec5d6736b0..a87a10b942cfcecad071024db86f2fdd8b2d89a1 100644 (file)
@@ -1,6 +1,42 @@
 /*
- * Copyright 2013 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2013-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.
  * The code contained herein is licensed under the GNU General Public
  * License. You may obtain a copy of the GNU General Public License
  * Version 2 at the following locations:
                default-brightness-level = <50>;
        };
 
-       regulators {
-               reg_lcd_pwr0: regulator@5 {
-                       compatible = "regulator-fixed";
-                       reg = <5>;
-                       regulator-name = "LVDS0 POWER";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       regulator-boot-on;
-               };
-
-               reg_lcd_pwr1: regulator@6 {
-                       compatible = "regulator-fixed";
-                       reg = <6>;
-                       regulator-name = "LVDS1 POWER";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       regulator-boot-on;
-               };
+       reg_lcd_pwr0: regulator-lvds0-pwr {
+               compatible = "regulator-fixed";
+               regulator-name = "LVDS0 POWER";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               regulator-boot-on;
        };
-};
 
-&i2c2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c2>;
-       status = "okay";
-
-       touchscreen2: eeti@04 {
-               compatible = "eeti,egalax_ts";
-               reg = <0x04>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_eeti2>;
-               interrupt-parent = <&gpio3>;
-               interrupts = <23 0>;
-               wakeup-gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
-               wakeup-source;
+       reg_lcd_pwr1: regulator-lvds1-pwr {
+               compatible = "regulator-fixed";
+               regulator-name = "LVDS1 POWER";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               regulator-boot-on;
        };
 };
 
 &i2c3 {
-       pinctrl-names = "default";
+       pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c3>;
+       pinctrl-1 = <&pinctrl_i2c3_gpio>;
+       scl-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
+       sda-gpios = <&gpio3 28 GPIO_ACTIVE_HIGH>;
        status = "okay";
 
        sgtl5000: codec@0a {
                VDDIO-supply = <&reg_3v3>;
                clocks = <&mclk>;
        };
-
-       touchscreen1: eeti@04 {
-               compatible = "eeti,egalax_ts";
-               reg = <0x04>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_eeti1>;
-               interrupt-parent = <&gpio3>;
-               interrupts = <22 0>;
-               wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
-               wakeup-source;
-       };
 };
 
 &iomuxc {
        imx53-tx53-x13x {
-               pinctrl_i2c2: i2c2-grp1 {
-                       fsl,pins = <
-                               MX53_PAD_KEY_ROW3__I2C2_SDA             0xc0000000
-                               MX53_PAD_KEY_COL3__I2C2_SCL             0xc0000000
-                       >;
-               };
-
                pinctrl_lvds0: lvds0grp {
                        fsl,pins = <
                                MX53_PAD_LVDS0_TX3_P__LDB_LVDS0_TX3 0x80000000
index 7807c1fa110176b12cfa26f238186da8dcdeafe7..71b58b6933e1d7fb57cfe90b97b1232d8b8efaed 100644 (file)
@@ -1,15 +1,45 @@
 /*
- * Copyright 2012 <LW@KARO-electronics.de>
+ * Copyright 2012-2017 <LW@KARO-electronics.de>
  * based on imx53-qsb.dts
  *   Copyright 2011 Freescale Semiconductor, Inc.
  *   Copyright 2011 Linaro Ltd.
  *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 at the following locations:
+ * 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.
  *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ *  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.
  */
 
 #include "imx53.dtsi"
                };
        };
 
-       regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               reg_2v5: regulator@0 {
-                       compatible = "regulator-fixed";
-                       reg = <0>;
-                       regulator-name = "2V5";
-                       regulator-min-microvolt = <2500000>;
-                       regulator-max-microvolt = <2500000>;
-               };
+       reg_2v5: regulator-2v5 {
+               compatible = "regulator-fixed";
+               regulator-name = "2V5";
+               regulator-min-microvolt = <2500000>;
+               regulator-max-microvolt = <2500000>;
+       };
 
-               reg_3v3: regulator@1 {
-                       compatible = "regulator-fixed";
-                       reg = <1>;
-                       regulator-name = "3V3";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-               };
+       reg_3v3: regulator-3v3 {
+               compatible = "regulator-fixed";
+               regulator-name = "3V3";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+       };
 
-               reg_can_xcvr: regulator@2 {
-                       compatible = "regulator-fixed";
-                       reg = <2>;
-                       regulator-name = "CAN XCVR";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_can_xcvr>;
-                       gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>;
-               };
+       reg_can_xcvr: regulator-can-xcvr {
+               compatible = "regulator-fixed";
+               regulator-name = "CAN XCVR";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_can_xcvr>;
+               gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>;
+       };
 
-               reg_usbh1_vbus: regulator@3 {
-                       compatible = "regulator-fixed";
-                       reg = <3>;
-                       regulator-name = "usbh1_vbus";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_usbh1_vbus>;
-                       gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-               };
+       reg_usbh1_vbus: regulator-usbh1-vbus {
+               compatible = "regulator-fixed";
+               regulator-name = "usbh1_vbus";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_usbh1_vbus>;
+               gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
 
-               reg_usbotg_vbus: regulator@4 {
-                       compatible = "regulator-fixed";
-                       reg = <4>;
-                       regulator-name = "usbotg_vbus";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_usbotg_vbus>;
-                       gpio = <&gpio1 7 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-               };
+       reg_usbotg_vbus: regulator-usbotg-vbus {
+               compatible = "regulator-fixed";
+               regulator-name = "usbotg_vbus";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_usbotg_vbus>;
+               gpio = <&gpio1 7 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
        };
 
        sound {
 
        phy0: ethernet-phy@0 {
                interrupt-parent = <&gpio2>;
-               interrupts = <4>;
+               interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
                device_type = "ethernet-phy";
        };
 };
 
 &i2c1 {
-       pinctrl-names = "default";
+       pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c1>;
+       pinctrl-0 = <&pinctrl_i2c1_gpio>;
+       scl-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
+       sda-gpios = <&gpio3 28 GPIO_ACTIVE_HIGH>;
        clock-frequency = <400000>;
        status = "okay";
 
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_ds1339>;
                interrupt-parent = <&gpio4>;
-               interrupts = <20 0>;
+               interrupts = <20 IRQ_TYPE_EDGE_FALLING>;
+               trickle-resistor-ohms = <250>;
+               trickle-diode-disable;
        };
 };
 
 
                pinctrl_i2c1: i2c1grp {
                        fsl,pins = <
-                               MX53_PAD_EIM_D21__I2C1_SCL              0xc0000000
-                               MX53_PAD_EIM_D28__I2C1_SDA              0xc0000000
+                               MX53_PAD_EIM_D21__I2C1_SCL              0x400001e4
+                               MX53_PAD_EIM_D28__I2C1_SDA              0x400001e4
+                       >;
+               };
+
+               pinctrl_i2c1_gpio: i2c1-gpiogrp {
+                       fsl,pins = <
+                               MX53_PAD_EIM_D21__GPIO3_21              0x400001e6
+                               MX53_PAD_EIM_D28__GPIO3_28              0x400001e6
                        >;
                };
 
                pinctrl_i2c3: i2c3grp {
                        fsl,pins = <
-                               MX53_PAD_GPIO_3__I2C3_SCL               0xc0000000
-                               MX53_PAD_GPIO_6__I2C3_SDA               0xc0000000
+                               MX53_PAD_GPIO_3__I2C3_SCL               0x400001e4
+                               MX53_PAD_GPIO_6__I2C3_SDA               0x400001e4
+                       >;
+               };
+
+               pinctrl_i2c3_gpio: i2c3-gpiogrp {
+                       fsl,pins = <
+                               MX53_PAD_GPIO_3__GPIO1_3                0x400001e6
+                               MX53_PAD_GPIO_6__GPIO1_6                0x400001e6
                        >;
                };
 
index aac42ac465b64619a82773bf097cc49051c5aa08..51a9bb9d6bc2811bc347b1553e8ba74a2f2f642f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2014-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
 /dts-v1/;
 #include "imx6dl.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lcd.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6DL Module on CoMpact TFT";
        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
+};
 
-       aliases {
-               display = &display;
-       };
-
-       backlight: backlight {
-               compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 0>;
-               power-supply = <&reg_3v3>;
-               /*
-                * a poor man's way to create a 1:1 relationship between
-                * the PWM value and the actual duty cycle
-                */
-               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
-                                    10 11 12 13 14 15 16 17 18 19
-                                    20 21 22 23 24 25 26 27 28 29
-                                    30 31 32 33 34 35 36 37 38 39
-                                    40 41 42 43 44 45 46 47 48 49
-                                    50 51 52 53 54 55 56 57 58 59
-                                    60 61 62 63 64 65 66 67 68 69
-                                    70 71 72 73 74 75 76 77 78 79
-                                    80 81 82 83 84 85 86 87 88 89
-                                    90 91 92 93 94 95 96 97 98 99
-                                   100>;
-               default-brightness-level = <50>;
-       };
-
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               interface-pix-fmt = "rgb24";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_1>;
-               status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               display-timings {
-                       native-mode = <&ET070001DM6>;
-
-                       ET070001DM6: CoMTFT { /* same as ET0700 but with inverted pixel clock */
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-               };
-       };
+&backlight {
+       pwms = <&pwm2 0 500000 0>;
+       /delete-property/ turn-on-delay-ms;
 };
 
 &can1 {
        xceiver-supply = <&reg_3v3>;
 };
 
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
-};
-
 &kpp {
        status = "disabled";
 };
 
+&lcd_panel {
+       compatible = "edt,etm0700g0edh6";
+};
+
 &reg_can_xcvr {
        status = "disabled";
 };
diff --git a/arch/arm/boot/dts/imx6dl-tx6s-8034-mb7.dts b/arch/arm/boot/dts/imx6dl-tx6s-8034-mb7.dts
new file mode 100644 (file)
index 0000000..fc23b4d
--- /dev/null
@@ -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 "imx6dl-tx6s-8034.dts"
+#include "imx6qdl-tx6-mb7.dtsi"
+
+/ {
+       model = "Ka-Ro electronics TX6S-8034 Module on MB7 baseboard";
+};
index ff8f7b1c42825b5f24fe16846a7a01367cae992a..9eb2ef17339c739080b9ea02b753574ba582197f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2015-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
 /dts-v1/;
 #include "imx6dl.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lcd.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6S-8034 Module";
        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
 
-       aliases {
-               display = &display;
-               ipu1 = &ipu1;
-       };
-
        cpus {
                /delete-node/ cpu@1;
        };
-
-       backlight: backlight {
-               compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_lcd0_pwr>;
-               enable-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>;
-               power-supply = <&reg_lcd1_pwr>;
-               /*
-                * a poor man's way to create a 1:1 relationship between
-                * the PWM value and the actual duty cycle
-                */
-               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
-                                    10 11 12 13 14 15 16 17 18 19
-                                    20 21 22 23 24 25 26 27 28 29
-                                    30 31 32 33 34 35 36 37 38 39
-                                    40 41 42 43 44 45 46 47 48 49
-                                    50 51 52 53 54 55 56 57 58 59
-                                    60 61 62 63 64 65 66 67 68 69
-                                    70 71 72 73 74 75 76 77 78 79
-                                    80 81 82 83 84 85 86 87 88 89
-                                    90 91 92 93 94 95 96 97 98 99
-                                   100>;
-               default-brightness-level = <50>;
-       };
-
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_2>;
-               interface-pix-fmt = "rgb24";
-               status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               display-timings {
-                       native-mode = <&vga>;
-
-                       vga: VGA {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <48>;
-                               hsync-len = <96>;
-                               hfront-porch = <16>;
-                               vback-porch = <31>;
-                               vsync-len = <2>;
-                               vfront-porch = <12>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ETV570 {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <114>;
-                               hsync-len = <30>;
-                               hfront-porch = <16>;
-                               vback-porch = <32>;
-                               vsync-len = <3>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0350 {
-                               clock-frequency = <6413760>;
-                               hactive = <320>;
-                               vactive = <240>;
-                               hback-porch = <34>;
-                               hsync-len = <34>;
-                               hfront-porch = <20>;
-                               vback-porch = <15>;
-                               vsync-len = <3>;
-                               vfront-porch = <4>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0430 {
-                               clock-frequency = <9009000>;
-                               hactive = <480>;
-                               vactive = <272>;
-                               hback-porch = <2>;
-                               hsync-len = <41>;
-                               hfront-porch = <2>;
-                               vback-porch = <2>;
-                               vsync-len = <10>;
-                               vfront-porch = <2>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-
-                       ET0500 {
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0700 { /* same as ET0500 */
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ETQ570 {
-                               clock-frequency = <6596040>;
-                               hactive = <320>;
-                               vactive = <240>;
-                               hback-porch = <38>;
-                               hsync-len = <30>;
-                               hfront-porch = <30>;
-                               vback-porch = <16>;
-                               vsync-len = <3>;
-                               vfront-porch = <4>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-               };
-       };
 };
 
 &ds1339 {
                MX6QDL_PAD_SD3_CMD__GPIO7_IO02          0x170b0 /* SD1 CD */
        >;
 };
-
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
-};
-
-&reg_lcd0_pwr {
-       status = "disabled";
-};
diff --git a/arch/arm/boot/dts/imx6dl-tx6s-8035-mb7.dts b/arch/arm/boot/dts/imx6dl-tx6s-8035-mb7.dts
new file mode 100644 (file)
index 0000000..683ad0c
--- /dev/null
@@ -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 "imx6dl-tx6s-8035.dts"
+#include "imx6qdl-tx6-mb7.dtsi"
+
+/ {
+       model = "Ka-Ro electronics TX6S-8035 Module on MB7 baseboard";
+};
index f988950e9443d44b19886f12ad9d9f423556c91e..a5532ecc18c5ad9d3901f53e575483da3cbe9cc6 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2015-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
 /dts-v1/;
 #include "imx6dl.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lcd.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6S-8035 Module";
        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
 
-       aliases {
-               display = &display;
-               ipu1 = &ipu1;
-       };
-
        cpus {
                /delete-node/ cpu@1;
        };
-
-       backlight: backlight {
-               compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_lcd0_pwr>;
-               enable-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>;
-               power-supply = <&reg_lcd1_pwr>;
-               /*
-                * a poor man's way to create a 1:1 relationship between
-                * the PWM value and the actual duty cycle
-                */
-               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
-                                    10 11 12 13 14 15 16 17 18 19
-                                    20 21 22 23 24 25 26 27 28 29
-                                    30 31 32 33 34 35 36 37 38 39
-                                    40 41 42 43 44 45 46 47 48 49
-                                    50 51 52 53 54 55 56 57 58 59
-                                    60 61 62 63 64 65 66 67 68 69
-                                    70 71 72 73 74 75 76 77 78 79
-                                    80 81 82 83 84 85 86 87 88 89
-                                    90 91 92 93 94 95 96 97 98 99
-                                   100>;
-               default-brightness-level = <50>;
-       };
-
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_2>;
-               interface-pix-fmt = "rgb24";
-               status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               display-timings {
-                       native-mode = <&vga>;
-
-                       vga: VGA {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <48>;
-                               hsync-len = <96>;
-                               hfront-porch = <16>;
-                               vback-porch = <31>;
-                               vsync-len = <2>;
-                               vfront-porch = <12>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ETV570 {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <114>;
-                               hsync-len = <30>;
-                               hfront-porch = <16>;
-                               vback-porch = <32>;
-                               vsync-len = <3>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0350 {
-                               clock-frequency = <6413760>;
-                               hactive = <320>;
-                               vactive = <240>;
-                               hback-porch = <34>;
-                               hsync-len = <34>;
-                               hfront-porch = <20>;
-                               vback-porch = <15>;
-                               vsync-len = <3>;
-                               vfront-porch = <4>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0430 {
-                               clock-frequency = <9009000>;
-                               hactive = <480>;
-                               vactive = <272>;
-                               hback-porch = <2>;
-                               hsync-len = <41>;
-                               hfront-porch = <2>;
-                               vback-porch = <2>;
-                               vsync-len = <10>;
-                               vfront-porch = <2>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-
-                       ET0500 {
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0700 { /* same as ET0500 */
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ETQ570 {
-                               clock-frequency = <6596040>;
-                               hactive = <320>;
-                               vactive = <240>;
-                               hback-porch = <38>;
-                               hsync-len = <30>;
-                               hfront-porch = <30>;
-                               vback-porch = <16>;
-                               vsync-len = <3>;
-                               vfront-porch = <4>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-               };
-       };
 };
 
 &ds1339 {
        status = "disabled";
 };
 
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
-};
-
-&reg_lcd0_pwr {
-       status = "disabled";
-};
-
 &usdhc4 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usdhc4>;
diff --git a/arch/arm/boot/dts/imx6dl-tx6s-8134-mb7.dts b/arch/arm/boot/dts/imx6dl-tx6s-8134-mb7.dts
new file mode 100644 (file)
index 0000000..d8a4d9c
--- /dev/null
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+#include "imx6dl-tx6s-8134.dts"
+#include "imx6qdl-tx6-mb7.dtsi"
+
+/ {
+       model = "Ka-Ro electronics TX6S-8134 Module on MB7 baseboard";
+};
diff --git a/arch/arm/boot/dts/imx6dl-tx6s-8134.dts b/arch/arm/boot/dts/imx6dl-tx6s-8134.dts
new file mode 100644 (file)
index 0000000..40c5637
--- /dev/null
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2016-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 "imx6dl.dtsi"
+#include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lvds.dtsi"
+
+/ {
+       model = "Ka-Ro electronics TX6S-8134 Module";
+       compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
+
+       cpus {
+               /delete-node/ cpu@1;
+       };
+};
+
+&ds1339 {
+       status = "disabled";
+};
+
+&pinctrl_usdhc1 {
+       fsl,pins = <
+               MX6QDL_PAD_SD1_CMD__SD1_CMD             0x070b1
+               MX6QDL_PAD_SD1_CLK__SD1_CLK             0x070b1
+               MX6QDL_PAD_SD1_DAT0__SD1_DATA0          0x070b1
+               MX6QDL_PAD_SD1_DAT1__SD1_DATA1          0x070b1
+               MX6QDL_PAD_SD1_DAT2__SD1_DATA2          0x070b1
+               MX6QDL_PAD_SD1_DAT3__SD1_DATA3          0x070b1
+               MX6QDL_PAD_SD3_CMD__GPIO7_IO02          0x170b0 /* SD1 CD */
+       >;
+};
diff --git a/arch/arm/boot/dts/imx6dl-tx6s-8135-mb7.dts b/arch/arm/boot/dts/imx6dl-tx6s-8135-mb7.dts
new file mode 100644 (file)
index 0000000..60f48a5
--- /dev/null
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+#include "imx6dl-tx6s-8135.dts"
+#include "imx6qdl-tx6-mb7.dtsi"
+
+/ {
+       model = "Ka-Ro electronics TX6S-8135 Module on MB7 baseboard";
+};
diff --git a/arch/arm/boot/dts/imx6dl-tx6s-8135.dts b/arch/arm/boot/dts/imx6dl-tx6s-8135.dts
new file mode 100644 (file)
index 0000000..2af8859
--- /dev/null
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2016-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 "imx6dl.dtsi"
+#include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lvds.dtsi"
+
+/ {
+       model = "Ka-Ro electronics TX6S-8135 Module";
+       compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
+
+       cpus {
+               /delete-node/ cpu@1;
+       };
+};
+
+&ds1339 {
+       status = "disabled";
+};
+
+&gpmi {
+       status = "disabled";
+};
+
+&usdhc4 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usdhc4>;
+       bus-width = <4>;
+       non-removable;
+       no-1-8-v;
+       fsl,wp-controller;
+       status = "okay";
+};
+
+&iomuxc {
+       pinctrl_usdhc4: usdhc4grp {
+               fsl,pins = <
+                       MX6QDL_PAD_SD4_CMD__SD4_CMD             0x070b1
+                       MX6QDL_PAD_SD4_CLK__SD4_CLK             0x070b1
+                       MX6QDL_PAD_SD4_DAT0__SD4_DATA0          0x070b1
+                       MX6QDL_PAD_SD4_DAT1__SD4_DATA1          0x070b1
+                       MX6QDL_PAD_SD4_DAT2__SD4_DATA2          0x070b1
+                       MX6QDL_PAD_SD4_DAT3__SD4_DATA3          0x070b1
+                       MX6QDL_PAD_NANDF_ALE__SD4_RESET         0x0b0b1
+               >;
+       };
+};
index d1f1298ec55a8f28e80a297ee9e15d62d8385d28..67ed0452f5de5c1a2437a6ccbf70b7fdcdb195e4 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2014-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
 /dts-v1/;
 #include "imx6dl.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lcd.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6U-801x Module";
        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
-
-       aliases {
-               display = &display;
-       };
-
-       backlight: backlight {
-               compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
-               power-supply = <&reg_3v3>;
-               /*
-                * a poor man's way to create a 1:1 relationship between
-                * the PWM value and the actual duty cycle
-                */
-               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
-                                    10 11 12 13 14 15 16 17 18 19
-                                    20 21 22 23 24 25 26 27 28 29
-                                    30 31 32 33 34 35 36 37 38 39
-                                    40 41 42 43 44 45 46 47 48 49
-                                    50 51 52 53 54 55 56 57 58 59
-                                    60 61 62 63 64 65 66 67 68 69
-                                    70 71 72 73 74 75 76 77 78 79
-                                    80 81 82 83 84 85 86 87 88 89
-                                    90 91 92 93 94 95 96 97 98 99
-                                   100>;
-               default-brightness-level = <50>;
-       };
-
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               interface-pix-fmt = "rgb24";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_1>;
-               status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               display-timings {
-                       VGA {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <48>;
-                               hsync-len = <96>;
-                               hfront-porch = <16>;
-                               vback-porch = <31>;
-                               vsync-len = <2>;
-                               vfront-porch = <12>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ETV570 {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <114>;
-                               hsync-len = <30>;
-                               hfront-porch = <16>;
-                               vback-porch = <32>;
-                               vsync-len = <3>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0350 {
-                               clock-frequency = <6413760>;
-                               hactive = <320>;
-                               vactive = <240>;
-                               hback-porch = <34>;
-                               hsync-len = <34>;
-                               hfront-porch = <20>;
-                               vback-porch = <15>;
-                               vsync-len = <3>;
-                               vfront-porch = <4>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0430 {
-                               clock-frequency = <9009000>;
-                               hactive = <480>;
-                               vactive = <272>;
-                               hback-porch = <2>;
-                               hsync-len = <41>;
-                               hfront-porch = <2>;
-                               vback-porch = <2>;
-                               vsync-len = <10>;
-                               vfront-porch = <2>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-
-                       ET0500 {
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0700 { /* same as ET0500 */
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ETQ570 {
-                               clock-frequency = <6596040>;
-                               hactive = <320>;
-                               vactive = <240>;
-                               hback-porch = <38>;
-                               hsync-len = <30>;
-                               hfront-porch = <30>;
-                               vback-porch = <16>;
-                               vsync-len = <3>;
-                               vfront-porch = <4>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-               };
-       };
-};
-
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
 };
diff --git a/arch/arm/boot/dts/imx6dl-tx6u-8033-mb7.dts b/arch/arm/boot/dts/imx6dl-tx6u-8033-mb7.dts
new file mode 100644 (file)
index 0000000..d34189f
--- /dev/null
@@ -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 "imx6dl-tx6u-8033.dts"
+#include "imx6qdl-tx6-mb7.dtsi"
+
+/ {
+       model = "Ka-Ro electronics TX6U-8033 Module on MB7 baseboard";
+};
index 4d3204a56f46114347be5943691be5917e752dab..7030b2654bbd23d33580d79679e7016671b8a0e0 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2014-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
 /dts-v1/;
 #include "imx6dl.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lcd.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6U-8033 Module";
        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
-
-       aliases {
-               display = &display;
-       };
-
-       backlight: backlight {
-               compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_lcd0_pwr>;
-               enable-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>;
-               power-supply = <&reg_lcd1_pwr>;
-               /*
-                * a poor man's way to create a 1:1 relationship between
-                * the PWM value and the actual duty cycle
-                */
-               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
-                                    10 11 12 13 14 15 16 17 18 19
-                                    20 21 22 23 24 25 26 27 28 29
-                                    30 31 32 33 34 35 36 37 38 39
-                                    40 41 42 43 44 45 46 47 48 49
-                                    50 51 52 53 54 55 56 57 58 59
-                                    60 61 62 63 64 65 66 67 68 69
-                                    70 71 72 73 74 75 76 77 78 79
-                                    80 81 82 83 84 85 86 87 88 89
-                                    90 91 92 93 94 95 96 97 98 99
-                                   100>;
-               default-brightness-level = <50>;
-       };
-
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_2>;
-               interface-pix-fmt = "rgb24";
-               status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               display-timings {
-                       native-mode = <&vga>;
-
-                       vga: VGA {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <48>;
-                               hsync-len = <96>;
-                               hfront-porch = <16>;
-                               vback-porch = <31>;
-                               vsync-len = <2>;
-                               vfront-porch = <12>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ETV570 {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <114>;
-                               hsync-len = <30>;
-                               hfront-porch = <16>;
-                               vback-porch = <32>;
-                               vsync-len = <3>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0350 {
-                               clock-frequency = <6413760>;
-                               hactive = <320>;
-                               vactive = <240>;
-                               hback-porch = <34>;
-                               hsync-len = <34>;
-                               hfront-porch = <20>;
-                               vback-porch = <15>;
-                               vsync-len = <3>;
-                               vfront-porch = <4>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0430 {
-                               clock-frequency = <9009000>;
-                               hactive = <480>;
-                               vactive = <272>;
-                               hback-porch = <2>;
-                               hsync-len = <41>;
-                               hfront-porch = <2>;
-                               vback-porch = <2>;
-                               vsync-len = <10>;
-                               vfront-porch = <2>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-
-                       ET0500 {
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0700 { /* same as ET0500 */
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ETQ570 {
-                               clock-frequency = <6596040>;
-                               hactive = <320>;
-                               vactive = <240>;
-                               hback-porch = <38>;
-                               hsync-len = <30>;
-                               hfront-porch = <30>;
-                               vback-porch = <16>;
-                               vsync-len = <3>;
-                               vfront-porch = <4>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-               };
-       };
 };
 
 &ds1339 {
        status = "disabled";
 };
 
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
-};
-
-&reg_lcd0_pwr {
-       status = "disabled";
-};
-
 &usdhc4 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usdhc4>;
diff --git a/arch/arm/boot/dts/imx6dl-tx6u-80xx-mb7.dts b/arch/arm/boot/dts/imx6dl-tx6u-80xx-mb7.dts
new file mode 100644 (file)
index 0000000..aef5fcc
--- /dev/null
@@ -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 "imx6dl-tx6u-801x.dts"
+#include "imx6qdl-tx6-mb7.dtsi"
+
+/ {
+       model = "Ka-Ro electronics TX6U-8030/-8010/-8012 Module on MB7 baseboard";
+};
index 5e0c6bb49f37a38b50ae6e849fad3898f0428c21..5342f2f5a8a856c25fbc70200212f6f6aec96ce1 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2014-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
 /dts-v1/;
 #include "imx6dl.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lvds.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6U-811x Module";
        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
-
-       aliases {
-               display = &lvds0;
-               lvds0 = &lvds0;
-               lvds1 = &lvds1;
-       };
-
-       backlight0: backlight0 {
-               compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 0>;
-               power-supply = <&reg_lcd0_pwr>;
-               /*
-                * a poor man's way to create a 1:1 relationship between
-                * the PWM value and the actual duty cycle
-                */
-               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
-                                    10 11 12 13 14 15 16 17 18 19
-                                    20 21 22 23 24 25 26 27 28 29
-                                    30 31 32 33 34 35 36 37 38 39
-                                    40 41 42 43 44 45 46 47 48 49
-                                    50 51 52 53 54 55 56 57 58 59
-                                    60 61 62 63 64 65 66 67 68 69
-                                    70 71 72 73 74 75 76 77 78 79
-                                    80 81 82 83 84 85 86 87 88 89
-                                    90 91 92 93 94 95 96 97 98 99
-                                   100>;
-               default-brightness-level = <50>;
-       };
-
-       backlight1: backlight1 {
-               compatible = "pwm-backlight";
-               pwms = <&pwm1 0 500000 0>;
-               power-supply = <&reg_lcd1_pwr>;
-               /*
-                * a poor man's way to create a 1:1 relationship between
-                * the PWM value and the actual duty cycle
-                */
-               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
-                                    10 11 12 13 14 15 16 17 18 19
-                                    20 21 22 23 24 25 26 27 28 29
-                                    30 31 32 33 34 35 36 37 38 39
-                                    40 41 42 43 44 45 46 47 48 49
-                                    50 51 52 53 54 55 56 57 58 59
-                                    60 61 62 63 64 65 66 67 68 69
-                                    70 71 72 73 74 75 76 77 78 79
-                                    80 81 82 83 84 85 86 87 88 89
-                                    90 91 92 93 94 95 96 97 98 99
-                                   100>;
-               default-brightness-level = <50>;
-       };
-};
-
-&i2c3 {
-       polytouch2: eeti@04 {
-               compatible = "eeti,egalax_ts";
-               reg = <0x04>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_eeti>;
-               interrupt-parent = <&gpio3>;
-               interrupts = <22 0>;
-               wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
-               wakeup-source;
-       };
-};
-
-&kpp {
-       status = "disabled"; /* pad conflict with backlight1 PWM */
-};
-
-&ldb {
-       status = "okay";
-
-       lvds0: lvds-channel@0 {
-               fsl,data-mapping = "spwg";
-               fsl,data-width = <18>;
-               status = "okay";
-
-               display-timings {
-                       native-mode = <&lvds_timing0>;
-                       lvds_timing0: hsd100pxn1 {
-                               clock-frequency = <65000000>;
-                               hactive = <1024>;
-                               vactive = <768>;
-                               hback-porch = <220>;
-                               hfront-porch = <40>;
-                               vback-porch = <21>;
-                               vfront-porch = <7>;
-                               hsync-len = <60>;
-                               vsync-len = <10>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-               };
-       };
-
-       lvds1: lvds-channel@1 {
-               fsl,data-mapping = "spwg";
-               fsl,data-width = <18>;
-               status = "disabled";
-
-               display-timings {
-                       native-mode = <&lvds_timing1>;
-                       lvds_timing1: hsd100pxn1 {
-                               clock-frequency = <65000000>;
-                               hactive = <1024>;
-                               vactive = <768>;
-                               hback-porch = <220>;
-                               hfront-porch = <40>;
-                               vback-porch = <21>;
-                               vfront-porch = <7>;
-                               hsync-len = <60>;
-                               vsync-len = <10>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-               };
-       };
-};
-
-&pwm1 {
-       status = "okay";
-};
-
-&iomuxc {
-       pinctrl_eeti: eetigrp {
-               fsl,pins = <
-                       MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */
-               >;
-       };
 };
index b9a783f7160e29fd177f4e4697625722ee1b9ba7..c4588fb0bf6fe492ed84f48adcc8eea5c94d9299 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2016-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
  */
 
 /dts-v1/;
-#include "imx6dl.dtsi"
-#include "imx6qdl-tx6.dtsi"
+#include "imx6dl-tx6u-811x.dts"
+#include "imx6qdl-tx6-mb7.dtsi"
 
 / {
-       model = "Ka-Ro electronics TX6U-81xx Module on MB7 baseboard";
-       compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
-
-       aliases {
-               display = &lvds0;
-               lvds0 = &lvds0;
-               lvds1 = &lvds1;
-       };
-
-       backlight0: backlight0 {
-               compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
-               power-supply = <&reg_lcd0_pwr>;
-               /*
-                * a poor man's way to create a 1:1 relationship between
-                * the PWM value and the actual duty cycle
-                */
-               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
-                                    10 11 12 13 14 15 16 17 18 19
-                                    20 21 22 23 24 25 26 27 28 29
-                                    30 31 32 33 34 35 36 37 38 39
-                                    40 41 42 43 44 45 46 47 48 49
-                                    50 51 52 53 54 55 56 57 58 59
-                                    60 61 62 63 64 65 66 67 68 69
-                                    70 71 72 73 74 75 76 77 78 79
-                                    80 81 82 83 84 85 86 87 88 89
-                                    90 91 92 93 94 95 96 97 98 99
-                                   100>;
-               default-brightness-level = <50>;
-       };
-
-       backlight1: backlight1 {
-               compatible = "pwm-backlight";
-               pwms = <&pwm1 0 500000 PWM_POLARITY_INVERTED>;
-               power-supply = <&reg_lcd1_pwr>;
-               /*
-                * a poor man's way to create a 1:1 relationship between
-                * the PWM value and the actual duty cycle
-                */
-               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
-                                    10 11 12 13 14 15 16 17 18 19
-                                    20 21 22 23 24 25 26 27 28 29
-                                    30 31 32 33 34 35 36 37 38 39
-                                    40 41 42 43 44 45 46 47 48 49
-                                    50 51 52 53 54 55 56 57 58 59
-                                    60 61 62 63 64 65 66 67 68 69
-                                    70 71 72 73 74 75 76 77 78 79
-                                    80 81 82 83 84 85 86 87 88 89
-                                    90 91 92 93 94 95 96 97 98 99
-                                   100>;
-               default-brightness-level = <50>;
-       };
-};
-
-&can1 {
-       status = "disabled";
-};
-
-&can2 {
-       xceiver-supply = <&reg_3v3>;
-};
-
-&i2c3 {
-       polytouch1: eeti@04 {
-               compatible = "eeti,egalax_ts";
-               reg = <0x04>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_eeti>;
-               interrupts-extended = <&gpio3 22 IRQ_TYPE_EDGE_FALLING>;
-               wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
-               wakeup-source;
-       };
-};
-
-&kpp {
-       status = "disabled"; /* pads partially clash with backlight1 PWM */
-};
-
-&ldb {
-       status = "okay";
-
-       lvds0: lvds-channel@0 {
-               fsl,data-mapping = "spwg";
-               fsl,data-width = <18>;
-               status = "okay";
-
-               display-timings {
-                       native-mode = <&lvds0_timing1>;
-
-                       lvds0_timing0: hsd100pxn1 {
-                               clock-frequency = <65000000>;
-                               hactive = <1024>;
-                               vactive = <768>;
-                               hback-porch = <220>;
-                               hfront-porch = <40>;
-                               vback-porch = <21>;
-                               vfront-porch = <7>;
-                               hsync-len = <60>;
-                               vsync-len = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-
-                       lvds0_timing1: VGA {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <48>;
-                               hfront-porch = <16>;
-                               vback-porch = <31>;
-                               vfront-porch = <12>;
-                               hsync-len = <96>;
-                               vsync-len = <2>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       lvds0_timing2: nl12880bc20 {
-                               clock-frequency = <71000000>;
-                               hactive = <1280>;
-                               vactive = <800>;
-                               hback-porch = <50>;
-                               hfront-porch = <50>;
-                               vback-porch = <5>;
-                               vfront-porch = <5>;
-                               hsync-len = <60>;
-                               vsync-len = <13>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-               };
-       };
-
-       lvds1: lvds-channel@1 {
-               fsl,data-mapping = "spwg";
-               fsl,data-width = <18>;
-               status = "okay";
-
-               display-timings {
-                       native-mode = <&lvds1_timing2>;
-
-                       lvds1_timing0: hsd100pxn1 {
-                               clock-frequency = <65000000>;
-                               hactive = <1024>;
-                               vactive = <768>;
-                               hback-porch = <220>;
-                               hfront-porch = <40>;
-                               vback-porch = <21>;
-                               vfront-porch = <7>;
-                               hsync-len = <60>;
-                               vsync-len = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-
-                       lvds1_timing1: VGA {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <48>;
-                               hfront-porch = <16>;
-                               vback-porch = <31>;
-                               vfront-porch = <12>;
-                               hsync-len = <96>;
-                               vsync-len = <2>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       lvds1_timing2: nl12880bc20 {
-                               clock-frequency = <71000000>;
-                               hactive = <1280>;
-                               vactive = <800>;
-                               hback-porch = <50>;
-                               hfront-porch = <50>;
-                               vback-porch = <5>;
-                               vfront-porch = <5>;
-                               hsync-len = <60>;
-                               vsync-len = <13>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-               };
-       };
-};
-
-&pwm1 {
-       status = "okay";
-};
-
-&iomuxc {
-       pinctrl_eeti: eetigrp {
-               fsl,pins = <
-                       MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */
-               >;
-       };
+       model = "Ka-Ro electronics TX6U-8130/-8110 Module on MB7 baseboard";
 };
index 71746edc2ee9218d21cd8a738188ff24370862b0..ac3050a835e5502bf24ed3f04dc6500003d534f8 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2014-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
 /dts-v1/;
 #include "imx6q.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lcd.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6Q-1010 Module on CoMpact TFT";
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
+};
 
-       aliases {
-               display = &display;
-       };
-
-       backlight: backlight {
-               compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 0>;
-               power-supply = <&reg_3v3>;
-               /*
-                * a poor man's way to create a 1:1 relationship between
-                * the PWM value and the actual duty cycle
-                */
-               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
-                                    10 11 12 13 14 15 16 17 18 19
-                                    20 21 22 23 24 25 26 27 28 29
-                                    30 31 32 33 34 35 36 37 38 39
-                                    40 41 42 43 44 45 46 47 48 49
-                                    50 51 52 53 54 55 56 57 58 59
-                                    60 61 62 63 64 65 66 67 68 69
-                                    70 71 72 73 74 75 76 77 78 79
-                                    80 81 82 83 84 85 86 87 88 89
-                                    90 91 92 93 94 95 96 97 98 99
-                                   100>;
-               default-brightness-level = <50>;
-       };
-
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               interface-pix-fmt = "rgb24";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_1>;
-               status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               display-timings {
-                       native-mode = <&ET070001DM6>;
-
-                       ET070001DM6: CoMTFT { /* same as ET0700 but with inverted pixel clock */
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-               };
-       };
+&backlight {
+       pwms = <&pwm2 0 500000 0>;
+       /delete-property/ turn-on-delay-ms;
 };
 
 &can1 {
        xceiver-supply = <&reg_3v3>;
 };
 
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
-};
-
 &kpp {
        status = "disabled";
 };
 
+&lcd_panel {
+       compatible = "edt,etm0700g0edh6";
+};
+
 &reg_can_xcvr {
        status = "disabled";
 };
index f9cd21a41a797c8b2dc81a04f1485de650611e3e..4ee860b626ff6842d23ee3971d1a85b21416f79c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2014-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
 /dts-v1/;
 #include "imx6q.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lcd.dtsi"
 
 / {
-       model = "Ka-Ro electronics TX6Q-1010 Module";
+       model = "Ka-Ro electronics TX6Q-1010/-1030 Module";
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
-
-       aliases {
-               display = &display;
-       };
-
-       backlight: backlight {
-               compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
-               power-supply = <&reg_3v3>;
-               /*
-                * a poor man's way to create a 1:1 relationship between
-                * the PWM value and the actual duty cycle
-                */
-               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
-                                    10 11 12 13 14 15 16 17 18 19
-                                    20 21 22 23 24 25 26 27 28 29
-                                    30 31 32 33 34 35 36 37 38 39
-                                    40 41 42 43 44 45 46 47 48 49
-                                    50 51 52 53 54 55 56 57 58 59
-                                    60 61 62 63 64 65 66 67 68 69
-                                    70 71 72 73 74 75 76 77 78 79
-                                    80 81 82 83 84 85 86 87 88 89
-                                    90 91 92 93 94 95 96 97 98 99
-                                   100>;
-               default-brightness-level = <50>;
-       };
-
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               interface-pix-fmt = "rgb24";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_1>;
-               status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               display-timings {
-                       VGA {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <48>;
-                               hsync-len = <96>;
-                               hfront-porch = <16>;
-                               vback-porch = <31>;
-                               vsync-len = <2>;
-                               vfront-porch = <12>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ETV570 {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <114>;
-                               hsync-len = <30>;
-                               hfront-porch = <16>;
-                               vback-porch = <32>;
-                               vsync-len = <3>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0350 {
-                               clock-frequency = <6413760>;
-                               hactive = <320>;
-                               vactive = <240>;
-                               hback-porch = <34>;
-                               hsync-len = <34>;
-                               hfront-porch = <20>;
-                               vback-porch = <15>;
-                               vsync-len = <3>;
-                               vfront-porch = <4>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0430 {
-                               clock-frequency = <9009000>;
-                               hactive = <480>;
-                               vactive = <272>;
-                               hback-porch = <2>;
-                               hsync-len = <41>;
-                               hfront-porch = <2>;
-                               vback-porch = <2>;
-                               vsync-len = <10>;
-                               vfront-porch = <2>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-
-                       ET0500 {
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0700 { /* same as ET0500 */
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ETQ570 {
-                               clock-frequency = <6596040>;
-                               hactive = <320>;
-                               vactive = <240>;
-                               hback-porch = <38>;
-                               hsync-len = <30>;
-                               hfront-porch = <30>;
-                               vback-porch = <16>;
-                               vsync-len = <3>;
-                               vfront-porch = <4>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-               };
-       };
 };
 
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
+&ipu2 {
+       status = "disabled";
 };
index 959ff3fb7304e4c3aef373eb6801e54ddb086d90..a773f252816cb54091a60189be147c6d92616a03 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2014-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
 /dts-v1/;
 #include "imx6q.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lcd.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6Q-1020 Module on CoMpact TFT";
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
+};
 
-       aliases {
-               display = &display;
-       };
-
-       backlight: backlight {
-               compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 0>;
-               power-supply = <&reg_3v3>;
-               /*
-                * a poor man's way to create a 1:1 relationship between
-                * the PWM value and the actual duty cycle
-                */
-               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
-                                    10 11 12 13 14 15 16 17 18 19
-                                    20 21 22 23 24 25 26 27 28 29
-                                    30 31 32 33 34 35 36 37 38 39
-                                    40 41 42 43 44 45 46 47 48 49
-                                    50 51 52 53 54 55 56 57 58 59
-                                    60 61 62 63 64 65 66 67 68 69
-                                    70 71 72 73 74 75 76 77 78 79
-                                    80 81 82 83 84 85 86 87 88 89
-                                    90 91 92 93 94 95 96 97 98 99
-                                   100>;
-               default-brightness-level = <50>;
-       };
-
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               interface-pix-fmt = "rgb24";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_1>;
-               status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               display-timings {
-                       native-mode = <&ET070001DM6>;
-
-                       ET070001DM6: CoMTFT { /* same as ET0700 but with inverted pixel clock */
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-               };
-       };
+&backlight {
+       pwms = <&pwm2 0 500000 0>;
+       /delete-property/ turn-on-delay-ms;
 };
 
 &can1 {
        status = "disabled";
 };
 
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
-};
-
 &kpp {
        status = "disabled";
 };
 
+&lcd_panel {
+       compatible = "edt,etm0700g0edh6";
+};
+
 &reg_can_xcvr {
        status = "disabled";
 };
index b49133d25d80995e7a38d87195fc1c588c753efc..0a4daec8d3ad3abd733892febf7ab11029bc47ff 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2014-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
 /dts-v1/;
 #include "imx6q.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lcd.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6Q-1020 Module";
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
-
-       aliases {
-               display = &display;
-       };
-
-       backlight: backlight {
-               compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
-               power-supply = <&reg_3v3>;
-               /*
-                * a poor man's way to create a 1:1 relationship between
-                * the PWM value and the actual duty cycle
-                */
-               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
-                                    10 11 12 13 14 15 16 17 18 19
-                                    20 21 22 23 24 25 26 27 28 29
-                                    30 31 32 33 34 35 36 37 38 39
-                                    40 41 42 43 44 45 46 47 48 49
-                                    50 51 52 53 54 55 56 57 58 59
-                                    60 61 62 63 64 65 66 67 68 69
-                                    70 71 72 73 74 75 76 77 78 79
-                                    80 81 82 83 84 85 86 87 88 89
-                                    90 91 92 93 94 95 96 97 98 99
-                                   100>;
-               default-brightness-level = <50>;
-       };
-
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               interface-pix-fmt = "rgb24";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_1>;
-               status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               display-timings {
-                       VGA {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <48>;
-                               hsync-len = <96>;
-                               hfront-porch = <16>;
-                               vback-porch = <31>;
-                               vsync-len = <2>;
-                               vfront-porch = <12>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ETV570 {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <114>;
-                               hsync-len = <30>;
-                               hfront-porch = <16>;
-                               vback-porch = <32>;
-                               vsync-len = <3>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0350 {
-                               clock-frequency = <6413760>;
-                               hactive = <320>;
-                               vactive = <240>;
-                               hback-porch = <34>;
-                               hsync-len = <34>;
-                               hfront-porch = <20>;
-                               vback-porch = <15>;
-                               vsync-len = <3>;
-                               vfront-porch = <4>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0430 {
-                               clock-frequency = <9009000>;
-                               hactive = <480>;
-                               vactive = <272>;
-                               hback-porch = <2>;
-                               hsync-len = <41>;
-                               hfront-porch = <2>;
-                               vback-porch = <2>;
-                               vsync-len = <10>;
-                               vfront-porch = <2>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-
-                       ET0500 {
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0700 { /* same as ET0500 */
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ETQ570 {
-                               clock-frequency = <6596040>;
-                               hactive = <320>;
-                               vactive = <240>;
-                               hback-porch = <38>;
-                               hsync-len = <30>;
-                               hfront-porch = <30>;
-                               vback-porch = <16>;
-                               vsync-len = <3>;
-                               vfront-porch = <4>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-               };
-       };
 };
 
 &ds1339 {
        status = "disabled";
 };
 
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
+&ipu2 {
+       status = "disabled";
 };
 
 &usdhc4 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usdhc4>;
        bus-width = <4>;
+       non-removable;
        no-1-8-v;
        fsl,wp-controller;
        status = "okay";
diff --git a/arch/arm/boot/dts/imx6q-tx6q-1036-mb7.dts b/arch/arm/boot/dts/imx6q-tx6q-1036-mb7.dts
new file mode 100644 (file)
index 0000000..9ffbb0f
--- /dev/null
@@ -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 "imx6q-tx6q-1036.dts"
+#include "imx6qdl-tx6-mb7.dtsi"
+
+/ {
+       model = "Ka-Ro electronics TX6Q-1036 Module on MB7 baseboard";
+};
index 7c152e32758cbc63b634daa37b55c0c44a947d01..cb2fcb4896c6590efae1c8e411eca573426243aa 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2014-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
 /dts-v1/;
 #include "imx6q.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lcd.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6Q-1036 Module";
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
-
-       aliases {
-               display = &display;
-       };
-
-       backlight: backlight {
-               compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_lcd0_pwr>;
-               enable-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>;
-               power-supply = <&reg_lcd1_pwr>;
-               /*
-                * a poor man's way to create a 1:1 relationship between
-                * the PWM value and the actual duty cycle
-                */
-               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
-                                    10 11 12 13 14 15 16 17 18 19
-                                    20 21 22 23 24 25 26 27 28 29
-                                    30 31 32 33 34 35 36 37 38 39
-                                    40 41 42 43 44 45 46 47 48 49
-                                    50 51 52 53 54 55 56 57 58 59
-                                    60 61 62 63 64 65 66 67 68 69
-                                    70 71 72 73 74 75 76 77 78 79
-                                    80 81 82 83 84 85 86 87 88 89
-                                    90 91 92 93 94 95 96 97 98 99
-                                   100>;
-               default-brightness-level = <50>;
-       };
-
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_2>;
-               interface-pix-fmt = "rgb24";
-               status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               display-timings {
-                       native-mode = <&vga>;
-
-                       vga: VGA {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <48>;
-                               hsync-len = <96>;
-                               hfront-porch = <16>;
-                               vback-porch = <31>;
-                               vsync-len = <2>;
-                               vfront-porch = <12>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ETV570 {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <114>;
-                               hsync-len = <30>;
-                               hfront-porch = <16>;
-                               vback-porch = <32>;
-                               vsync-len = <3>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0350 {
-                               clock-frequency = <6413760>;
-                               hactive = <320>;
-                               vactive = <240>;
-                               hback-porch = <34>;
-                               hsync-len = <34>;
-                               hfront-porch = <20>;
-                               vback-porch = <15>;
-                               vsync-len = <3>;
-                               vfront-porch = <4>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0430 {
-                               clock-frequency = <9009000>;
-                               hactive = <480>;
-                               vactive = <272>;
-                               hback-porch = <2>;
-                               hsync-len = <41>;
-                               hfront-porch = <2>;
-                               vback-porch = <2>;
-                               vsync-len = <10>;
-                               vfront-porch = <2>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-
-                       ET0500 {
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0700 { /* same as ET0500 */
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ETQ570 {
-                               clock-frequency = <6596040>;
-                               hactive = <320>;
-                               vactive = <240>;
-                               hback-porch = <38>;
-                               hsync-len = <30>;
-                               hfront-porch = <30>;
-                               vback-porch = <16>;
-                               vsync-len = <3>;
-                               vfront-porch = <4>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-               };
-       };
 };
 
 &ds1339 {
        status = "disabled";
 };
 
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
-};
-
 &ipu2 {
        status = "disabled";
 };
 
-&reg_lcd0_pwr {
-       status = "disabled";
-};
-
 &usdhc4 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usdhc4>;
diff --git a/arch/arm/boot/dts/imx6q-tx6q-10x0-mb7.dts b/arch/arm/boot/dts/imx6q-tx6q-10x0-mb7.dts
new file mode 100644 (file)
index 0000000..d43a5d8
--- /dev/null
@@ -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 "imx6q-tx6q-1010.dts"
+#include "imx6qdl-tx6-mb7.dtsi"
+
+/ {
+       model = "Ka-Ro electronics TX6Q-1010/-1030 Module on MB7 baseboard";
+};
index 0433e220a931318a216fe4852d34600fad840a7c..f7b0acb65352c3c3852c3e2ca7f70aef2a37a508 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2014-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
 /dts-v1/;
 #include "imx6q.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lvds.dtsi"
 
 / {
-       model = "Ka-Ro electronics TX6Q-1110 Module";
+       model = "Ka-Ro electronics TX6Q-1110/-1130 Module";
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
-
-       aliases {
-               display = &lvds0;
-               lvds0 = &lvds0;
-               lvds1 = &lvds1;
-       };
-
-       backlight0: backlight0 {
-               compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 0>;
-               power-supply = <&reg_lcd0_pwr>;
-               /*
-                * a poor man's way to create a 1:1 relationship between
-                * the PWM value and the actual duty cycle
-                */
-               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
-                                    10 11 12 13 14 15 16 17 18 19
-                                    20 21 22 23 24 25 26 27 28 29
-                                    30 31 32 33 34 35 36 37 38 39
-                                    40 41 42 43 44 45 46 47 48 49
-                                    50 51 52 53 54 55 56 57 58 59
-                                    60 61 62 63 64 65 66 67 68 69
-                                    70 71 72 73 74 75 76 77 78 79
-                                    80 81 82 83 84 85 86 87 88 89
-                                    90 91 92 93 94 95 96 97 98 99
-                                   100>;
-               default-brightness-level = <50>;
-       };
-
-       backlight1: backlight1 {
-               compatible = "pwm-backlight";
-               pwms = <&pwm1 0 500000 0>;
-               power-supply = <&reg_lcd1_pwr>;
-               /*
-                * a poor man's way to create a 1:1 relationship between
-                * the PWM value and the actual duty cycle
-                */
-               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
-                                    10 11 12 13 14 15 16 17 18 19
-                                    20 21 22 23 24 25 26 27 28 29
-                                    30 31 32 33 34 35 36 37 38 39
-                                    40 41 42 43 44 45 46 47 48 49
-                                    50 51 52 53 54 55 56 57 58 59
-                                    60 61 62 63 64 65 66 67 68 69
-                                    70 71 72 73 74 75 76 77 78 79
-                                    80 81 82 83 84 85 86 87 88 89
-                                    90 91 92 93 94 95 96 97 98 99
-                                   100>;
-               default-brightness-level = <50>;
-       };
-};
-
-&i2c3 {
-       polytouch1: eeti@04 {
-               compatible = "eeti,egalax_ts";
-               reg = <0x04>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_eeti>;
-               interrupt-parent = <&gpio3>;
-               interrupts = <22 0>;
-               wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
-               wakeup-source;
-       };
 };
 
-&kpp {
-       status = "disabled"; /* pad conflict with backlight1 PWM */
-};
-
-&ldb {
-       status = "okay";
-
-       lvds0: lvds-channel@0 {
-               fsl,data-mapping = "spwg";
-               fsl,data-width = <18>;
-               status = "okay";
-
-               display-timings {
-                       native-mode = <&lvds_timing0>;
-                       lvds_timing0: hsd100pxn1 {
-                               clock-frequency = <65000000>;
-                               hactive = <1024>;
-                               vactive = <768>;
-                               hback-porch = <220>;
-                               hfront-porch = <40>;
-                               vback-porch = <21>;
-                               vfront-porch = <7>;
-                               hsync-len = <60>;
-                               vsync-len = <10>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-               };
-       };
-
-       lvds1: lvds-channel@1 {
-               fsl,data-mapping = "spwg";
-               fsl,data-width = <18>;
-               status = "disabled";
-
-               display-timings {
-                       native-mode = <&lvds_timing1>;
-                       lvds_timing1: hsd100pxn1 {
-                               clock-frequency = <65000000>;
-                               hactive = <1024>;
-                               vactive = <768>;
-                               hback-porch = <220>;
-                               hfront-porch = <40>;
-                               vback-porch = <21>;
-                               vfront-porch = <7>;
-                               hsync-len = <60>;
-                               vsync-len = <10>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-               };
-       };
-};
-
-&pwm1 {
-       status = "okay";
+&ipu2 {
+       status = "disabled";
 };
 
 &sata {
        status = "okay";
 };
-
-&iomuxc {
-       pinctrl_eeti: eetigrp {
-               fsl,pins = <
-                       MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */
-               >;
-       };
-};
index d78b129d01ea492d6b65e3885ca7974a0225c269..387edf2b3f96b437da6b4b421b5c71faf2d64db9 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2016-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
  */
 
 /dts-v1/;
-#include "imx6q.dtsi"
-#include "imx6qdl-tx6.dtsi"
+#include "imx6q-tx6q-1110.dts"
+#include "imx6qdl-tx6-mb7.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6Q-1110/-1130 Module on MB7 baseboard";
-       compatible = "karo,imx6q-tx6q", "fsl,imx6q";
-
-       aliases {
-               display = &lvds0;
-               ipu1 = &ipu2;
-               lvds0 = &lvds0;
-               lvds1 = &lvds1;
-       };
-
-       backlight0: backlight0 {
-               compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
-               power-supply = <&reg_lcd0_pwr>;
-               /*
-                * a poor man's way to create a 1:1 relationship between
-                * the PWM value and the actual duty cycle
-                */
-               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
-                                    10 11 12 13 14 15 16 17 18 19
-                                    20 21 22 23 24 25 26 27 28 29
-                                    30 31 32 33 34 35 36 37 38 39
-                                    40 41 42 43 44 45 46 47 48 49
-                                    50 51 52 53 54 55 56 57 58 59
-                                    60 61 62 63 64 65 66 67 68 69
-                                    70 71 72 73 74 75 76 77 78 79
-                                    80 81 82 83 84 85 86 87 88 89
-                                    90 91 92 93 94 95 96 97 98 99
-                                   100>;
-               default-brightness-level = <50>;
-       };
-
-       backlight1: backlight1 {
-               compatible = "pwm-backlight";
-               pwms = <&pwm1 0 500000 PWM_POLARITY_INVERTED>;
-               power-supply = <&reg_lcd1_pwr>;
-               /*
-                * a poor man's way to create a 1:1 relationship between
-                * the PWM value and the actual duty cycle
-                */
-               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
-                                    10 11 12 13 14 15 16 17 18 19
-                                    20 21 22 23 24 25 26 27 28 29
-                                    30 31 32 33 34 35 36 37 38 39
-                                    40 41 42 43 44 45 46 47 48 49
-                                    50 51 52 53 54 55 56 57 58 59
-                                    60 61 62 63 64 65 66 67 68 69
-                                    70 71 72 73 74 75 76 77 78 79
-                                    80 81 82 83 84 85 86 87 88 89
-                                    90 91 92 93 94 95 96 97 98 99
-                                   100>;
-               default-brightness-level = <50>;
-       };
-};
-
-&can1 {
-       status = "disabled";
-};
-
-&can2 {
-       xceiver-supply = <&reg_3v3>;
-};
-
-&i2c3 {
-       polytouch1: eeti@04 {
-               compatible = "eeti,egalax_ts";
-               reg = <0x04>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_eeti>;
-               interrupts-extended = <&gpio3 22 IRQ_TYPE_EDGE_FALLING>;
-               wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
-               wakeup-source;
-       };
-};
-
-&ipu2 {
-       status = "disabled";
-};
-
-&kpp {
-       status = "disabled"; /* pads partially clash with backlight1 PWM */
-};
-
-&ldb {
-       status = "okay";
-
-       lvds0: lvds-channel@0 {
-               fsl,data-mapping = "spwg";
-               fsl,data-width = <18>;
-               status = "okay";
-
-               display-timings {
-                       native-mode = <&lvds0_timing1>;
-
-                       lvds0_timing0: hsd100pxn1 {
-                               clock-frequency = <65000000>;
-                               hactive = <1024>;
-                               vactive = <768>;
-                               hback-porch = <220>;
-                               hfront-porch = <40>;
-                               vback-porch = <21>;
-                               vfront-porch = <7>;
-                               hsync-len = <60>;
-                               vsync-len = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-
-                       lvds0_timing1: VGA {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <48>;
-                               hfront-porch = <16>;
-                               vback-porch = <31>;
-                               vfront-porch = <12>;
-                               hsync-len = <96>;
-                               vsync-len = <2>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       lvds0_timing2: nl12880bc20 {
-                               clock-frequency = <71000000>;
-                               hactive = <1280>;
-                               vactive = <800>;
-                               hback-porch = <50>;
-                               hfront-porch = <50>;
-                               vback-porch = <5>;
-                               vfront-porch = <5>;
-                               hsync-len = <60>;
-                               vsync-len = <13>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-               };
-       };
-
-       lvds1: lvds-channel@1 {
-               fsl,data-mapping = "spwg";
-               fsl,data-width = <18>;
-               status = "okay";
-
-               display-timings {
-                       native-mode = <&lvds1_timing2>;
-
-                       lvds1_timing0: hsd100pxn1 {
-                               clock-frequency = <65000000>;
-                               hactive = <1024>;
-                               vactive = <768>;
-                               hback-porch = <220>;
-                               hfront-porch = <40>;
-                               vback-porch = <21>;
-                               vfront-porch = <7>;
-                               hsync-len = <60>;
-                               vsync-len = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-
-                       lvds1_timing1: VGA {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <48>;
-                               hfront-porch = <16>;
-                               vback-porch = <31>;
-                               vfront-porch = <12>;
-                               hsync-len = <96>;
-                               vsync-len = <2>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       lvds1_timing2: nl12880bc20 {
-                               clock-frequency = <71000000>;
-                               hactive = <1280>;
-                               vactive = <800>;
-                               hback-porch = <50>;
-                               hfront-porch = <50>;
-                               vback-porch = <5>;
-                               vfront-porch = <5>;
-                               hsync-len = <60>;
-                               vsync-len = <13>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-               };
-       };
-};
-
-&pwm1 {
-       status = "okay";
-};
-
-&sata {
-       status = "okay";
-};
-
-&iomuxc {
-       pinctrl_eeti: eetigrp {
-               fsl,pins = <
-                       MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */
-               >;
-       };
 };
diff --git a/arch/arm/boot/dts/imx6qdl-tx6-lcd.dtsi b/arch/arm/boot/dts/imx6qdl-tx6-lcd.dtsi
new file mode 100644 (file)
index 0000000..5102fc4
--- /dev/null
@@ -0,0 +1,252 @@
+/*
+ * 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.
+ */
+
+/ {
+       aliases {
+               display = &display;
+       };
+
+       backlight: backlight {
+               compatible = "pwm-backlight";
+               pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_lcd1_pwr>;
+               enable-gpios = <&gpio2 31 GPIO_ACTIVE_HIGH>;
+               power-supply = <&reg_3v3>;
+               turn-on-delay-ms = <35>;
+               /*
+                * a poor man's way to create a 1:1 relationship between
+                * the PWM value and the actual duty cycle
+                */
+               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
+                                    10 11 12 13 14 15 16 17 18 19
+                                    20 21 22 23 24 25 26 27 28 29
+                                    30 31 32 33 34 35 36 37 38 39
+                                    40 41 42 43 44 45 46 47 48 49
+                                    50 51 52 53 54 55 56 57 58 59
+                                    60 61 62 63 64 65 66 67 68 69
+                                    70 71 72 73 74 75 76 77 78 79
+                                    80 81 82 83 84 85 86 87 88 89
+                                    90 91 92 93 94 95 96 97 98 99
+                                   100>;
+               default-brightness-level = <50>;
+       };
+
+       lcd_panel: lcd-panel {
+               compatible = "edt,etm0700g0dh6";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_lcd0_pwr>;
+               enable-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>;
+               power-supply = <&reg_3v3>;
+               backlight = <&backlight>;
+               bus-format-override = "rgb24";
+
+               port {
+                       lcd_panel_in: endpoint {
+                               remote-endpoint = <&lcd_out>;
+                       };
+               };
+       };
+
+       display: disp0 {
+               compatible = "fsl,imx-parallel-display";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_disp0_1>;
+               status = "okay";
+
+               port@0 {
+                       reg = <0>;
+
+                       lcd_in: endpoint {
+                               remote-endpoint = <&ipu1_di0_disp0>;
+                       };
+               };
+
+               port@1 {
+                       reg = <1>;
+
+                       lcd_out: endpoint {
+                               remote-endpoint = <&lcd_panel_in>;
+                       };
+               };
+
+               display-timings {
+                       VGA {
+                               clock-frequency = <25200000>;
+                               hactive = <640>;
+                               vactive = <480>;
+                               hback-porch = <48>;
+                               hsync-len = <96>;
+                               hfront-porch = <16>;
+                               vback-porch = <31>;
+                               vsync-len = <2>;
+                               vfront-porch = <12>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       ETV570 {
+                               u-boot,panel-name = "edt,et057090dhu";
+                               clock-frequency = <25200000>;
+                               hactive = <640>;
+                               vactive = <480>;
+                               hback-porch = <114>;
+                               hsync-len = <30>;
+                               hfront-porch = <16>;
+                               vback-porch = <32>;
+                               vsync-len = <3>;
+                               vfront-porch = <10>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       ET0350 {
+                               u-boot,panel-name = "edt,et0350g0dh6";
+                               clock-frequency = <6413760>;
+                               hactive = <320>;
+                               vactive = <240>;
+                               hback-porch = <34>;
+                               hsync-len = <34>;
+                               hfront-porch = <20>;
+                               vback-porch = <15>;
+                               vsync-len = <3>;
+                               vfront-porch = <4>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       ET0430 {
+                               u-boot,panel-name = "edt,et0430g0dh6";
+                               clock-frequency = <9009000>;
+                               hactive = <480>;
+                               vactive = <272>;
+                               hback-porch = <2>;
+                               hsync-len = <41>;
+                               hfront-porch = <2>;
+                               vback-porch = <2>;
+                               vsync-len = <10>;
+                               vfront-porch = <2>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+
+                       ET0500 {
+                               clock-frequency = <33264000>;
+                               hactive = <800>;
+                               vactive = <480>;
+                               hback-porch = <88>;
+                               hsync-len = <128>;
+                               hfront-porch = <40>;
+                               vback-porch = <33>;
+                               vsync-len = <2>;
+                               vfront-porch = <10>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       ET0700 { /* same as ET0500 */
+                               u-boot,panel-name = "edt,etm0700g0dh6";
+                               clock-frequency = <33264000>;
+                               hactive = <800>;
+                               vactive = <480>;
+                               hback-porch = <88>;
+                               hsync-len = <128>;
+                               hfront-porch = <40>;
+                               vback-porch = <33>;
+                               vsync-len = <2>;
+                               vfront-porch = <10>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       ETQ570 {
+                               clock-frequency = <6596040>;
+                               hactive = <320>;
+                               vactive = <240>;
+                               hback-porch = <38>;
+                               hsync-len = <30>;
+                               hfront-porch = <30>;
+                               vback-porch = <16>;
+                               vsync-len = <3>;
+                               vfront-porch = <4>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       CoMTFT { /* same as ET0700 but with inverted pixel clock */
+                               u-boot,panel-name = "edt,etm0700g0edh6";
+                               clock-frequency = <33264000>;
+                               hactive = <800>;
+                               vactive = <480>;
+                               hback-porch = <88>;
+                               hsync-len = <128>;
+                               hfront-porch = <40>;
+                               vback-porch = <33>;
+                               vsync-len = <2>;
+                               vfront-porch = <10>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+               };
+       };
+};
+
+&ipu1_di0_disp0 {
+       remote-endpoint = <&lcd_in>;
+};
diff --git a/arch/arm/boot/dts/imx6qdl-tx6-lvds.dtsi b/arch/arm/boot/dts/imx6qdl-tx6-lvds.dtsi
new file mode 100644 (file)
index 0000000..2ca2eb3
--- /dev/null
@@ -0,0 +1,286 @@
+/*
+ * 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.
+ */
+
+/ {
+       aliases {
+               display = &lvds0;
+               lvds0 = &lvds0;
+               lvds1 = &lvds1;
+       };
+
+       backlight0: backlight0 {
+               compatible = "pwm-backlight";
+               pwms = <&pwm2 0 500000 0>;
+               power-supply = <&reg_lcd0_pwr>;
+               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
+                                    10 11 12 13 14 15 16 17 18 19
+                                    20 21 22 23 24 25 26 27 28 29
+                                    30 31 32 33 34 35 36 37 38 39
+                                    40 41 42 43 44 45 46 47 48 49
+                                    50 51 52 53 54 55 56 57 58 59
+                                    60 61 62 63 64 65 66 67 68 69
+                                    70 71 72 73 74 75 76 77 78 79
+                                    80 81 82 83 84 85 86 87 88 89
+                                    90 91 92 93 94 95 96 97 98 99
+                                   100>;
+               default-brightness-level = <50>;
+       };
+
+       backlight1: backlight1 {
+               compatible = "pwm-backlight";
+               pwms = <&pwm1 0 500000 0>;
+               power-supply = <&reg_lcd1_pwr>;
+               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
+                                    10 11 12 13 14 15 16 17 18 19
+                                    20 21 22 23 24 25 26 27 28 29
+                                    30 31 32 33 34 35 36 37 38 39
+                                    40 41 42 43 44 45 46 47 48 49
+                                    50 51 52 53 54 55 56 57 58 59
+                                    60 61 62 63 64 65 66 67 68 69
+                                    70 71 72 73 74 75 76 77 78 79
+                                    80 81 82 83 84 85 86 87 88 89
+                                    90 91 92 93 94 95 96 97 98 99
+                                   100>;
+               default-brightness-level = <50>;
+       };
+
+       lvds0_panel: lvds0-panel {
+               compatible = "nlt,nl12880bc20-spwg-24";
+               backlight = <&backlight0>;
+               power-supply = <&reg_3v3>;
+
+               port {
+                       panel_in_lvds0: endpoint {
+                               remote-endpoint = <&lvds0_out>;
+                       };
+               };
+       };
+
+       lvds1_panel: lvds1-panel {
+               compatible = "nlt,nl12880bc20-spwg-24";
+               backlight = <&backlight1>;
+               power-supply = <&reg_3v3>;
+
+               port {
+                       panel_in_lvds1: endpoint {
+                               remote-endpoint = <&lvds1_out>;
+                       };
+               };
+       };
+};
+
+&kpp {
+       status = "disabled"; /* pad conflict with backlight1 PWM */
+};
+
+&ldb {
+       status = "okay";
+
+       lvds0: lvds-channel@0 {
+               fsl,data-width = <18>;
+               status = "okay";
+
+               port@4 {
+                       reg = <4>;
+
+                       lvds0_out: endpoint {
+                               remote-endpoint = <&panel_in_lvds0>;
+                       };
+               };
+
+               display-timings {
+                       hsd100pxn1 {
+                               u-boot,panel-name = "hannstar,hsd100pxn1";
+                               clock-frequency = <65000000>;
+                               hactive = <1024>;
+                               vactive = <768>;
+                               hback-porch = <220>;
+                               hfront-porch = <40>;
+                               vback-porch = <21>;
+                               vfront-porch = <7>;
+                               hsync-len = <60>;
+                               vsync-len = <10>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+
+                       VGA {
+                               clock-frequency = <25200000>;
+                               hactive = <640>;
+                               vactive = <480>;
+                               hback-porch = <48>;
+                               hfront-porch = <16>;
+                               vback-porch = <31>;
+                               vfront-porch = <12>;
+                               hsync-len = <96>;
+                               vsync-len = <2>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       nl12880bc20 {
+                               u-boot,panel-name = "nlt,nl12880bc20-spwg-24";
+                               clock-frequency = <71000000>;
+                               hactive = <1280>;
+                               vactive = <800>;
+                               hback-porch = <50>;
+                               hfront-porch = <50>;
+                               vback-porch = <5>;
+                               vfront-porch = <5>;
+                               hsync-len = <60>;
+                               vsync-len = <13>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+
+                       ET0700 {
+                               u-boot,panel-name = "edt,etm0700g0dh6";
+                               clock-frequency = <33264000>;
+                               hactive = <800>;
+                               vactive = <480>;
+                               hback-porch = <88>;
+                               hsync-len = <128>;
+                               hfront-porch = <40>;
+                               vback-porch = <33>;
+                               vsync-len = <2>;
+                               vfront-porch = <10>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       ETV570 {
+                               u-boot,panel-name = "edt,et057090dhu";
+                               clock-frequency = <25200000>;
+                               hactive = <640>;
+                               vactive = <480>;
+                               hback-porch = <114>;
+                               hsync-len = <30>;
+                               hfront-porch = <16>;
+                               vback-porch = <32>;
+                               vsync-len = <3>;
+                               vfront-porch = <10>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+               };
+       };
+
+       lvds1: lvds-channel@1 {
+               fsl,data-width = <18>;
+               status = "okay";
+
+               port@4 {
+                       reg = <4>;
+
+                       lvds1_out: endpoint {
+                               remote-endpoint = <&panel_in_lvds1>;
+                       };
+               };
+
+               display-timings {
+                       hsd100pxn1 {
+                               clock-frequency = <65000000>;
+                               hactive = <1024>;
+                               vactive = <768>;
+                               hback-porch = <220>;
+                               hfront-porch = <40>;
+                               vback-porch = <21>;
+                               vfront-porch = <7>;
+                               hsync-len = <60>;
+                               vsync-len = <10>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+
+                       VGA {
+                               clock-frequency = <25200000>;
+                               hactive = <640>;
+                               vactive = <480>;
+                               hback-porch = <48>;
+                               hfront-porch = <16>;
+                               vback-porch = <31>;
+                               vfront-porch = <12>;
+                               hsync-len = <96>;
+                               vsync-len = <2>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       nl12880bc20 {
+                               clock-frequency = <71000000>;
+                               hactive = <1280>;
+                               vactive = <800>;
+                               hback-porch = <50>;
+                               hfront-porch = <50>;
+                               vback-porch = <5>;
+                               vfront-porch = <5>;
+                               hsync-len = <60>;
+                               vsync-len = <13>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+               };
+       };
+};
+
+&pwm1 {
+       status = "okay";
+};
+
+&reg_lcd0_pwr {
+       status = "okay";
+};
+
+&reg_lcd1_pwr {
+       status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6qdl-tx6-mb7.dtsi b/arch/arm/boot/dts/imx6qdl-tx6-mb7.dtsi
new file mode 100644 (file)
index 0000000..5662670
--- /dev/null
@@ -0,0 +1,105 @@
+/*
+ * 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.
+ */
+
+/ {
+       backlight0 {
+               pwms = <&pwm1 0 500000 PWM_POLARITY_INVERTED>;
+               turn-on-delay-ms = <35>;
+               power-supply = <&reg_lcd1_pwr>;
+       };
+
+       backlight1 {
+               pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
+               turn-on-delay-ms = <35>;
+               power-supply = <&reg_lcd1_pwr>;
+       };
+
+       lcd-panel {
+               compatible = "edt,et057090dhu";
+               bus-format-override = "rgb24";
+               pixelclk-active = <0>;
+       };
+
+       lvds0-panel {
+               compatible = "edt,etml1010g0dka";
+               bus-format-override = "spwg-18";
+               pixelclk-active = <0>;
+       };
+
+       lvds1-panel {
+               compatible = "edt,etml1010g0dka";
+               bus-format-override = "spwg-18";
+               pixelclk-active = <0>;
+       };
+
+       /delete-node/ sound;
+};
+
+&can1 {
+       status = "disabled";
+};
+
+&can2 {
+       xceiver-supply = <&reg_3v3>;
+};
+
+&ds1339 {
+       /*
+        * The backup voltage of the module internal RTC is not wired
+        * by default on the MB7, so disable that RTC chip.
+        */
+       status = "disabled";
+};
+
+&i2c3 {
+       rtc: mcp7940x@6f {
+               compatible = "microchip,mcp7940x";
+               reg = <0x6f>;
+       };
+};
+
+&sgtl5000 {
+       status = "disabled";
+};
+
+&reg_lcd0_pwr {
+       status = "disabled";
+};
index c6bec97fbeaf567c19046c8b39ec1f6dddbcdd5c..6e24ac97b94b1eb555f888f5467f6c7e2fb7cc6c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2014-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
@@ -43,6 +43,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/pwm/pwm.h>
+#include <dt-bindings/sound/fsl-imx-audmux.h>
 
 / {
        aliases {
                pinctrl-0 = <&pinctrl_lcd0_pwr>;
                gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>;
                enable-active-high;
-               regulator-boot-on;
+               status = "disabled";
        };
 
        reg_lcd1_pwr: regulator-lcd1-pwr {
                pinctrl-0 = <&pinctrl_lcd1_pwr>;
                gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>;
                enable-active-high;
-               regulator-boot-on;
+               status = "disabled";
        };
 
        reg_usbh1_vbus: regulator-usbh1-vbus {
        };
 
        sound {
-               compatible = "karo,imx6qdl-tx6qdl-sgtl5000",
-                            "fsl,imx-audio-sgtl5000";
-               model = "sgtl5000-audio";
+               compatible = "karo,imx6qdl-tx6-sgtl5000",
+                            "simple-audio-card";
+               simple-audio-card,name = "imx6qdl-tx6-sgtl5000-audio";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_audmux>;
-               ssi-controller = <&ssi1>;
-               audio-codec = <&sgtl5000>;
-               audio-routing =
+               simple-audio-card,format = "i2s";
+               simple-audio-card,bitclock-master = <&codec_dai>;
+               simple-audio-card,frame-master = <&codec_dai>;
+               simple-audio-card,widgets =
+                       "Microphone", "Mic Jack",
+                       "Line", "Line In",
+                       "Line", "Line Out",
+                       "Headphone", "Headphone Jack";
+               simple-audio-card,routing =
                        "MIC_IN", "Mic Jack",
                        "Mic Jack", "Mic Bias",
                        "Headphone Jack", "HP_OUT";
-               mux-int-port = <1>;
-               mux-ext-port = <5>;
+
+               cpu_dai: simple-audio-card,cpu {
+                       sound-dai = <&ssi1>;
+               };
+
+               codec_dai: simple-audio-card,codec {
+                       sound-dai = <&sgtl5000>;
+               };
        };
 };
 
 &audmux {
        status = "okay";
+
+       ssi1 {
+               fsl,audmux-port = <0>;
+               fsl,port-config = <
+                       (IMX_AUDMUX_V2_PTCR_SYN |
+                       IMX_AUDMUX_V2_PTCR_TFSEL(4) |
+                       IMX_AUDMUX_V2_PTCR_TCSEL(4) |
+                       IMX_AUDMUX_V2_PTCR_TFSDIR |
+                       IMX_AUDMUX_V2_PTCR_TCLKDIR)
+                       IMX_AUDMUX_V2_PDCR_RXDSEL(4)
+               >;
+       };
+
+       pins5 {
+               fsl,audmux-port = <4>;
+               fsl,port-config = <
+                       IMX_AUDMUX_V2_PTCR_SYN
+                       IMX_AUDMUX_V2_PDCR_RXDSEL(0)
+               >;
+       };
 };
 
 &can1 {
 
 &fec {
        pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_enet>;
+       pinctrl-0 = <&pinctrl_enet &pinctrl_enet_mdio &pinctrl_etnphy_rst>;
        clocks = <&clks IMX6QDL_CLK_ENET>,
                 <&clks IMX6QDL_CLK_ENET>,
                 <&clks IMX6QDL_CLK_ENET_REF>,
        clock-names = "ipg", "ahb", "ptp", "enet_out";
        phy-mode = "rmii";
        phy-reset-gpios = <&gpio7 6 GPIO_ACTIVE_LOW>;
+       phy-reset-post-delay = <10>;
        phy-handle = <&etnphy>;
        phy-supply = <&reg_3v3_etn>;
        status = "okay";
                        compatible = "ethernet-phy-ieee802.3-c22";
                        reg = <0>;
                        pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_enet_mdio>;
-                       interrupts-extended = <&gpio7 1 IRQ_TYPE_EDGE_FALLING>;
+                       pinctrl-0 = <&pinctrl_etnphy_int>;
+                       interrupt-parent = <&gpio7>;
+                       interrupts = <1 IRQ_TYPE_EDGE_FALLING>;
                };
        };
 };
 };
 
 &i2c1 {
-       pinctrl-names = "default";
+       pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c1>;
+       pinctrl-1 = <&pinctrl_i2c1_gpio>;
+       scl-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
+       sda-gpios = <&gpio3 28 GPIO_ACTIVE_HIGH>;
        clock-frequency = <400000>;
        status = "okay";
 
        ds1339: rtc@68 {
                compatible = "dallas,ds1339";
                reg = <0x68>;
+               trickle-resistor-ohms = <250>;
+               trickle-diode-disable;
        };
 };
 
 &i2c3 {
-       pinctrl-names = "default";
+       pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c3>;
+       pinctrl-1 = <&pinctrl_i2c3_gpio>;
+       scl-gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
+       sda-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
        clock-frequency = <400000>;
        status = "okay";
 
        sgtl5000: sgtl5000@0a {
                compatible = "fsl,sgtl5000";
+               #sound-dai-cells = <0>;
                reg = <0x0a>;
                VDDA-supply = <&reg_2v5>;
                VDDIO-supply = <&reg_3v3>;
 
        pinctrl_hog: hoggrp {
                fsl,pins = <
-                       MX6QDL_PAD_SD3_DAT2__GPIO7_IO06         0x1b0b1 /* ETN PHY RESET */
-                       MX6QDL_PAD_SD3_DAT4__GPIO7_IO01         0x1b0b1 /* ETN PHY INT */
                        MX6QDL_PAD_EIM_A25__GPIO5_IO02          0x1b0b1 /* PWR BTN */
                >;
        };
                >;
        };
 
+       pinctrl_etnphy_int: etnphy-intgrp {
+               fsl,pins = <
+                       MX6QDL_PAD_SD3_DAT4__GPIO7_IO01         0x1b0b1 /* ETN PHY INT */
+               >;
+       };
+
        pinctrl_etnphy_power: etnphy-pwrgrp {
                fsl,pins = <
                        MX6QDL_PAD_EIM_D20__GPIO3_IO20          0x1b0b1 /* ETN PHY POWER */
                >;
        };
 
+       pinctrl_etnphy_rst: etnphy-rstgrp {
+               fsl,pins = <
+                       MX6QDL_PAD_SD3_DAT2__GPIO7_IO06         0x1b0b1 /* ETN PHY RESET */
+               >;
+       };
+
        pinctrl_flexcan1: flexcan1grp {
                fsl,pins = <
                        MX6QDL_PAD_GPIO_7__FLEXCAN1_TX          0x1b0b0
                >;
        };
 
+       pinctrl_i2c1_gpio: i2c1-gpiogrp {
+               fsl,pins = <
+                       MX6QDL_PAD_EIM_D21__GPIO3_IO21          0x4001b8b1
+                       MX6QDL_PAD_EIM_D28__GPIO3_IO28          0x4001b8b1
+               >;
+       };
+
        pinctrl_i2c3: i2c3grp {
                fsl,pins = <
                        MX6QDL_PAD_GPIO_3__I2C3_SCL             0x4001b8b1
                >;
        };
 
+       pinctrl_i2c3_gpio: i2c3-gpiogrp {
+               fsl,pins = <
+                       MX6QDL_PAD_GPIO_3__GPIO1_IO03           0x4001b8b1
+                       MX6QDL_PAD_GPIO_6__GPIO1_IO06           0x4001b8b1
+               >;
+       };
+
        pinctrl_kpp: kppgrp {
                fsl,pins = <
                        MX6QDL_PAD_GPIO_9__KEY_COL6             0x1b0b1
diff --git a/arch/arm/boot/dts/imx6qp-tx6qp-8037-mb7.dts b/arch/arm/boot/dts/imx6qp-tx6qp-8037-mb7.dts
new file mode 100644 (file)
index 0000000..92b38e6
--- /dev/null
@@ -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 "imx6qp-tx6qp-8037.dts"
+#include "imx6qdl-tx6-mb7.dtsi"
+
+/ {
+       model = "Ka-Ro electronics TX6Q-8037 Module on MB7 baseboard";
+};
diff --git a/arch/arm/boot/dts/imx6qp-tx6qp-8037.dts b/arch/arm/boot/dts/imx6qp-tx6qp-8037.dts
new file mode 100644 (file)
index 0000000..06f387e
--- /dev/null
@@ -0,0 +1,86 @@
+/*
+ * 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 "imx6qp.dtsi"
+#include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lcd.dtsi"
+
+/ {
+       model = "Ka-Ro electronics TX6Q-8037 Module";
+       compatible = "karo,imx6qp-tx6qp", "fsl,imx6qp";
+};
+
+&ds1339 {
+       status = "disabled";
+};
+
+&gpmi {
+       status = "disabled";
+};
+
+&ipu2 {
+       status = "disabled";
+};
+
+&usdhc4 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usdhc4>;
+       bus-width = <4>;
+       non-removable;
+       no-1-8-v;
+       fsl,wp-controller;
+       status = "okay";
+};
+
+&iomuxc {
+       pinctrl_usdhc4: usdhc4grp {
+               fsl,pins = <
+                       MX6QDL_PAD_SD4_CMD__SD4_CMD             0x070b1
+                       MX6QDL_PAD_SD4_CLK__SD4_CLK             0x070b1
+                       MX6QDL_PAD_SD4_DAT0__SD4_DATA0          0x070b1
+                       MX6QDL_PAD_SD4_DAT1__SD4_DATA1          0x070b1
+                       MX6QDL_PAD_SD4_DAT2__SD4_DATA2          0x070b1
+                       MX6QDL_PAD_SD4_DAT3__SD4_DATA3          0x070b1
+                       MX6QDL_PAD_NANDF_ALE__SD4_RESET         0x0b0b1
+               >;
+       };
+};
diff --git a/arch/arm/boot/dts/imx6qp-tx6qp-8137-mb7.dts b/arch/arm/boot/dts/imx6qp-tx6qp-8137-mb7.dts
new file mode 100644 (file)
index 0000000..07ad707
--- /dev/null
@@ -0,0 +1,57 @@
+/*
+ * 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 "imx6qp-tx6qp-8137.dts"
+#include "imx6qdl-tx6-mb7.dtsi"
+
+/ {
+       model = "Ka-Ro electronics TX6Q-8137 Module on MB7 baseboard";
+       compatible = "karo,imx6qp-tx6qp", "fsl,imx6qp";
+};
+
+&ipu2 {
+       status = "disabled";
+};
+
+&sata {
+       status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6qp-tx6qp-8137.dts b/arch/arm/boot/dts/imx6qp-tx6qp-8137.dts
new file mode 100644 (file)
index 0000000..8fcc1ee
--- /dev/null
@@ -0,0 +1,90 @@
+/*
+ * 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 "imx6qp.dtsi"
+#include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lvds.dtsi"
+
+/ {
+       model = "Ka-Ro electronics TX6Q-8137 Module";
+       compatible = "karo,imx6qp-tx6qp", "fsl,imx6qp";
+};
+
+&ds1339 {
+       status = "disabled";
+};
+
+&gpmi {
+       status = "disabled";
+};
+
+&ipu2 {
+       status = "disabled";
+};
+
+&sata {
+       status = "okay";
+};
+
+&usdhc4 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usdhc4>;
+       bus-width = <4>;
+       non-removable;
+       no-1-8-v;
+       fsl,wp-controller;
+       status = "okay";
+};
+
+&iomuxc {
+       pinctrl_usdhc4: usdhc4grp {
+               fsl,pins = <
+                       MX6QDL_PAD_SD4_CMD__SD4_CMD             0x070b1
+                       MX6QDL_PAD_SD4_CLK__SD4_CLK             0x070b1
+                       MX6QDL_PAD_SD4_DAT0__SD4_DATA0          0x070b1
+                       MX6QDL_PAD_SD4_DAT1__SD4_DATA1          0x070b1
+                       MX6QDL_PAD_SD4_DAT2__SD4_DATA2          0x070b1
+                       MX6QDL_PAD_SD4_DAT3__SD4_DATA3          0x070b1
+                       MX6QDL_PAD_NANDF_ALE__SD4_RESET         0x0b0b1
+               >;
+       };
+};
index c6c18b82f8f4eade18561edb24439a9d4737efa5..c05cf874cbb8e0a8e2ccae9125c5c615d0bea582 100644 (file)
@@ -3993,10 +3993,13 @@ static void nand_manufacturer_detect(struct nand_chip *chip)
         * nand_decode_ext_id() otherwise.
         */
        if (chip->manufacturer.desc && chip->manufacturer.desc->ops &&
-           chip->manufacturer.desc->ops->detect)
+           chip->manufacturer.desc->ops->detect) {
+               /* The 3rd id byte holds MLC / multichip data */
+               chip->bits_per_cell = nand_get_bits_per_cell(chip->id.data[2]);
                chip->manufacturer.desc->ops->detect(chip);
-       else
+       } else {
                nand_decode_ext_id(chip);
+       }
 }
 
 /*
index 38c7b21e5d63faaeae25ad45715aecb5a3469578..4c2de04fe0aa87f46d7e4c065fa9530e8787bb43 100644 (file)
@@ -523,6 +523,11 @@ struct fec_enet_private {
 
        int     dev_id;
 
+       int     reset_gpio;
+       int     phy_reset_duration;
+       int     phy_post_delay;
+       int     reset_active_high;
+
        /* Phylib and MDIO interface */
        struct  mii_bus *mii_bus;
        int     mii_timeout;
index a6e323f1563745c3a0cedd91d240e05af6606f33..3c2cff8677044f7a8c2a51be1abca09c7f8d441b 100644 (file)
@@ -1836,6 +1836,8 @@ static int fec_enet_mdio_write(struct mii_bus *bus, int mii_id, int regnum,
        return ret;
 }
 
+static void fec_reset_phy(struct fec_enet_private *fep);
+
 static int fec_enet_clk_enable(struct net_device *ndev, bool enable)
 {
        struct fec_enet_private *fep = netdev_priv(ndev);
@@ -1846,9 +1848,13 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable)
                if (ret)
                        return ret;
 
-               ret = clk_prepare_enable(fep->clk_enet_out);
-               if (ret)
-                       goto failed_clk_enet_out;
+               if (fep->clk_enet_out) {
+                       ret = clk_prepare_enable(fep->clk_enet_out);
+                       if (ret)
+                               goto failed_clk_enet_out;
+
+                       fec_reset_phy(fep);
+               }
 
                if (fep->clk_ptp) {
                        mutex_lock(&fep->ptp_clk_mutex);
@@ -3213,67 +3219,90 @@ static int fec_enet_init(struct net_device *ndev)
 }
 
 #ifdef CONFIG_OF
-static int fec_reset_phy(struct platform_device *pdev)
+static void fec_reset_phy(struct fec_enet_private *fep)
 {
-       int err, phy_reset;
-       bool active_high = false;
-       int msec = 1, phy_post_delay = 0;
-       struct device_node *np = pdev->dev.of_node;
+       if (!gpio_is_valid(fep->reset_gpio))
+               return;
 
-       if (!np)
-               return 0;
+       gpio_set_value_cansleep(fep->reset_gpio, fep->reset_active_high);
 
-       err = of_property_read_u32(np, "phy-reset-duration", &msec);
-       /* A sane reset duration should not be longer than 1s */
-       if (!err && msec > 1000)
-               msec = 1;
+       if (fep->phy_reset_duration > 20)
+               msleep(fep->phy_reset_duration);
+       else
+               usleep_range(fep->phy_reset_duration * 1000,
+                            fep->phy_reset_duration * 1000 + 1000);
 
-       phy_reset = of_get_named_gpio(np, "phy-reset-gpios", 0);
-       if (phy_reset == -EPROBE_DEFER)
-               return phy_reset;
-       else if (!gpio_is_valid(phy_reset))
-               return 0;
+       gpio_set_value_cansleep(fep->reset_gpio, !fep->reset_active_high);
 
-       err = of_property_read_u32(np, "phy-reset-post-delay", &phy_post_delay);
-       /* valid reset duration should be less than 1s */
-       if (!err && phy_post_delay > 1000)
-               return -EINVAL;
+       if (!fep->phy_post_delay)
+               return;
+       if (fep->phy_post_delay > 20)
+               msleep(fep->phy_post_delay);
+       else
+               usleep_range(fep->phy_post_delay * 1000,
+                            fep->phy_post_delay * 1000 + 1000);
+}
 
-       active_high = of_property_read_bool(np, "phy-reset-active-high");
+static int fec_get_reset_gpio(struct platform_device *pdev)
+{
+       int err;
+       struct device_node *np = pdev->dev.of_node;
+       struct net_device *ndev = platform_get_drvdata(pdev);
+       struct fec_enet_private *fep = netdev_priv(ndev);
+
+       /* Most DT files do not specify the correct polarity
+        * of the phy-reset GPIO.
+        * So use this special property to signal the actual
+        * signal polarity.
+        */
+       fep->reset_gpio = of_get_named_gpio(np, "phy-reset-gpios", 0);
+       if (fep->reset_gpio == -EPROBE_DEFER)
+               return -EPROBE_DEFER;
+       if (!gpio_is_valid(fep->reset_gpio))
+               return 0;
 
-       err = devm_gpio_request_one(&pdev->dev, phy_reset,
-                       active_high ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW,
-                       "phy-reset");
+       fep->reset_active_high = of_property_read_bool(np,
+                                                      "phy-reset-active-high");
+
+       err = devm_gpio_request_one(&pdev->dev, fep->reset_gpio,
+                                   fep->reset_active_high ?
+                                   GPIOF_OUT_INIT_LOW : GPIOF_OUT_INIT_HIGH,
+                                   "phy-reset");
        if (err) {
                dev_err(&pdev->dev, "failed to get phy-reset-gpios: %d\n", err);
                return err;
        }
 
-       if (msec > 20)
-               msleep(msec);
-       else
-               usleep_range(msec * 1000, msec * 1000 + 1000);
-
-       gpio_set_value_cansleep(phy_reset, !active_high);
-
-       if (!phy_post_delay)
-               return 0;
+       err = of_property_read_u32(np, "phy-reset-duration",
+                                  &fep->phy_reset_duration);
+       /* A sane reset duration should not be longer than 1s */
+       if (err || fep->phy_reset_duration > 1000)
+               fep->phy_reset_duration = 1;
 
-       if (phy_post_delay > 20)
-               msleep(phy_post_delay);
-       else
-               usleep_range(phy_post_delay * 1000,
-                            phy_post_delay * 1000 + 1000);
+       err = of_property_read_u32(np, "phy-reset-post-delay",
+                                  &fep->phy_post_delay);
+       /* valid post reset delay should be less than 1s */
+       if (err)
+               fep->phy_post_delay = 0;
+       else if (fep->phy_post_delay > 1000)
+               return -EINVAL;
 
        return 0;
 }
 #else /* CONFIG_OF */
-static int fec_reset_phy(struct platform_device *pdev)
+/* In case of platform probe, the reset has been done
+ * by machine code.
+ */
+static inline void fec_reset_phy(struct fec_enet_private *fep)
 {
-       /*
-        * In case of platform probe, the reset has been done
-        * by machine code.
-        */
+}
+
+static int fec_get_reset_gpio(struct platform_device *pdev)
+{
+       struct net_device *ndev = platform_get_drvdata(pdev);
+       struct fec_enet_private *fep = netdev_priv(ndev);
+
+       fep->reset_gpio = -EINVAL;
        return 0;
 }
 #endif /* CONFIG_OF */
@@ -3294,19 +3323,16 @@ fec_enet_get_queue_num(struct platform_device *pdev, int *num_tx, int *num_rx)
        of_property_read_u32(np, "fsl,num-rx-queues", num_rx);
 
        if (*num_tx < 1 || *num_tx > FEC_ENET_MAX_TX_QS) {
-               dev_warn(&pdev->dev, "Invalid num_tx(=%d), fall back to 1\n",
+               dev_warn(&pdev->dev, "Invalid fsl,num-tx-queues value %d; fall back to 1\n",
                         *num_tx);
                *num_tx = 1;
-               return;
        }
 
        if (*num_rx < 1 || *num_rx > FEC_ENET_MAX_RX_QS) {
-               dev_warn(&pdev->dev, "Invalid num_rx(=%d), fall back to 1\n",
+               dev_warn(&pdev->dev, "Invalid fsl,num-rx-queues value %d; fall back to 1\n",
                         *num_rx);
                *num_rx = 1;
-               return;
        }
-
 }
 
 static int
@@ -3458,9 +3484,10 @@ fec_probe(struct platform_device *pdev)
        pm_runtime_set_active(&pdev->dev);
        pm_runtime_enable(&pdev->dev);
 
-       ret = fec_reset_phy(pdev);
+       ret = fec_get_reset_gpio(pdev);
        if (ret)
                goto failed_reset;
+       fec_reset_phy(fep);
 
        if (fep->bufdesc_ex)
                fec_ptp_init(pdev);
index 002f1ce22bd02032062924b19d645ebc25302c93..9578f6516c65a5b0d88e1c163c4053e0cfa0366e 100644 (file)
@@ -23,6 +23,7 @@
 #include <linux/pwm_backlight.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
+#include <linux/delay.h>
 
 struct pwm_bl_data {
        struct pwm_device       *pwm;
@@ -35,6 +36,7 @@ struct pwm_bl_data {
        struct gpio_desc        *enable_gpio;
        unsigned int            scale;
        bool                    legacy;
+       int                     turn_on_delay_ms;
        int                     (*notify)(struct device *,
                                          int brightness);
        void                    (*notify_after)(struct device *,
@@ -50,6 +52,19 @@ static void pwm_backlight_power_on(struct pwm_bl_data *pb, int brightness)
        if (pb->enabled)
                return;
 
+       pwm_enable(pb->pwm);
+
+       if (pb->turn_on_delay_ms > 0) {
+               dev_dbg(pb->dev, "Sleeping %u..%uµs\n",
+                       pb->turn_on_delay_ms * 1000,
+                       pb->turn_on_delay_ms * 1100);
+               if (pb->turn_on_delay_ms > 20)
+                       msleep(pb->turn_on_delay_ms);
+               else
+                       usleep_range(pb->turn_on_delay_ms * 1000,
+                            pb->turn_on_delay_ms * 1100);
+       }
+
        err = regulator_enable(pb->power_supply);
        if (err < 0)
                dev_err(pb->dev, "failed to enable power supply\n");
@@ -57,7 +72,6 @@ static void pwm_backlight_power_on(struct pwm_bl_data *pb, int brightness)
        if (pb->enable_gpio)
                gpiod_set_value_cansleep(pb->enable_gpio, 1);
 
-       pwm_enable(pb->pwm);
        pb->enabled = true;
 }
 
@@ -107,8 +121,9 @@ static int pwm_backlight_update_status(struct backlight_device *bl)
                duty_cycle = compute_duty_cycle(pb, brightness);
                pwm_config(pb->pwm, duty_cycle, pb->period);
                pwm_backlight_power_on(pb, brightness);
-       } else
+       } else {
                pwm_backlight_power_off(pb);
+       }
 
        if (pb->notify_after)
                pb->notify_after(pb->dev, brightness);
@@ -263,9 +278,9 @@ static int pwm_backlight_probe(struct platform_device *pdev)
                                pb->scale = data->levels[i];
 
                pb->levels = data->levels;
-       } else
+       } else {
                pb->scale = data->max_brightness;
-
+       }
        pb->notify = data->notify;
        pb->notify_after = data->notify_after;
        pb->check_fb = data->check_fb;
@@ -328,6 +343,8 @@ static int pwm_backlight_probe(struct platform_device *pdev)
                goto err_alloc;
        }
 
+       of_property_read_u32(node, "turn-on-delay-ms", &pb->turn_on_delay_ms);
+
        dev_dbg(&pdev->dev, "got pwm for backlight\n");
 
        /*
index 5216d2eb22891010187b86a5911a10b17aedf273..14761eb01e560100ad19d6e1648632da8e56a782 100644 (file)
@@ -1246,6 +1246,8 @@ int onfi_init_data_interface(struct nand_chip *chip,
  */
 static inline bool nand_is_slc(struct nand_chip *chip)
 {
+       WARN(chip->bits_per_cell == 0,
+            "chip->bits_per_cell is used uninitialized\n");
        return chip->bits_per_cell == 1;
 }