Merge tag 'imx-dt-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx53-tx53-x13x.dts

diff --git a/arch/arm/boot/dts/imx53-tx53-x13x.dts b/arch/arm/boot/dts/imx53-tx53-x13x.dts
index be31c5d1db051d99d914f5617bcfa7a9ee9f9af2..f2b2ad3ce9e52d6084c31f8983dcf21108079159 100644 (file)
--- a/arch/arm/boot/dts/imx53-tx53-x13x.dts
+++ b/arch/arm/boot/dts/imx53-tx53-x13x.dts
@@ -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:
@@ -63,51 +99,33 @@
                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@4 {
-               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@a {
@@ -117,28 +135,10 @@
                VDDIO-supply = <&reg_3v3>;
                clocks = <&mclk>;
        };
-
-       touchscreen1: eeti@4 {
-               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