Merge remote-tracking branch 'omap/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2016 22:14:23 +0000 (08:14 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2016 22:14:23 +0000 (08:14 +1000)
89 files changed:
Documentation/devicetree/bindings/arm/omap/omap.txt
arch/arm/boot/dts/am335x-baltos.dtsi
arch/arm/boot/dts/am335x-base0033.dts
arch/arm/boot/dts/am335x-bone-common.dtsi
arch/arm/boot/dts/am335x-chilisom.dtsi
arch/arm/boot/dts/am335x-cm-t335.dts
arch/arm/boot/dts/am335x-evm.dts
arch/arm/boot/dts/am335x-evmsk.dts
arch/arm/boot/dts/am335x-icev2.dts
arch/arm/boot/dts/am335x-igep0033.dtsi
arch/arm/boot/dts/am335x-lxm.dts
arch/arm/boot/dts/am335x-nano.dts
arch/arm/boot/dts/am335x-pepper.dts
arch/arm/boot/dts/am335x-phycore-som.dtsi
arch/arm/boot/dts/am335x-shc.dts
arch/arm/boot/dts/am335x-sl50.dts
arch/arm/boot/dts/am335x-wega.dtsi
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/am3517-craneboard.dts
arch/arm/boot/dts/am3517-evm.dts
arch/arm/boot/dts/am3517.dtsi
arch/arm/boot/dts/am3517_mt_ventoux.dts
arch/arm/boot/dts/am4372.dtsi
arch/arm/boot/dts/am437x-cm-t43.dts
arch/arm/boot/dts/am437x-gp-evm.dts
arch/arm/boot/dts/am437x-idk-evm.dts
arch/arm/boot/dts/am437x-sk-evm.dts
arch/arm/boot/dts/am43x-epos-evm.dts
arch/arm/boot/dts/am572x-idk.dts
arch/arm/boot/dts/am57xx-beagle-x15.dts
arch/arm/boot/dts/am57xx-cl-som-am57x.dts
arch/arm/boot/dts/am57xx-idk-common.dtsi
arch/arm/boot/dts/da850-evm.dts
arch/arm/boot/dts/dm8148-evm.dts
arch/arm/boot/dts/dm8148-t410.dts
arch/arm/boot/dts/dm814x.dtsi
arch/arm/boot/dts/dm8168-evm.dts
arch/arm/boot/dts/dm816x.dtsi
arch/arm/boot/dts/dra62x-j5eco-evm.dts
arch/arm/boot/dts/dra7-evm.dts
arch/arm/boot/dts/dra7.dtsi
arch/arm/boot/dts/dra72-evm-common.dtsi
arch/arm/boot/dts/dra72-evm-revc.dts
arch/arm/boot/dts/dra72-evm.dts
arch/arm/boot/dts/dra7xx-clocks.dtsi
arch/arm/boot/dts/logicpd-torpedo-som.dtsi
arch/arm/boot/dts/omap2.dtsi
arch/arm/boot/dts/omap2420-h4.dts
arch/arm/boot/dts/omap2420-n8x0-common.dtsi
arch/arm/boot/dts/omap2430-sdp.dts
arch/arm/boot/dts/omap3-beagle-xm.dts
arch/arm/boot/dts/omap3-beagle.dts
arch/arm/boot/dts/omap3-cm-t3x.dtsi
arch/arm/boot/dts/omap3-devkit8000-common.dtsi
arch/arm/boot/dts/omap3-evm-37xx.dts
arch/arm/boot/dts/omap3-evm.dts
arch/arm/boot/dts/omap3-gta04.dtsi
arch/arm/boot/dts/omap3-igep.dtsi
arch/arm/boot/dts/omap3-ldp.dts
arch/arm/boot/dts/omap3-lilly-a83x.dtsi
arch/arm/boot/dts/omap3-n900.dts
arch/arm/boot/dts/omap3-n950-n9.dtsi
arch/arm/boot/dts/omap3-overo-alto35-common.dtsi
arch/arm/boot/dts/omap3-overo-base.dtsi
arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi
arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi
arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi
arch/arm/boot/dts/omap3-overo-palo35-common.dtsi
arch/arm/boot/dts/omap3-overo-palo43-common.dtsi
arch/arm/boot/dts/omap3-pandora-common.dtsi
arch/arm/boot/dts/omap3-sniper.dts
arch/arm/boot/dts/omap3-tao3530.dtsi
arch/arm/boot/dts/omap3-zoom3.dts
arch/arm/boot/dts/omap3.dtsi
arch/arm/boot/dts/omap3430-sdp.dts
arch/arm/boot/dts/omap34xx.dtsi
arch/arm/boot/dts/omap36xx.dtsi
arch/arm/boot/dts/omap4-duovero-parlor.dts
arch/arm/boot/dts/omap4-duovero.dtsi
arch/arm/boot/dts/omap4-kc1.dts
arch/arm/boot/dts/omap4-panda-common.dtsi
arch/arm/boot/dts/omap4-sdp.dts
arch/arm/boot/dts/omap4-var-som-om44.dtsi
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5-board-common.dtsi
arch/arm/boot/dts/omap5-cm-t54.dts
arch/arm/boot/dts/omap5-igep0050.dts
arch/arm/boot/dts/omap5-uevm.dts
arch/arm/boot/dts/omap5.dtsi

index 94b57f247615d6a999da8762a2205ee9b39bfb0a..f53e2ee65e35f059ba2c4efa27fc69c952a464b2 100644 (file)
@@ -180,3 +180,9 @@ Boards:
 
 - DRA722 EVM: Software Development Board for DRA722
   compatible = "ti,dra72-evm", "ti,dra722", "ti,dra72", "ti,dra7"
+
+- DM3730 Logic PD Torpedo + Wireless: Commercial System on Module with WiFi and Bluetooth
+  compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3630", "ti,omap3"
+
+- DM3730 Logic PD SOM-LV: Commercial System on Module with WiFi and Bluetooth
+  compatible = "logicpd,dm3730-som-lv-devkit", "ti,omap3630", "ti,omap3"
index b689172632efbb48516201b7814fbbc68d925b19..dd45d172a892a12dcc7947e1caaddcca547d0862 100644 (file)
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
 
