arm: dts: tx6: remove obsolete regulator-boot-on properties

[karo-tx-linux.git] / arch / arm / boot / dts / imx6qdl-tx6.dtsi

diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
index a641858215012d357904396c668e5470d0555a93..7db8e028f97f8566dcbb77ae8fc5bd9486131075 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
@@ -9,10 +9,12 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
+#include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 
 / {
        aliases {
+               can0 = &can2;
                can1 = &can1;
                display = &display;
                ethernet0 = &fec;
@@ -20,12 +22,13 @@
                lcdif_24bit_pins_a = &tx6_pinctrl_disp0_2;
                lvds0 = &lvds0;
                lvds1 = &lvds1;
+               pwm0 = &pwm1;
+               pwm1 = &pwm2;
+               reg_can_xcvr = &reg_can_xcvr;
                stk5led = &user_led;
                usbotg = &usbotg;
-       };
-
-       chosen {
-               bootargs = "init=/linuxrc console=ttymxc0,115200 root=/dev/mtdblock3 rootfstype=jffs2 ro debug panic=1";
+               sdhc0 = &usdhc1;
+               sdhc1 = &usdhc2;
        };
 
        memory {
@@ -43,25 +46,25 @@
                };
        };
 
-       backlight@0 {
+       backlight: backlight@0 {
                compatible = "pwm-backlight";
                pwms = <&pwm2 0 500000>;
                power-supply = <&reg_3v3>;
                /*
-                * a poor man's way to create a 1:1 relationship between
-                * the PWM value and the actual duty cycle
+                * a poor man's way to create an inverse 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>;
+               brightness-levels = <100
+                                     99 98 97 96 95 94 93 92 91 90
+                                     89 88 87 86 85 84 83 82 81 80
+                                     79 78 77 76 75 74 73 72 71 70
+                                     69 68 67 66 65 64 63 62 61 60
+                                     59 58 57 56 55 54 53 52 51 50
+                                     49 48 47 46 45 44 43 42 41 40
+                                     39 38 37 36 35 34 33 32 31 30
+                                     29 28 27 26 25 24 23 22 21 20
+                                     19 18 17 16 15 14 13 12 11 10
+                                      9  8  7  6  5  4  3  2  1  0>;
                default-brightness-level = <50>;
        };
 
@@ -217,7 +220,7 @@
                power {
                        label = "Power Button";
                        gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>;
-                       linux,code = <116>; /* KEY_POWER */
+                       linux,code = <KEY_POWER>;
                        gpio-key,wakeup;
                };
        };
@@ -234,9 +237,12 @@
 
        regulators {
                compatible = "simple-bus";
+               #address-cells = <1>;
+               #size-cells = <0>;
 
-               reg_3v3_etn: 3v3-etn {
+               reg_3v3_etn: regulator@0 {
                        compatible = "regulator-fixed";
+                       reg = <0>;
                        regulator-name = "3V3_ETN";
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
@@ -244,24 +250,27 @@
                        enable-active-high;
                };
 
-               reg_2v5: 2v5 {
+               reg_2v5: regulator@1 {
                        compatible = "regulator-fixed";
+                       reg = <1>;
                        regulator-name = "2V5";
                        regulator-min-microvolt = <2500000>;
                        regulator-max-microvolt = <2500000>;
                        regulator-always-on;
                };
 
-               reg_3v3: 3v3 {
+               reg_3v3: regulator@2 {
                        compatible = "regulator-fixed";
+                       reg = <2>;
                        regulator-name = "3V3";
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
                        regulator-always-on;
                };
 
-               reg_can_xcvr: can-xcvr {
+               reg_can_xcvr: regulator@3 {
                        compatible = "regulator-fixed";
+                       reg = <3>;
                        regulator-name = "CAN XCVR";
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
@@ -271,28 +280,29 @@
                        pinctrl-0 = <&pinctrl_tx6qdl_flexcan_xcvr>;
                };
 
-               reg_lcd_pwr0: lcd-power@0 {
+               reg_lcd_pwr0: regulator@4 {
                        compatible = "regulator-fixed";
-                       regulator-name = "LCD POWER";
+                       reg = <4>;
+                       regulator-name = "LCD0 POWER";
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
                        gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>;
                        enable-active-high;
-                       regulator-boot-on;
                };
 
-               reg_lcd_pwr1: lcd-power@1 {
+               reg_lcd_pwr1: regulator@5 {
                        compatible = "regulator-fixed";
-                       regulator-name = "LCD POWER";
+                       reg = <5>;
+                       regulator-name = "LCD1 POWER";
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
                        gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>;
                        enable-active-high;
-                       regulator-boot-on;
                };
 
-               reg_lcd_reset: lcd-reset {
+               reg_lcd_reset: regulator@6 {
                        compatible = "regulator-fixed";
+                       reg = <6>;
                        regulator-name = "LCD RESET";
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
@@ -300,11 +310,11 @@
                        startup-delay-us = <300000>;
                        enable-active-high;
                        regulator-always-on;
-                       regulator-boot-on;
                };
 
-               reg_usbh1_vbus: usbh1_vbus {
+               reg_usbh1_vbus: regulator@7 {
                        compatible = "regulator-fixed";
+                       reg = <7>;
                        regulator-name = "usbh1_vbus";
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
@@ -312,8 +322,9 @@
                        enable-active-high;
                };
 
-               reg_usbotg_vbus: usbotg_vbus {
+               reg_usbotg_vbus: regulator@8 {
                        compatible = "regulator-fixed";
+                       reg = <8>;
                        regulator-name = "usbotg_vbus";
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;