-       vbat: fixedregulator@0 {
+       vbat: fixedregulator0 {
                compatible = "regulator-fixed";
                regulator-name = "vbat";
                regulator-min-microvolt = <5000000>;
@@ -37,7 +37,7 @@
                regulator-boot-on;
        };
 
-       wl12xx_vmmc: fixedregulator@2 {
+       wl12xx_vmmc: fixedregulator2 {
                pinctrl-names = "default";
                pinctrl-0 = <&wl12xx_gpio>;
                compatible = "regulator-fixed";
index 58a05f7d0b7cbc4fdd32879dfb9e900f7ad72dbb..c2bee452dab820c714f6fb119be756765bb2e6a8 100644 (file)
 
                compatible = "gpio-leds";
 
-               led@0 {
+               led0 {
                        label = "base:red:user";
                        gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;   /* gpio1_21 */
                        default-state = "off";
                };
 
-               led@1 {
+               led1 {
                        label = "base:green:user";
                        gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>;    /* gpio2_0 */
                        default-state = "off";
index e247c15e517606c7d8e0237c4de1794e499fd680..007b5e5a51a9fc83c3ffcbc955ba8b9b50c4ff4b 100644 (file)
@@ -13,7 +13,7 @@
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
 
                compatible = "gpio-leds";
 
-               led@2 {
+               led2 {
                        label = "beaglebone:green:heartbeat";
                        gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";
                        default-state = "off";
                };
 
-               led@3 {
+               led3 {
                        label = "beaglebone:green:mmc0";
                        gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "mmc0";
                        default-state = "off";
                };
 
-               led@4 {
+               led4 {
                        label = "beaglebone:green:usr2";
                        gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "cpu0";
                        default-state = "off";
                };
 
-               led@5 {
+               led5 {
                        label = "beaglebone:green:usr3";
                        gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "mmc1";
@@ -57,7 +57,7 @@
                };
        };
 
-       vmmcsd_fixed: fixedregulator@0 {
+       vmmcsd_fixed: fixedregulator0 {
                compatible = "regulator-fixed";
                regulator-name = "vmmcsd_fixed";
                regulator-min-microvolt = <3300000>;
index 1d647358f1c1b83b6b5c42f3e7ff7a02ab5a9258..f9ee5859c154ade0b5858ad97373277389b2b31a 100644 (file)
@@ -19,7 +19,7 @@
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x20000000>; /* 512 MB */
        };
index 817b1dec0683d0c3513b2e283013f20758fa2764..947c81b7aaafbf4b79bcdb84cb8490f5a430b9a9 100644 (file)
@@ -17,7 +17,7 @@
        model = "CompuLab CM-T335";
        compatible = "compulab,cm-t335", "ti,am33xx";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x8000000>;   /* 128 MB */
        };
@@ -26,7 +26,7 @@
                compatible = "gpio-leds";
                pinctrl-names = "default";
                pinctrl-0 = <&gpio_led_pins>;
-               led@0 {
+               led0 {
                        label = "cm_t335:green";
                        gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;     /* gpio2_0 */
                        linux,default-trigger = "heartbeat";
@@ -34,7 +34,7 @@
        };
 
        /* regulator for mmc */
-       vmmc_fixed: fixedregulator@0 {
+       vmmc_fixed: fixedregulator0 {
                compatible = "regulator-fixed";
                regulator-name = "vmmc_fixed";
                regulator-min-microvolt = <3300000>;
@@ -42,7 +42,7 @@
        };
 
        /* Regulator for WiFi */
-       vwlan_fixed: fixedregulator@2 {
+       vwlan_fixed: fixedregulator2 {
                compatible = "regulator-fixed";
                regulator-name = "vwlan_fixed";
                gpio = <&gpio0 20 GPIO_ACTIVE_HIGH>; /* gpio0_20 */
index 5d28712ad253db017eef5d24f50479c47b6ae766..3cf896a2a204ffaf9006a412b5fc646b4c172b77 100644 (file)
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
 
-       vbat: fixedregulator@0 {
+       vbat: fixedregulator0 {
                compatible = "regulator-fixed";
                regulator-name = "vbat";
                regulator-min-microvolt = <5000000>;
                regulator-boot-on;
        };
 
-       lis3_reg: fixedregulator@1 {
+       lis3_reg: fixedregulator1 {
                compatible = "regulator-fixed";
                regulator-name = "lis3_reg";
                regulator-boot-on;
        };
 
-       wlan_en_reg: fixedregulator@2 {
+       wlan_en_reg: fixedregulator2 {
                compatible = "regulator-fixed";
                regulator-name = "wlan-en-regulator";
                regulator-min-microvolt = <1800000>;
@@ -53,7 +53,7 @@
                enable-active-high;
        };
 
-       matrix_keypad: matrix_keypad@0 {
+       matrix_keypad: matrix_keypad0 {
                compatible = "gpio-matrix-keypad";
                debounce-delay-ms = <5>;
                col-scan-delay-us = <2>;
                                0x0201006c>;    /* DOWN */
        };
 
-       gpio_keys: volume_keys@0 {
+       gpio_keys: volume_keys0 {
                compatible = "gpio-keys";
                #address-cells = <1>;
                #size-cells = <0>;
                autorepeat;
 
-               switch@9 {
+               switch9 {
                        label = "volume-up";
                        linux,code = <115>;
                        gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
                        wakeup-source;
                };
 
-               switch@10 {
+               switch10 {
                        label = "volume-down";
                        linux,code = <114>;
                        gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
index 09308d66645b477b407d970922a998c697f8419a..0e5e8dcdcc24df6865a2ece40747c1a53470098e 100644 (file)
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
 
-       vbat: fixedregulator@0 {
+       vbat: fixedregulator0 {
                compatible = "regulator-fixed";
                regulator-name = "vbat";
                regulator-min-microvolt = <5000000>;
                regulator-boot-on;
        };
 
-       lis3_reg: fixedregulator@1 {
+       lis3_reg: fixedregulator1 {
                compatible = "regulator-fixed";
                regulator-name = "lis3_reg";
                regulator-boot-on;
        };
 
-       wl12xx_vmmc: fixedregulator@2 {
+       wl12xx_vmmc: fixedregulator2 {
                pinctrl-names = "default";
                pinctrl-0 = <&wl12xx_gpio>;
                compatible = "regulator-fixed";
@@ -58,7 +58,7 @@
                enable-active-high;
        };
 
-       vtt_fixed: fixedregulator@3 {
+       vtt_fixed: fixedregulator3 {
                compatible = "regulator-fixed";
                regulator-name = "vtt";
                regulator-min-microvolt = <1500000>;
 
                compatible = "gpio-leds";
 
-               led@1 {
+               led1 {
                        label = "evmsk:green:usr0";
                        gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@2 {
+               led2 {
                        label = "evmsk:green:usr1";
                        gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@3 {
+               led3 {
                        label = "evmsk:green:mmc0";
                        gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "mmc0";
                        default-state = "off";
                };
 
-               led@4 {
+               led4 {
                        label = "evmsk:green:heartbeat";
                        gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";
                };
        };
 
-       gpio_buttons: gpio_buttons@0 {
+       gpio_buttons: gpio_buttons0 {
                compatible = "gpio-keys";
                #address-cells = <1>;
                #size-cells = <0>;
 
-               switch@1 {
+               switch1 {
                        label = "button0";
                        linux,code = <0x100>;
                        gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;
                };
 
-               switch@2 {
+               switch2 {
                        label = "button1";
                        linux,code = <0x101>;
                        gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
                };
 
-               switch@3 {
+               switch3 {
                        label = "button2";
                        linux,code = <0x102>;
                        gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;
                        wakeup-source;
                };
 
-               switch@4 {
+               switch4 {
                        label = "button3";
                        linux,code = <0x103>;
                        gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>;
index 7d8b8fefdf08c470a1f8bca049144bc6e80bb5c4..85e04c2055428cca407afd7b46061c12d251b915 100644 (file)
        model = "TI AM3359 ICE-V2";
        compatible = "ti,am3359-icev2", "ti,am33xx";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
 
-       vbat: fixedregulator@0 {
+       vbat: fixedregulator0 {
                compatible = "regulator-fixed";
                regulator-name = "vbat";
                regulator-min-microvolt = <5000000>;
@@ -32,7 +32,7 @@
                regulator-boot-on;
        };
 
-       vtt_fixed: fixedregulator@1 {
+       vtt_fixed: fixedregulator1 {
                compatible = "regulator-fixed";
                regulator-name = "vtt";
                regulator-min-microvolt = <1500000>;
                enable-active-high;
        };
 
-       leds@0 {
+       leds0 {
                compatible = "gpio-leds";
 
-               led@0 {
+               led0 {
                        label = "out0";
                        gpios = <&tpic2810 0 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@1 {
+               led1 {
                        label = "out1";
                        gpios = <&tpic2810 1 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@2 {
+               led2 {
                        label = "out2";
                        gpios = <&tpic2810 2 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@3 {
+               led3 {
                        label = "out3";
                        gpios = <&tpic2810 3 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@4 {
+               led4 {
                        label = "out4";
                        gpios = <&tpic2810 4 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@5 {
+               led5 {
                        label = "out5";
                        gpios = <&tpic2810 5 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@6 {
+               led6 {
                        label = "out6";
                        gpios = <&tpic2810 6 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@7 {
+               led7 {
                        label = "out7";
                        gpios = <&tpic2810 7 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
        };
 
        /* Tricolor status LEDs */
-       leds@1 {
+       leds1 {
                compatible = "gpio-leds";
                pinctrl-names = "default";
                pinctrl-0 = <&user_leds>;
 
-               led@0 {
+               led0 {
                        label = "status0:red:cpu0";
                        gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                        linux,default-trigger = "cpu0";
                };
 
-               led@1 {
+               led1 {
                        label = "status0:green:usr";
                        gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@2 {
+               led2 {
                        label = "status0:yellow:usr";
                        gpios = <&gpio3 9 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@3 {
+               led3 {
                        label = "status1:red:mmc0";
                        gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                        linux,default-trigger = "mmc0";
                };
 
-               led@4 {
+               led4 {
                        label = "status1:green:usr";
                        gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@5 {
+               led5 {
                        label = "status1:yellow:usr";
                        gpios = <&gpio0 19 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
        };
+       gpio-decoder {
+               compatible = "gpio-decoder";
+               gpios = <&pca9536 3 GPIO_ACTIVE_HIGH>,
+                       <&pca9536 2 GPIO_ACTIVE_HIGH>,
+                       <&pca9536 1 GPIO_ACTIVE_HIGH>,
+                       <&pca9536 0 GPIO_ACTIVE_HIGH>;
+               linux,axis = <0>; /* ABS_X */
+               decoder-max-value = <9>;
+       };
 };
 
 &am33xx_pinmux {
index e7d9ca1305faef3854ba7efb4da9efc20346c7ce..a5769a8f5fc81b001140ee08c2a379ed7db11613 100644 (file)
@@ -20,7 +20,7 @@
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
 
                compatible = "gpio-leds";
 
-               led@0 {
+               led0 {
                        label = "com:green:user";
                        gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
        };
 
-       vbat: fixedregulator@0 {
+       vbat: fixedregulator0 {
                compatible = "regulator-fixed";
                regulator-name = "vbat";
                regulator-min-microvolt = <5000000>;
@@ -46,7 +46,7 @@
                regulator-boot-on;
        };
 
-       vmmc: fixedregulator@0 {
+       vmmc: fixedregulator1 {
                compatible = "regulator-fixed";
                regulator-name = "vmmc";
                regulator-min-microvolt = <3300000>;
index d97b0efa43f358de8385bb52bf8b02b1ef48dc98..1d6c6fa703e4e36c7e2852038472a9cab7885042 100644 (file)
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x20000000>; /* 512 MB */
        };
 
        /* Power supply provides a fixed 5V @2A */
-       vbat: fixedregulator@0 {
+       vbat: fixedregulator0 {
                compatible = "regulator-fixed";
                regulator-name = "vbat";
                regulator-min-microvolt = <5000000>;
@@ -34,7 +34,7 @@
        };
 
        /* Power supply provides a fixed 3.3V @3A */
-       vmmcsd_fixed: fixedregulator@1 {
+       vmmcsd_fixed: fixedregulator1 {
                compatible = "regulator-fixed";
                regulator-name = "vmmcsd_fixed";
                regulator-min-microvolt = <3300000>;
index f313999c503e1df2add311257af95594d51e464e..483d585c89084ca305f11e5015fade982e14dbc8 100644 (file)
@@ -19,7 +19,7 @@
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
@@ -27,7 +27,7 @@
        leds {
                compatible = "gpio-leds";
 
-               led@0 {
+               led0 {
                        label = "nanobone:green:usr1";
                        gpios = <&gpio1 5 0>;
                        default-state = "off";
index 8867aaaec54d565de7f147af80e2e1cb6c4b2967..30e2f8770aaf846431ebbc798fb12927985ddd80 100644 (file)
@@ -20,7 +20,7 @@
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x20000000>; /* 512 MB */
        };
                compatible = "ti,da830-evm-audio";
        };
 
-       vbat: fixedregulator@0 {
+       vbat: fixedregulator0 {
                compatible = "regulator-fixed";
        };
 
-       v3v3c_reg: fixedregulator@1 {
+       v3v3c_reg: fixedregulator1 {
                compatible = "regulator-fixed";
        };
 
-       vdd5_reg: fixedregulator@2 {
+       vdd5_reg: fixedregulator2 {
                compatible = "regulator-fixed";
        };
 };
        pinctrl-names = "default";
        pinctrl-0 = <&user_leds_pins>;
 
-       led@0 {
+       led0 {
                label = "pepper:user0:blue";
                gpios = <&gpio1 20 GPIO_ACTIVE_HIGH>;
                linux,default-trigger = "none";
                default-state = "off";
        };
 
-       led@1 {
+       led1 {
                label = "pepper:user1:red";
                gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
                linux,default-trigger = "none";
        #address-cells = <1>;
        #size-cells = <0>;
 
-       button@0 {
+       button0 {
                label = "home";
                linux,code = <KEY_HOME>;
                gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
                wakeup-source;
        };
 
-       button@1 {
+       button1 {
                label = "menu";
                linux,code = <KEY_MENU>;
                gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;
                wakeup-source;
        };
 
-       buttons@2 {
+       buttons2 {
                label = "power";
                linux,code = <KEY_POWER>;
                gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
index 1263c9d4cba3b5644800dcdc2c172077a83cdfe2..75e24add3f13551500ddd27b47793ff703b866d0 100644 (file)
@@ -25,7 +25,7 @@
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
@@ -33,7 +33,7 @@
        regulators {
                compatible = "simple-bus";
 
-               vcc5v: fixedregulator@0 {
+               vcc5v: fixedregulator0 {
                        compatible = "regulator-fixed";
                        regulator-name = "vcc5v";
                        regulator-min-microvolt = <5000000>;
index 837d5b80ea1dcc5cbb92b3a0b9701927d04d0cac..bf8727a19ece554917920241f83c8c26b5f09a33 100644 (file)
 
                compatible = "gpio-leds";
 
-               led@1 {
+               led1 {
                        label = "shc:power:red";
                        gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@2 {
+               led2 {
                        label = "shc:power:bl";
                        gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "timer";
                        default-state = "on";
                };
 
-               led@3 {
+               led3 {
                        label = "shc:lan:red";
                        gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@4 {
+               led4 {
                        label = "shc:lan:bl";
                        gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@5 {
+               led5 {
                        label = "shc:cloud:red";
                        gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@6 {
+               led6 {
                        label = "shc:cloud:bl";
                        gpios = <&gpio1 18 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x20000000>; /* 512 MB */
        };
 
-       vmmcsd_fixed: fixedregulator@0 {
+       vmmcsd_fixed: fixedregulator0 {
                compatible = "regulator-fixed";
                regulator-name = "vmmcsd_fixed";
                regulator-min-microvolt = <3300000>;
index a6efbe6eda3b97f9dda4a74aed9e51a3b3950538..b0dfa6f14cd5ef919ba807b6fe8325e77c1879b2 100644 (file)
                };
        };
 
+       memory@80000000 {
+               device_type = "memory";
+               reg = <0x80000000 0x20000000>; /* 512 MB */
+       };
+
        chosen {
                stdout-path = &uart0;
        };
                pinctrl-names = "default";
                pinctrl-0 = <&led_pins>;
 
-               led@0 {
+               led0 {
                        label = "sl50:green:usr0";
                        gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;
                        default-state = "off";
                };
 
-               led@1 {
+               led1 {
                        label = "sl50:red:usr1";
                        gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
                        default-state = "off";
                };
 
-               led@2 {
+               led2 {
                        label = "sl50:green:usr2";
                        gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;
                        default-state = "off";
                };
 
-               led@3 {
+               led3 {
                        label = "sl50:red:usr3";
                        gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
                        default-state = "off";
                reset-gpios = <&gpio1 20 GPIO_ACTIVE_LOW>;
        };
 
-       vmmcsd_fixed: fixedregulator@0 {
+       vmmcsd_fixed: fixedregulator0 {
                compatible = "regulator-fixed";
                regulator-name = "vmmcsd_fixed";
                regulator-min-microvolt = <3300000>;
index 282f6d4b27bce4a3308e9ca6d5666e60de1c00ca..02c67365c4e1611cb6413b7a0cd0fa115a8a5e75 100644 (file)
        model = "Phytec AM335x phyBOARD-WEGA";
        compatible = "phytec,am335x-wega", "phytec,am335x-phycore-som", "ti,am33xx";
 
+       sound: sound_iface {
+               compatible = "ti,da830-evm-audio";
+       };
+
        regulators {
                compatible = "simple-bus";
 
-               vcc3v3: fixedregulator@1 {
+               vcc3v3: fixedregulator1 {
                        compatible = "regulator-fixed";
                        regulator-name = "vcc3v3";
                        regulator-min-microvolt = <3300000>;
        };
 };
 
+/* Audio */
+&am33xx_pinmux {
+       mcasp0_pins: pinmux_mcasp0 {
+               pinctrl-single,pins = <
+                       AM33XX_IOPAD(0x9AC, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp0_ahclkx.mcasp0_ahclkx */
+                       AM33XX_IOPAD(0x990, PIN_INPUT_PULLDOWN | MUX_MODE0)  /* mcasp0_aclkx.mcasp0_aclkx */
+                       AM33XX_IOPAD(0x994, PIN_INPUT_PULLDOWN | MUX_MODE0)  /* mcasp0_fsx.mcasp0_fsx */
+                       AM33XX_IOPAD(0x998, PIN_INPUT_PULLDOWN | MUX_MODE0)  /* mcasp0_axr0.mcasp0_axr0 */
+                       AM33XX_IOPAD(0x9A8, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp0_axr1.mcasp0_axr1 */
+               >;
+       };
+};
+
+&i2c0 {
+       tlv320aic3007: tlv320aic3007@18 {
+               compatible = "ti,tlv320aic3007";
+               reg = <0x18>;
+               AVDD-supply = <&vcc3v3>;
+               IOVDD-supply = <&vcc3v3>;
+               DRVDD-supply = <&vcc3v3>;
+               DVDD-supply = <&vdig1_reg>;
+               status = "okay";
+       };
+};
+
+&mcasp0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&mcasp0_pins>;
+       op-mode = <0>; /* DAVINCI_MCASP_IIS_MODE */
+       tdm-slots = <2>;
+       serial-dir = <
+               2 1 0 0 /* # 0: INACTIVE, 1: TX, 2: RX */
+       >;
+       tx-num-evt = <16>;
+       rt-num-evt = <16>;
+       status = "okay";
+};
+
+&sound {
+       ti,model = "AM335x-Wega";
+       ti,audio-codec = <&tlv320aic3007>;
+       ti,mcasp-controller = <&mcasp0>;
+       ti,audio-routing =
+               "Line Out",             "LLOUT",
+               "Line Out",             "RLOUT",
+               "LINE1L",               "Line In",
+               "LINE1R",               "Line In";
+       clocks = <&mcasp0_fck>;
+       clock-names = "mclk";
+       status = "okay";
+};
+
 /* CAN Busses */
 &am33xx_pinmux {
        dcan1_pins: pinmux_dcan1 {
        status = "okay";
 };
 
+/* Power */
+&vdig1_reg {
+       regulator-boot-on;
+       regulator-always-on;
+};
+
 /* UARTs */
 &am33xx_pinmux {
        uart0_pins: pinmux_uart0 {
index 98748c61ed99bcdb3c5a2b76ca8da3f3c733286f..eeef6bc8e410e1d83d4b367616d7450ee7f19822 100644 (file)
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/am33xx.h>
 
-#include "skeleton.dtsi"
-
 / {
        compatible = "ti,am33xx";
        interrupt-parent = <&intc>;
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        aliases {
                i2c0 = &i2c0;
index f9d8f3948c4a4237078896ec9ba0fa21de123d18..083ff50734351148e7e33cfe36db3f41773dab2d 100644 (file)
@@ -15,7 +15,7 @@
        model = "TI AM3517 CraneBoard (TMDSEVM3517)";
        compatible = "ti,am3517-craneboard", "ti,am3517", "ti,omap3";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>;  /* 256 MB */
        };
index b4127c6493a2901f6d813ecf0b4507d691abb1cc..0e4a125f78e3f28dfa13bf480c4fe4564451916b 100644 (file)
@@ -13,7 +13,7 @@
        model = "TI AM3517 EVM (AM3517/05 TMDSEVM3517)";
        compatible = "ti,am3517-evm", "ti,am3517", "ti,omap3";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
index 5e3f5e86ffcfeff43f611032b9381390bbffdc9f..0db19d39d24c138a3b34a9ef983e840c47bfc8f6 100644 (file)
@@ -15,7 +15,7 @@
                serial3 = &uart4;
        };
 
-       ocp {
+       ocp@68000000 {
                am35x_otg_hs: am35x_otg_hs@5c040000 {
                        compatible = "ti,omap3-musb";
                        ti,hwmods = "am35x_otg_hs";
index fdf5ce63c8e603c8076f654e512dae00ca5be6b3..3395783c5b4e34f1e1f915eb2d000238e20c1c10 100644 (file)
@@ -13,7 +13,7 @@
        model = "TeeJet Mt.Ventoux";
        compatible = "teejet,mt_ventoux", "ti,omap3";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
index 0fadae5396e1acfd243a7edfa4e4b31707716892..a275fa956813df7a34d6505c97a52c578207e3aa 100644 (file)
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
-#include "skeleton.dtsi"
-
 / {
        compatible = "ti,am4372", "ti,am43";
        interrupt-parent = <&wakeupgen>;
+       #address-cells = <1>;
+       #size-cells = <1>;
 
+       memory@0 {
+               device_type = "memory";
+               reg = <0 0>;
+       };
 
        aliases {
                i2c0 = &i2c0;
                cache-level = <2>;
        };
 
-       ocp {
+       ocp@44000000 {
                compatible = "ti,am4372-l3-noc", "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;
index 9551c4713173b5d6c3c9de10abf484954935451f..9e92d480576b04ae89f3e5aefc7c57f3a522070c 100644 (file)
                #interrupt-cells = <2>;
 
                dcdc1: regulator-dcdc1 {
-                       compatible = "ti,tps65218-dcdc1";
                        regulator-name = "vdd_core";
                        regulator-min-microvolt = <912000>;
                        regulator-max-microvolt = <1144000>;
                };
 
                dcdc2: regulator-dcdc2 {
-                       compatible = "ti,tps65218-dcdc2";
                        regulator-name = "vdd_mpu";
                        regulator-min-microvolt = <912000>;
                        regulator-max-microvolt = <1378000>;
                };
 
                dcdc3: regulator-dcdc3 {
-                       compatible = "ti,tps65218-dcdc3";
                        regulator-name = "vdcdc3";
                        regulator-suspend-enable;
                        regulator-min-microvolt = <1500000>;
                };
 
                dcdc5: regulator-dcdc5 {
-                       compatible = "ti,tps65218-dcdc5";
                        regulator-name = "v1_0bat";
                        regulator-min-microvolt = <1000000>;
                        regulator-max-microvolt = <1000000>;
                };
 
                dcdc6: regulator-dcdc6 {
-                       compatible = "ti,tps65218-dcdc6";
                        regulator-name = "v1_8bat";
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                };
 
                ldo1: regulator-ldo1 {
-                       compatible = "ti,tps65218-ldo1";
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                        regulator-boot-on;
index 14677d599595559362bac90fd6ac008aea523f5d..957840cc7b78748f06530d3aafa8dcf13b271001 100644 (file)
@@ -58,7 +58,7 @@
                default-brightness-level = <8>;
        };
 
-       matrix_keypad: matrix_keypad@0 {
+       matrix_keypad: matrix_keypad0 {
                compatible = "gpio-matrix-keypad";
                debounce-delay-ms = <5>;
                col-scan-delay-us = <2>;
                #interrupt-cells = <2>;
 
                dcdc1: regulator-dcdc1 {
-                       compatible = "ti,tps65218-dcdc1";
                        regulator-name = "vdd_core";
                        regulator-min-microvolt = <912000>;
                        regulator-max-microvolt = <1144000>;
                };
 
                dcdc2: regulator-dcdc2 {
-                       compatible = "ti,tps65218-dcdc2";
                        regulator-name = "vdd_mpu";
                        regulator-min-microvolt = <912000>;
                        regulator-max-microvolt = <1378000>;
                };
 
                dcdc3: regulator-dcdc3 {
-                       compatible = "ti,tps65218-dcdc3";
                        regulator-name = "vdcdc3";
                        regulator-min-microvolt = <1500000>;
                        regulator-max-microvolt = <1500000>;
                        regulator-boot-on;
                        regulator-always-on;
+                       regulator-state-mem {
+                               regulator-on-in-suspend;
+                       };
+                       regulator-state-disk {
+                               regulator-off-in-suspend;
+                       };
                };
+
                dcdc5: regulator-dcdc5 {
-                       compatible = "ti,tps65218-dcdc5";
                        regulator-name = "v1_0bat";
                        regulator-min-microvolt = <1000000>;
                        regulator-max-microvolt = <1000000>;
                        regulator-boot-on;
                        regulator-always-on;
+                       regulator-state-mem {
+                               regulator-on-in-suspend;
+                       };
                };
 
                dcdc6: regulator-dcdc6 {
-                       compatible = "ti,tps65218-dcdc6";
                        regulator-name = "v1_8bat";
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                        regulator-boot-on;
                        regulator-always-on;
+                       regulator-state-mem {
+                               regulator-on-in-suspend;
+                       };
                };
 
                ldo1: regulator-ldo1 {
-                       compatible = "ti,tps65218-ldo1";
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                        regulator-boot-on;
index 12a69518383e4b979eca5ad0cf26438973bca5f1..25ce611c65688298db6844213c5bacee6225e7a6 100644 (file)
                #address-cells = <1>;
                #size-cells = <0>;
 
-               switch@0 {
+               switch0 {
                        label = "power-button";
                        linux,code = <KEY_POWER>;
                        gpios = <&gpio4 2 GPIO_ACTIVE_LOW>;
index 5687d6b4da60c12061a425562659bc4b2306f875..319d94205350752622b05340414b5febd50b0605 100644 (file)
@@ -64,7 +64,7 @@
                };
        };
 
-       matrix_keypad: matrix_keypad@0 {
+       matrix_keypad: matrix_keypad0 {
                compatible = "gpio-matrix-keypad";
 
                pinctrl-names = "default";
                pinctrl-names = "default";
                pinctrl-0 = <&leds_pins>;
 
-               led@0 {
+               led0 {
                        label = "am437x-sk:red:heartbeat";
                        gpios = <&gpio5 0 GPIO_ACTIVE_HIGH>;    /* Bank 5, pin 0 */
                        linux,default-trigger = "heartbeat";
                        default-state = "off";
                };
 
-               led@1 {
+               led1 {
                        label = "am437x-sk:green:mmc1";
                        gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;    /* Bank 5, pin 1 */
                        linux,default-trigger = "mmc0";
                        default-state = "off";
                };
 
-               led@2 {
+               led2 {
                        label = "am437x-sk:blue:cpu0";
                        gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>;    /* Bank 5, pin 2 */
                        linux,default-trigger = "cpu0";
                        default-state = "off";
                };
 
-               led@3 {
+               led3 {
                        label = "am437x-sk:blue:usr3";
                        gpios = <&gpio5 3 GPIO_ACTIVE_HIGH>;    /* Bank 5, pin 3 */
                        default-state = "off";
                #interrupt-cells = <2>;
 
                dcdc1: regulator-dcdc1 {
-                       compatible = "ti,tps65218-dcdc1";
                        /* VDD_CORE limits min of OPP50 and max of OPP100 */
                        regulator-name = "vdd_core";
                        regulator-min-microvolt = <912000>;
                };
 
                dcdc2: regulator-dcdc2 {
-                       compatible = "ti,tps65218-dcdc2";
                        /* VDD_MPU limits min of OPP50 and max of OPP_NITRO */
                        regulator-name = "vdd_mpu";
                        regulator-min-microvolt = <912000>;
                };
 
                dcdc3: regulator-dcdc3 {
-                       compatible = "ti,tps65218-dcdc3";
                        regulator-name = "vdds_ddr";
                        regulator-min-microvolt = <1500000>;
                        regulator-max-microvolt = <1500000>;
                        regulator-boot-on;
                        regulator-always-on;
+                       regulator-state-mem {
+                               regulator-on-in-suspend;
+                       };
+                       regulator-state-disk {
+                               regulator-off-in-suspend;
+                       };
                };
 
                dcdc4: regulator-dcdc4 {
-                       compatible = "ti,tps65218-dcdc4";
                        regulator-name = "v3_3d";
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
                        regulator-always-on;
                };
 
+               dcdc5: regulator-dcdc5 {
+                       compatible = "ti,tps65218-dcdc5";
+                       regulator-name = "v1_0bat";
+                       regulator-min-microvolt = <1000000>;
+                       regulator-max-microvolt = <1000000>;
+                       regulator-boot-on;
+                       regulator-always-on;
+                       regulator-state-mem {
+                               regulator-on-in-suspend;
+                       };
+               };
+
+               dcdc6: regulator-dcdc6 {
+                       compatible = "ti,tps65218-dcdc6";
+                       regulator-name = "v1_8bat";
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       regulator-boot-on;
+                       regulator-always-on;
+                       regulator-state-mem {
+                               regulator-on-in-suspend;
+                       };
+               };
+
                ldo1: regulator-ldo1 {
-                       compatible = "ti,tps65218-ldo1";
                        regulator-name = "v1_8d";
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
index ad32e55532f885fff34694ad74b05d6c02677ad4..9d35c3f07cad70ba7d72927cc1c0b3749a07a8d3 100644 (file)
@@ -32,7 +32,7 @@
                enable-active-high;
        };
 
-       vbat: fixedregulator@0 {
+       vbat: fixedregulator0 {
                compatible = "regulator-fixed";
                regulator-name = "vbat";
                regulator-min-microvolt = <5000000>;
@@ -67,7 +67,7 @@
                };
        };
 
-       matrix_keypad: matrix_keypad@0 {
+       matrix_keypad: matrix_keypad0 {
                compatible = "gpio-matrix-keypad";
                debounce-delay-ms = <5>;
                col-scan-delay-us = <2>;
                #interrupt-cells = <2>;
 
                dcdc1: regulator-dcdc1 {
-                       compatible = "ti,tps65218-dcdc1";
                        regulator-name = "vdd_core";
                        regulator-min-microvolt = <912000>;
                        regulator-max-microvolt = <1144000>;
                };
 
                dcdc2: regulator-dcdc2 {
-                       compatible = "ti,tps65218-dcdc2";
                        regulator-name = "vdd_mpu";
                        regulator-min-microvolt = <912000>;
                        regulator-max-microvolt = <1378000>;
                };
 
                dcdc3: regulator-dcdc3 {
-                       compatible = "ti,tps65218-dcdc3";
                        regulator-name = "vdcdc3";
                        regulator-min-microvolt = <1500000>;
                        regulator-max-microvolt = <1500000>;
                };
 
                dcdc4: regulator-dcdc4 {
-                       compatible = "ti,tps65218-dcdc4";
                        regulator-name = "vdcdc4";
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
                };
 
                dcdc5: regulator-dcdc5 {
-                       compatible = "ti,tps65218-dcdc5";
                        regulator-name = "v1_0bat";
                        regulator-min-microvolt = <1000000>;
                        regulator-max-microvolt = <1000000>;
                };
 
                dcdc6: regulator-dcdc6 {
-                       compatible = "ti,tps65218-dcdc6";
                        regulator-name = "v1_8bat";
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                };
 
                ldo1: regulator-ldo1 {
-                       compatible = "ti,tps65218-ldo1";
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                        regulator-boot-on;
index e3acb99703e117dd9f3c63e58af9e5d1040276a1..87bbc66f0f218933113030f4243c8ba788170d76 100644 (file)
@@ -18,7 +18,7 @@
        compatible = "ti,am5728-idk", "ti,am5728", "ti,dra742", "ti,dra74",
                     "ti,dra7";
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x80000000 0x0 0x80000000>;
        };
index c4d04c5293b90b01c9dfcaa8185a3755d34e7166..9067ca092dc517748f379b171ff143d4b3bb3275 100644 (file)
@@ -23,7 +23,7 @@
                display0 = &hdmi0;
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x80000000 0x0 0x80000000>;
        };
                pinctrl-names = "default";
                pinctrl-0 = <&leds_pins_default>;
 
-               led@0 {
+               led0 {
                        label = "beagle-x15:usr0";
                        gpios = <&gpio7 9 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";
                        default-state = "off";
                };
 
-               led@1 {
+               led1 {
                        label = "beagle-x15:usr1";
                        gpios = <&gpio7 8 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "cpu0";
                        default-state = "off";
                };
 
-               led@2 {
+               led2 {
                        label = "beagle-x15:usr2";
                        gpios = <&gpio7 14 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "mmc0";
                        default-state = "off";
                };
 
-               led@3 {
+               led3 {
                        label = "beagle-x15:usr3";
                        gpios = <&gpio7 15 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "disk-activity";
index 378b142ef88c0bed4ee8cbf43ebace9b9a465ddd..203266f884807e3a2cced5c35c56e6d92fc69bf9 100644 (file)
@@ -19,7 +19,7 @@
        model = "CompuLab CL-SOM-AM57x";
        compatible = "compulab,cl-som-am57x", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7";
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x80000000 0x0 0x20000000>; /* 512 MB - minimal configuration */
        };
@@ -29,7 +29,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&leds_pins_default>;
 
-               led@0 {
+               led0 {
                        label = "cl-som-am57x:green";
                        gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";
index 0e63b9dff6e7d717f190886d24f5175e8510489e..03cec62260e17be7475b20e5206837813f57324a 100644 (file)
        ti,non-removable;
        max-frequency = <96000000>;
 };
+
+&qspi {
+       status = "okay";
+
+       spi-max-frequency = <76800000>;
+       m25p80@0 {
+               compatible = "s25fl256s1", "jedec,spi-nor";
+               spi-max-frequency = <76800000>;
+               reg = <0>;
+               spi-tx-bus-width = <1>;
+               spi-rx-bus-width = <4>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               /* MTD partition table.
+                * The ROM checks the first four physical blocks
+                * for a valid file to boot and the flash here is
+                * 64KiB block size.
+                */
+               partition@0 {
+                       label = "QSPI.SPL";
+                       reg = <0x00000000 0x000040000>;
+               };
+               partition@1 {
+                       label = "QSPI.u-boot";
+                       reg = <0x00040000 0x00100000>;
+               };
+               partition@2 {
+                       label = "QSPI.u-boot-spl-os";
+                       reg = <0x00140000 0x00080000>;
+               };
+               partition@3 {
+                       label = "QSPI.u-boot-env";
+                       reg = <0x001c0000 0x00010000>;
+               };
+               partition@4 {
+                       label = "QSPI.u-boot-env.backup1";
+                       reg = <0x001d0000 0x0010000>;
+               };
+               partition@5 {
+                       label = "QSPI.kernel";
+                       reg = <0x001e0000 0x0800000>;
+               };
+               partition@6 {
+                       label = "QSPI.file-system";
+                       reg = <0x009e0000 0x01620000>;
+               };
+       };
+};
index 1a15db8e376baa19fd1fa25ff4a70eb2aa123be2..5fd4c37680fd58cc8e502158abedd7f0410679cf 100644 (file)
                pinctrl-names = "default";
                pinctrl-0 = <&nand_cs3_pins>;
        };
-       vbat: fixedregulator@0 {
+       vbat: fixedregulator0 {
                compatible = "regulator-fixed";
                regulator-name = "vbat";
                regulator-min-microvolt = <5000000>;
index 4128fa91823c98c6fb94870ccb2e5b69c31f35e0..d6657b3bae84b11395b46bc4d130964179b0bde1 100644 (file)
        model = "DM8148 EVM";
        compatible = "ti,dm8148-evm", "ti,dm8148";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x40000000>;  /* 1 GB */
        };
 
        /* MIC94060YC6 controlled by SD1_POW pin */
-       vmmcsd_fixed: fixedregulator@0 {
+       vmmcsd_fixed: fixedregulator0 {
                compatible = "regulator-fixed";
                regulator-name = "vmmcsd_fixed";
                regulator-min-microvolt = <3300000>;
index 3f184863e0c52192d7a01a8f24ad3637b1229556..63883b3479f95f22cd4787f8c10730dc2c20dc9b 100644 (file)
@@ -11,7 +11,7 @@
        model = "HP t410 Smart Zero Client";
        compatible = "hp,t410", "ti,dm8148";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x40000000>;  /* 1 GB */
        };
@@ -27,7 +27,7 @@
                regulator-always-on;
        };
 
-       vmmcsd_fixed: fixedregulator@0 {
+       vmmcsd_fixed: fixedregulator0 {
                compatible = "regulator-fixed";
                regulator-name = "vmmcsd_fixed";
                regulator-min-microvolt = <3300000>;
index 68e412c9863cccc8a78aedfc0279c7f44a35c0a1..ff90a6ce6bdc248066e895cb03916e6b1d26ccc8 100644 (file)
@@ -7,11 +7,11 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/dm814x.h>
 
-#include "skeleton.dtsi"
-
 / {
        compatible = "ti,dm814";
        interrupt-parent = <&intc>;
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        aliases {
                i2c0 = &i2c1;
index f50348bdd8574125d53ae55b0c37ad974aff9818..0bf55fa72dea87d2652ed16239e91aca46f46dda 100644 (file)
        model = "DM8168 EVM";
        compatible = "ti,dm8168-evm", "ti,dm8168";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x40000000    /* 1 GB */
                       0xc0000000 0x40000000>;  /* 1 GB */
        };
 
        /* FDC6331L controlled by SD_POW pin */
-       vmmcsd_fixed: fixedregulator@0 {
+       vmmcsd_fixed: fixedregulator0 {
                compatible = "regulator-fixed";
                regulator-name = "vmmcsd_fixed";
                regulator-min-microvolt = <3300000>;
index 44e39c743b53dd7883fd52131c00f7118a8b021c..f1e0f771ff297df8cdde113f5237e03a63bee18e 100644 (file)
@@ -7,11 +7,11 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/omap.h>
 
-#include "skeleton.dtsi"
-
 / {
        compatible = "ti,dm816";
        interrupt-parent = <&intc>;
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        aliases {
                i2c0 = &i2c1;
index f820573f4a4a13eabce0a214c5e746fbaab54633..155eb32ee21377d70eb67ead5167038a028025ef 100644 (file)
        model = "DRA62x J5 Eco EVM";
        compatible = "ti,dra62x-j5eco-evm", "ti,dra62x", "ti,dm8148";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x40000000>;  /* 1 GB */
        };
 
        /* MIC94060YC6 controlled by SD1_POW pin */
-       vmmcsd_fixed: fixedregulator@0 {
+       vmmcsd_fixed: fixedregulator0 {
                compatible = "regulator-fixed";
                regulator-name = "vmmcsd_fixed";
                regulator-min-microvolt = <3300000>;
index bafcfac067ecdd5c29bc99d8a942d377e4afbd66..132f2be10889fbfc7a94d5048b9ee096a0bf848c 100644 (file)
@@ -16,7 +16,7 @@
        model = "TI DRA742";
        compatible = "ti,dra7-evm", "ti,dra742", "ti,dra74", "ti,dra7";
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x80000000 0x0 0x60000000>; /* 1536 MB */
        };
 
        leds {
                compatible = "gpio-leds";
-               led@0 {
+               led0 {
                        label = "dra7:usr1";
                        gpios = <&pcf_lcd 4 GPIO_ACTIVE_LOW>;
                        default-state = "off";
                };
 
-               led@1 {
+               led1 {
                        label = "dra7:usr2";
                        gpios = <&pcf_lcd 5 GPIO_ACTIVE_LOW>;
                        default-state = "off";
                };
 
-               led@2 {
+               led2 {
                        label = "dra7:usr3";
                        gpios = <&pcf_lcd 6 GPIO_ACTIVE_LOW>;
                        default-state = "off";
                };
 
-               led@3 {
+               led3 {
                        label = "dra7:usr4";
                        gpios = <&pcf_lcd 7 GPIO_ACTIVE_LOW>;
                        default-state = "off";
 &qspi {
        status = "okay";
 
-       spi-max-frequency = <64000000>;
+       spi-max-frequency = <76800000>;
        m25p80@0 {
                compatible = "s25fl256s1";
-               spi-max-frequency = <64000000>;
+               spi-max-frequency = <76800000>;
                reg = <0>;
                spi-tx-bus-width = <1>;
                spi-rx-bus-width = <4>;
index d9bfb94a2992a212c03a8bdac038213e93c27eac..147df90d212690a45c3db33af50985a6947dc629 100644 (file)
@@ -10,8 +10,6 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/pinctrl/dra.h>
 
-#include "skeleton.dtsi"
-
 #define MAX_SOURCES 400
 
 / {
                                          0x82000000 0 0x20013000 0x13000 0 0xffed000>;
                                #interrupt-cells = <1>;
                                num-lanes = <1>;
+                               linux,pci-domain = <0>;
                                ti,hwmods = "pcie1";
                                phys = <&pcie1_phy>;
                                phy-names = "pcie-phy0";
                                          0x82000000 0 0x30013000 0x13000 0 0xffed000>;
                                #interrupt-cells = <1>;
                                num-lanes = <1>;
+                               linux,pci-domain = <1>;
                                ti,hwmods = "pcie2";
                                phys = <&pcie2_phy>;
                                phy-names = "pcie-phy0";
                        ti,hwmods = "ocp2scp1";
 
                        usb2_phy1: phy@4a084000 {
-                               compatible = "ti,omap-usb2";
+                               compatible = "ti,dra7x-usb2", "ti,omap-usb2";
                                reg = <0x4a084000 0x400>;
                                syscon-phy-power = <&scm_conf 0x300>;
                                clocks = <&usb_phy1_always_on_clk32k>,
                mac: ethernet@48484000 {
                        compatible = "ti,dra7-cpsw","ti,cpsw";
                        ti,hwmods = "gmac";
-                       clocks = <&dpll_gmac_ck>, <&gmac_gmii_ref_clk_div>;
+                       clocks = <&gmac_main_clk>, <&gmac_rft_clk_mux>;
                        clock-names = "fck", "cpts";
                        cpdma_channels = <8>;
                        ale_entries = <1024>;
                        mac_control = <0x20>;
                        slaves = <2>;
                        active_slave = <0>;
-                       cpts_clock_mult = <0x80000000>;
+                       cpts_clock_mult = <0x784CFE14>;
                        cpts_clock_shift = <29>;
                        reg = <0x48484000 0x1000
                               0x48485200 0x2E00>;
index 9d3cf50ca37e40d8050d0d0a58cf6c9b113f7759..c94d8d64710dde5018a465680f025dd1ebc2171d 100644 (file)
 &qspi {
        status = "okay";
 
-       spi-max-frequency = <64000000>;
+       spi-max-frequency = <76800000>;
        m25p80@0 {
                compatible = "s25fl256s1";
-               spi-max-frequency = <64000000>;
+               spi-max-frequency = <76800000>;
                reg = <0>;
                spi-tx-bus-width = <1>;
                spi-rx-bus-width = <4>;
index f9cfd3bb4dc2c4fae5571864dcc84e7409548074..064b322a7a042e5b845b58aed03f37dabee115fd 100644 (file)
@@ -11,7 +11,7 @@
 / {
        model = "TI DRA722 Rev C EVM";
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x80000000 0x0 0x80000000>; /* 2GB */
        };
index cc1d32ca4a8ae1cb453cb776496fb866905597ed..e3a9b6985693fcbe3fbc23993e93f2ebbe56629e 100644 (file)
@@ -9,7 +9,7 @@
 / {
        model = "TI DRA722";
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x80000000 0x0 0x40000000>; /* 1024 MB */
        };
index 8378b44ee567048e27bcb6c5530bbded506d1d41..3330738e4c6e1064a9f34fc5f78a1adfb58cd6f4 100644 (file)
                ti,index-power-of-two;
        };
 
+       gmac_main_clk: gmac_main_clk {
+               #clock-cells = <0>;
+               compatible = "fixed-factor-clock";
+               clocks = <&gmac_250m_dclk_div>;
+               clock-mult = <1>;
+               clock-div = <2>;
+       };
+
        l3init_480m_dclk_div: l3init_480m_dclk_div@1ac {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                reg = <0x0c00>;
        };
 
-       gmac_gmii_ref_clk_div: gmac_gmii_ref_clk_div@13d0 {
+       rmii_50mhz_clk_mux: rmii_50mhz_clk_mux@13d0 {
                #clock-cells = <0>;
-               compatible = "ti,divider-clock";
-               clocks = <&dpll_gmac_m2_ck>;
+               compatible = "ti,mux-clock";
+               clocks = <&dpll_gmac_h11x2_ck>, <&rmii_clk_ck>;
                ti,bit-shift = <24>;
                reg = <0x13d0>;
-               ti,dividers = <2>;
        };
 
        gmac_rft_clk_mux: gmac_rft_clk_mux@13d0 {
index 1c2c74655416868237d3d40692217b0beaf2d557..731ec37aed5b505b31e95e35319c3e8213e1118a 100644 (file)
                };
        };
 
+       memory@0 {
+               device_type = "memory";
+               reg = <0 0>;
+       };
+
        leds {
                compatible = "gpio-leds";
                user0 {
index 578fa2a54dce35482ba2d7b7fd1d42ce67a762ac..4f793a025a721b03f3a5e1f074c4c531033cf62f 100644 (file)
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/pinctrl/omap.h>
 
-#include "skeleton.dtsi"
-
 / {
        compatible = "ti,omap2430", "ti,omap2420", "ti,omap2";
        interrupt-parent = <&intc>;
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        aliases {
                serial0 = &uart1;
index 34cdecb4fddabae4dfc8bb3d2be3671309ac1de0..9265c0b9c3f32592644a2e861691c67913207c8e 100644 (file)
@@ -13,7 +13,7 @@
        model = "TI OMAP2420 H4 board";
        compatible = "ti,omap2420-h4", "ti,omap2420", "ti,omap2";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x4000000>; /* 64 MB */
        };
index db95aadcca70193f0cb95f11753911cefcc37a4d..7e5ffc583c90ab565d05b0d3850ae82bdbe16074 100644 (file)
@@ -1,7 +1,7 @@
 #include "omap2420.dtsi"
 
 / {
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x8000000>; /* 128 MB */
        };
index 6b36ede58488fa4a57a2068b6d386e9f7d2ad0f3..4f7d9d7c00c749dd9466326a816c51b926d6d5f1 100644 (file)
@@ -13,7 +13,7 @@
        model = "TI OMAP2430 SDP";
        compatible = "ti,omap2430-sdp", "ti,omap2430", "ti,omap2";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x8000000>; /* 128 MB */
        };
index 8ffde06281ad097aa113bf804c57ed6735651ab1..85e297ed0ea1c1390b16525736c46c26909de310 100644 (file)
@@ -19,7 +19,7 @@
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x20000000>; /* 512 MB */
        };
index a19d907d4850c39e5fbf4345763f11e4f9429562..4be85ce59dd14eea19c95dc0cea5ff12748177bc 100644 (file)
@@ -19,7 +19,7 @@
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
index 6a0df13fa0f344472e234eebf73df698913b9cf9..57b9a028a49a688e0be95c39fed043c828c93223 100644 (file)
@@ -4,7 +4,7 @@
 
 / {
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
index 5860101797528edc95fe00d27a27a5fed4aaf50e..f330c69cc683cef9d90dfced7ffd3b29f71eac48 100644 (file)
@@ -10,7 +10,7 @@
 
 #include "omap34xx.dtsi"
 / {
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>;  /* 256 MB */
        };
index ed449827c3d358512f4004f1555d279bbe59267a..4f9a765446026f859d803eda9f97324cff4fd62b 100644 (file)
@@ -15,7 +15,7 @@
        model = "TI OMAP37XX EVM (TMDSEVM3730)";
        compatible = "ti,omap3-evm-37xx", "ti,omap3630", "ti,omap3";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
index e10dcd0fa539452f6fcaab8ae295fd60085f18b6..99b2bfcd1059fdfbf1b4b3a95d7b598f224b199d 100644 (file)
@@ -14,7 +14,7 @@
        model = "TI OMAP35XX EVM (TMDSEVM3530)";
        compatible = "ti,omap3-evm", "ti,omap3";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
index c09a0574af90b3c9f8e8dfd8f96d67a9fa01d23f..5563e2533ebde82e327edceed2ad6c4b223d86a4 100644 (file)
@@ -21,7 +21,7 @@
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x20000000>; /* 512 MB */
        };
index f4f2ce46d681cd0ed7872dccea21eb6523dbd275..54c4c07bbe4a366887a8541e37d8fe45439705ff 100644 (file)
@@ -13,7 +13,7 @@
 #include "omap36xx.dtsi"
 
 / {
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x20000000>; /* 512 MB */
        };
index 2f353dadfa4004ccbc0c0b4bde351f86bf9c97fe..e28fe13cb007c9e524585644c076a99f68ddc1bf 100644 (file)
@@ -15,7 +15,7 @@
        model = "TI OMAP3430 LDP (Zoom1 Labrador)";
        compatible = "ti,omap3-ldp", "ti,omap3";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x8000000>; /* 128 MB */
        };
index eff816e0bc0a4a8151855936072720fb7db93c9f..fa611a5e48506c688c9406424e6454fb8d724449 100644 (file)
@@ -17,7 +17,7 @@
                        bootargs = "console=ttyO0,115200n8 vt.global_cursor_default=0 consoleblank=0";
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x8000000>;   /* 128 MB */
        };
index 2a6078a8422c9acc975b039f12f3af32ba912f4f..87ca50b53002b9cf244b9dca24a0f2fbdca3dabc 100644 (file)
@@ -54,7 +54,7 @@
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
index 927b17fc4ed885634320480a2527131ec8f451f1..5d8c4b4a42058023f91ff5e2fb6ed61b8dde89fb 100644 (file)
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x40000000>; /* 1 GB */
        };
 
-       vemmc: fixedregulator@0 {
+       vemmc: fixedregulator0 {
                compatible = "regulator-fixed";
                regulator-name = "VEMMC";
                regulator-min-microvolt = <2900000>;
@@ -39,7 +39,7 @@
                enable-active-high;
        };
 
-       vwlan_fixed: fixedregulator@2 {
+       vwlan_fixed: fixedregulator2 {
                compatible = "regulator-fixed";
                regulator-name = "VWLAN";
                gpio = <&gpio2 3 GPIO_ACTIVE_HIGH>; /* gpio 35 */
index 3b3a75997f811597489b157dc831939f07eb5c3d..99a7eee6e61fd2b3b296a7714898774a5d9ee180 100644 (file)
@@ -44,7 +44,7 @@
                #size-cells = <0>;
                pinctrl-names = "default";
                pinctrl-0 = <&button_pins>;
-               button0@10 {
+               button0 {
                        label = "button0";
                        linux,code = <BTN_0>;
                        gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;            /* gpio_10 */
index 3e946cac55f3ead97d21726beb96d57e748eaffc..401fae838fe938264cb3dcf81a7011f591d852b1 100644 (file)
  */
 
 / {
+
+       memory@0 {
+               device_type = "memory";
+               reg = <0 0>;
+       };
+
        pwmleds {
                compatible = "pwm-leds";
 
index 4f4c6efbd51892abd031de7fb3a407ac2a0be1a4..56dbd113430eef28dd6969fdfbaf7b4fbfb672ef 100644 (file)
                pinctrl-0 = <&button_pins>;
                #address-cells = <1>;
                #size-cells = <0>;
-               button0@23 {
+               button0 {
                        label = "button0";
                        linux,code = <BTN_0>;
                        gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;            /* gpio_23 */
                        wakeup-source;
                };
-               button1@14 {
+               button1 {
                        label = "button1";
                        linux,code = <BTN_1>;
                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;            /* gpio_14 */
index ca86da68220ccef663d99d122cac82418f84e1bf..854117dc0b77190e7f873ce96827a1bdceeb0b0a 100644 (file)
        pinctrl-names = "default";
        pinctrl-0 = <&mcspi1_pins>;
 
-       lcd0: display {
+       lcd0: display@1 {
                compatible = "lgphilips,lb035q02";
                label = "lcd35";
 
index 250cc7fe5d5e1832365f5ecd55f009c0a41c313a..286f5baddf077b0ea7477c43696b042d372bd3d5 100644 (file)
                pinctrl-0 = <&button_pins>;
                #address-cells = <1>;
                #size-cells = <0>;
-               button0@23 {
+               button0 {
                        label = "button0";
                        linux,code = <BTN_0>;
                        gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;            /* gpio_23 */
                        wakeup-source;
                };
-               button1@14 {
+               button1 {
                        label = "button1";
                        linux,code = <BTN_1>;
                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;            /* gpio_14 */
index 8df7ec35d17d11eb30f095d8b42123f07a6ddb17..a8020fb424647fd3d4373e1d5b1675ed1872e32c 100644 (file)
                pinctrl-0 = <&button_pins>;
                #address-cells = <1>;
                #size-cells = <0>;
-               button0@23 {
+               button0 {
                        label = "button0";
                        linux,code = <BTN_0>;
                        gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;            /* gpio_23 */
                        wakeup-source;
                };
-               button1@14 {
+               button1 {
                        label = "button1";
                        linux,code = <BTN_1>;
                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;            /* gpio_14 */
index 0ea2c451c80963f01456d0468327ac8336c578a6..11965737e2c9ff0a5f44b6a563de16f8c88222d5 100644 (file)
                pinctrl-0 = <&button_pins>;
                #address-cells = <1>;
                #size-cells = <0>;
-               button0@23 {
+               button0 {
                        label = "button0";
                        linux,code = <BTN_0>;
                        gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;            /* gpio_23 */
                        wakeup-source;
                };
-               button1@14 {
+               button1 {
                        label = "button1";
                        linux,code = <BTN_1>;
                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;            /* gpio_14 */
index dbc4dc721cc2c1b354a1ca29dd3e70df946ef33d..53e007abdc7159ee69fd35a120ba30edb0704e3c 100644 (file)
@@ -18,7 +18,7 @@
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x20000000>; /* 512 MB */
        };
                pinctrl-names = "default";
                pinctrl-0 = <&led_pins>;
 
-               led@1 {
+               led1 {
                        label = "pandora::sd1";
                        gpios = <&gpio5 0 GPIO_ACTIVE_HIGH>;    /* GPIO_128 */
                        linux,default-trigger = "mmc0";
                        default-state = "off";
                };
 
-               led@2 {
+               led2 {
                        label = "pandora::sd2";
                        gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;    /* GPIO_129 */
                        linux,default-trigger = "mmc1";
                        default-state = "off";
                };
 
-               led@3 {
+               led3 {
                        label = "pandora::bluetooth";
                        gpios = <&gpio5 30 GPIO_ACTIVE_HIGH>;   /* GPIO_158 */
                        linux,default-trigger = "heartbeat";
                        default-state = "off";
                };
 
-               led@4 {
+               led4 {
                        label = "pandora::wifi";
                        gpios = <&gpio5 31 GPIO_ACTIVE_HIGH>;   /* GPIO_159 */
                        linux,default-trigger = "mmc2";
index 78a1184cb312ad5b9dc01645b5bd9117037d2c3c..bc4498e77bc9bc0fd4bfc48b462ef89671cd9617 100644 (file)
@@ -20,7 +20,7 @@
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x20000000>; /* 512 MB */
        };
index 644d3c8ea66abdce6e7a18b92442e8189b81d426..dc80886b532929eee49ba45608003cf93b9bed1d 100644 (file)
@@ -26,7 +26,7 @@
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
index c29b41dc7b95a19213c7e514cd3371e06c87230f..45e2ce0803dec8a01d20c92a98a3b1f3b95735d1 100644 (file)
@@ -20,7 +20,7 @@
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x20000000>; /* 512 MB */
        };
index 4c3c471d2a836c3140a7048a55ce18a9215140ee..353d818ce5a6dc059488db7a842bd217b4836ff6 100644 (file)
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/pinctrl/omap.h>
 
-#include "skeleton.dtsi"
-
 / {
        compatible = "ti,omap3430", "ti,omap3";
        interrupt-parent = <&intc>;
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        aliases {
                i2c0 = &i2c1;
@@ -78,7 +78,7 @@
         * the moment, just use a fake OCP bus entry to represent the whole bus
         * hierarchy.
         */
-       ocp {
+       ocp@68000000 {
                compatible = "ti,omap3-l3-smx", "simple-bus";
                reg = <0x68000000 0x10000>;
                interrupts = <9 10>;
index a0dc8d854142d9415f45d8d04b601a8a35ef9de0..abd6921143beb328aad5e84d60d209d98147854f 100644 (file)
@@ -13,7 +13,7 @@
        model = "TI OMAP3430 SDP";
        compatible = "ti,omap3430-sdp", "ti,omap3";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
index e44656258225038d1ae8124fde99202331c13d1e..e41c52d3b11312f3a57afc15851215d265440c36 100644 (file)
@@ -28,7 +28,7 @@
                };
        };
 
-       ocp {
+       ocp@68000000 {
                omap3_pmx_core2: pinmux@480025d8 {
                        compatible = "ti,omap3-padconf", "pinctrl-single";
                        reg = <0x480025d8 0x24>;
index 8b797915300894d80bd85cbd1c8782b3c6e2d294..718fa88407cdb4321bec1890a5893d8f9430ba8e 100644 (file)
@@ -30,7 +30,7 @@
                };
        };
 
-       ocp {
+       ocp@68000000 {
                uart4: serial@49042000 {
                        compatible = "ti,omap3-uart";
                        reg = <0x49042000 0x400>;
index 6b39808b8313ae13fc130547b72bd3aa6c0b07e2..1b825128a7b952568610e0b283415eebd3320724 100644 (file)
@@ -32,7 +32,7 @@
                compatible = "gpio-keys";
                #address-cells = <1>;
                #size-cells = <0>;
-               button0@121 {
+               button0 {
                        label = "button0";
                        linux,code = <BTN_0>;
                        gpios = <&gpio4 25 GPIO_ACTIVE_LOW>;    /* gpio_121 */
index a90b582e4c3f15d3307b184989c48b4dc51fd011..ec0bd9779e1a582eb8a17497b36b55e95f1fb074 100644 (file)
@@ -12,7 +12,7 @@
        model = "Gumstix Duovero";
        compatible = "gumstix,omap4-duovero", "ti,omap4430", "ti,omap4";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x40000000>; /* 1 GB */
        };
index 2251bd54e4e61675bf887a0067138acd56f95c51..e3763ac7571941afcafa4b1b76896f111691f333 100644 (file)
@@ -13,7 +13,7 @@
        model = "Amazon Kindle Fire (first generation)";
        compatible = "amazon,omap4-kc1", "ti,omap4430", "ti,omap4";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x20000000>; /* 512 MB */
        };
index f8f13952cfeb1efabca2dab71cc9152fcf1e29a0..d48e45bd4b3d63895f3c9ac2faf024311b00eed1 100644 (file)
@@ -8,7 +8,7 @@
 #include "elpida_ecb240abacn.dtsi"
 
 / {
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x40000000>; /* 1 GB */
        };
index 10d73a784050d306116bc8ea71b8882393cb5670..d728ec96311114cd71c0c1bd752be925d14c995f 100644 (file)
@@ -14,7 +14,7 @@
        model = "TI OMAP4 SDP board";
        compatible = "ti,omap4-sdp", "ti,omap4430", "ti,omap4";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x40000000>; /* 1 GB */
        };
index 873cfc87260c54bda509042e7ab0b6b50dd2f998..758b6eb7ae43d975dc7df149a763b8fb605eceb4 100644 (file)
@@ -12,7 +12,7 @@
        model = "Variscite VAR-SOM-OM44";
        compatible = "variscite,var-som-om44", "ti,omap4460", "ti,omap4";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x40000000>; /* 1 GB */
        };
index 3fdc51cd0fad60074019f24986d32766cfbab754..0ced079b7ae3d715ff4dc1d20b6353c96f0ec224 100644 (file)
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/pinctrl/omap.h>
 
-#include "skeleton.dtsi"
-
 / {
        compatible = "ti,omap4430", "ti,omap4";
        interrupt-parent = <&wakeupgen>;
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        aliases {
                i2c0 = &i2c1;
index 5196113202a2c583faa0e8e01ef622d856fca523..d1f5ce3d36519844a81c021f040b69b89213167e 100644 (file)
@@ -79,7 +79,7 @@
 
        leds {
                compatible = "gpio-leds";
-               led@1 {
+               led1 {
                        label = "omap5:blue:usr1";
                        gpios = <&gpio5 25 GPIO_ACTIVE_HIGH>; /* gpio5_153 D1 LED */
                        linux,default-trigger = "heartbeat";
index a9765605d53b11a1252b79504b4b62020e8532ce..c9390fa9c3621bca3a43484e96d3290f2e5d65a8 100644 (file)
@@ -11,7 +11,7 @@
        model = "CompuLab CM-T54";
        compatible = "compulab,omap5-cm-t54", "ti,omap5";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x7F000000>; /* 2048 MB */
        };
@@ -72,7 +72,7 @@
 
        leds {
                compatible = "gpio-leds";
-               led@1 {
+               led1 {
                        label = "Heartbeat";
                        gpios = <&gpio3 16 GPIO_ACTIVE_HIGH>; /* gpio3_80 ACT_LED */
                        linux,default-trigger = "heartbeat";
index f75ce02fb3983988ec7858630e0c3d93f589b5e6..7aa2b0c813ab6034af652c0a2b7eccd34629ea5a 100644 (file)
@@ -13,7 +13,7 @@
        model = "IGEPv5";
        compatible = "isee,omap5-igep0050", "ti,omap5";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x7f000000>; /* 2032 MB */
        };
index a51e60518eb6bb2bcc0c82452743b0b7ac3c37c4..5230ca00913aa27e63a4c1c753be656576e9c517 100644 (file)
@@ -13,7 +13,7 @@
        model = "TI OMAP5 uEVM board";
        compatible = "ti,omap5-uevm", "ti,omap5";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x7F000000>; /* 2032 MB */
        };
index 84c10195e79bbcc446561c3994ac93dbadf19ba6..71a8f5492c8b241ecbf4987513751fa92e8ee667 100644 (file)
@@ -11,8 +11,6 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/pinctrl/omap.h>
 
-#include "skeleton.dtsi"
-
 / {
        #address-cells = <1>;
        #size-cells = <1>;
This page took 0.080413 seconds and 5 git commands to generate.