]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
arm: dts: am3x: Non-functional changes sync with v6.3-rc6
authorAndrew Davis <afd@ti.com>
Tue, 11 Apr 2023 18:25:05 +0000 (13:25 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 24 Apr 2023 17:18:47 +0000 (13:18 -0400)
This is a collection of all the whitespace, renames, comment, and other
changes that should not change the DT functionality from Linux v6.3-rc6.

Signed-off-by: Andrew Davis <afd@ti.com>
26 files changed:
arch/arm/dts/am335x-bone-common.dtsi
arch/arm/dts/am335x-boneblack-hdmi.dtsi
arch/arm/dts/am335x-boneblack-wireless.dts
arch/arm/dts/am335x-boneblack.dts
arch/arm/dts/am335x-boneblue.dts
arch/arm/dts/am335x-bonegreen-wireless.dts
arch/arm/dts/am335x-evm.dts
arch/arm/dts/am335x-evmsk.dts
arch/arm/dts/am335x-guardian.dts
arch/arm/dts/am335x-icev2.dts
arch/arm/dts/am335x-igep0033.dtsi
arch/arm/dts/am335x-pdu001.dts
arch/arm/dts/am335x-phycore-som.dtsi
arch/arm/dts/am335x-pocketbeagle.dts
arch/arm/dts/am335x-pxm2.dtsi
arch/arm/dts/am335x-rut.dts
arch/arm/dts/am335x-sancloud-bbe-extended-wifi.dts
arch/arm/dts/am335x-shc.dts
arch/arm/dts/am335x-sl50.dts
arch/arm/dts/am335x-wega.dtsi
arch/arm/dts/am33xx-clocks.dtsi
arch/arm/dts/am33xx-l4.dtsi
arch/arm/dts/am33xx.dtsi
arch/arm/dts/am3517-evm-ui.dtsi
arch/arm/dts/am3517-evm.dts
arch/arm/dts/am3517.dtsi

index 43fe03d096acbd6587987e27c45266501aa07a86..67dfcd8480cbbe247b01a7ef18a253daa37cb694 100644 (file)
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&davinci_mdio_default>;
        pinctrl-1 = <&davinci_mdio_sleep>;
-       status = "okay";
 
        ethphy0: ethernet-phy@0 {
                reg = <0>;
index 7cfddada934861bc1da2db9af61317a79707068b..486f24deb875c688313fe525c586970da0ff8dc4 100644 (file)
                audio-ports = < TDA998x_I2S     0x03>;
 
                ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
                        port@0 {
-                               hdmi_0: endpoint@0 {
+                               reg = <0>;
+
+                               hdmi_0: endpoint {
                                        remote-endpoint = <&lcdc_0>;
                                };
                        };
index 8b2b24c806709f657bf11e8edac50fd504dbd7c5..afa4fdc5dd2fdd3c8bcb61caad4eb96f9e9a48b0 100644 (file)
@@ -19,7 +19,7 @@
                regulator-name = "wlan-en-regulator";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
-               startup-delay-us= <70000>;
+               startup-delay-us = <70000>;
 
                /* WL_EN */
                gpio = <&gpio3 9 0>;
index 9312197316f008b4b1a6832366d4420384dfc640..b956e2f60fe0701bf35ccac55d0388017dc41a10 100644 (file)
                "NC",
                "NC";
 };
+
+&baseboard_eeprom {
+       vcc-supply = <&ldo4_reg>;
+};
index 856fdf58b0f4220dffc0bd9e4af85fa209f5911b..f04f46d6e5e5dbe1f45a2cfa8e6edb7b73325320 100644 (file)
                regulator-name = "wlan-en-regulator";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
-               startup-delay-us= <70000>;
+               startup-delay-us = <70000>;
 
                /* WL_EN */
                gpio = <&gpio3 9 0>;
index 74db0fc39397f86b0db1f5d0567cb6bf15c7ede9..b363d0324418f734d528fd83da7e6633f9be57b2 100644 (file)
@@ -18,7 +18,7 @@
                regulator-name = "wlan-en-regulator";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
-               startup-delay-us= <70000>;
+               startup-delay-us = <70000>;
 
                /* WL_EN */
                gpio = <&gpio0 26 0>;
index 737460eb867bb8ae9960e21caacdd064c4478e30..6e799621678bd73caeea3d6277cb945cd4d7661e 100644 (file)
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
 
-       vbat: fixedregulator@0 {
+       chosen {
+               stdout-path = &uart0;
+       };
+
+       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>;
                                0x0201006c>;    /* DOWN */
        };
 
-       gpio_keys: volume_keys@0 {
+       gpio_keys: volume-keys {
                compatible = "gpio-keys";
                autorepeat;
 
-               switch@9 {
+               switch-9 {
                        label = "volume-up";
                        linux,code = <115>;
                        gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
                        gpio-key,wakeup;
                };
 
-               switch@10 {
+               switch-10 {
                        label = "volume-down";
                        linux,code = <114>;
                        gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
                >;
        };
 
-       am335x_evm_audio_pins: am335x_evm_audio_pins {
+       mcasp1_pins: mcasp1_pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_CRS, PIN_INPUT_PULLDOWN, MUX_MODE4) /* mii1_crs.mcasp1_aclkx */
                        AM33XX_PADCONF(AM335X_PIN_MII1_RX_ER, PIN_INPUT_PULLDOWN, MUX_MODE4) /* mii1_rxerr.mcasp1_fsx */
 &epwmss0 {
        status = "okay";
 
-       ecap0: ecap@100 {
+       ecap0: pwm@100 {
                status = "okay";
                pinctrl-names = "default";
                pinctrl-0 = <&ecap0_pins>;
                #size-cells = <1>;
                partition@0 {
                        label = "NAND.SPL";
-                       reg = <0x00000000 0x000020000>;
+                       reg = <0x00000000 0x00020000>;
                };
                partition@1 {
                        label = "NAND.SPL.backup1";
 #include "tps65910.dtsi"
 
 &mcasp1 {
-               pinctrl-names = "default";
-               pinctrl-0 = <&am335x_evm_audio_pins>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&mcasp1_pins>;
 
-               status = "okay";
+       status = "okay";
 
-               op-mode = <0>;          /* MCASP_IIS_MODE */
-               tdm-slots = <2>;
-               /* 4 serializers */
-               serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
-                       0 0 1 2
-               >;
-               tx-num-evt = <32>;
-               rx-num-evt = <32>;
+       op-mode = <0>;          /* MCASP_IIS_MODE */
+       tdm-slots = <2>;
+       /* 4 serializers */
+       serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
+               0 0 1 2
+       >;
+       tx-num-evt = <32>;
+       rx-num-evt = <32>;
 };
 
 &tps {
index 4890e18c4a93fa9830729233743a45fcde85a731..5d962252b7db0c7adf0a1ad67f6a8a54c892d0c2 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";
@@ -60,7 +60,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>;
                };
        };
 
-       backlight {
+       lcd_bl: backlight {
                compatible = "pwm-backlight";
                pwms = <&ecap2 0 50000 PWM_POLARITY_INVERTED>;
                brightness-levels = <0 58 61 66 75 90 125 170 255>;
 &epwmss2 {
        status = "okay";
 
-       ecap2: ecap@100 {
+       ecap2: pwm@100 {
                status = "okay";
                pinctrl-names = "default";
                pinctrl-0 = <&ecap2_pins>;
 };
 
 &lcdc {
-      status = "okay";
+       status = "okay";
 };
 
 &rtc {
index 6c37e52a0de3161ceb2bcdbdd50ea203cc3b79f6..c2fd6101e32b6b1b200f8eac48cfd932bb1c10b0 100644 (file)
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
 
-       gpio_keys {
-               compatible = "gpio-keys";
+       guardian_buttons: gpio-keys {
                pinctrl-names = "default";
                pinctrl-0 = <&guardian_button_pins>;
+               compatible = "gpio-keys";
 
                select-button {
                        label = "guardian-select-button";
                };
        };
 
-       leds {
-               compatible = "gpio-leds";
+       guardian_leds: gpio-leds {
                pinctrl-names = "default";
                pinctrl-0 = <&guardian_led_pins>;
+               compatible = "gpio-leds";
 
                life-led {
                        label = "guardian:life-led";
@@ -98,7 +98,7 @@
 
        };
 
-       pwm7: dmtimer-pwm {
+       pwm7: pwm-7 {
                compatible = "ti,omap-dmtimer-pwm";
                ti,timers = <&timer7>;
                pinctrl-names = "default";
index cd7c4ae06276d77f5704e3669d1482a4044a57d1..a54272421cc829d0aaeb082f0fa4a5c07ba63b47 100644 (file)
                tick-timer = &timer2;
        };
 
-       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>;
@@ -34,7 +34,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 {
+       leds-iio {
                compatible = "gpio-leds";
-
-               led@0 {
+               led-out0 {
                        label = "out0";
                        gpios = <&tpic2810 0 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@1 {
+               led-out1 {
                        label = "out1";
                        gpios = <&tpic2810 1 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@2 {
+               led-out2 {
                        label = "out2";
                        gpios = <&tpic2810 2 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@3 {
+               led-out3 {
                        label = "out3";
                        gpios = <&tpic2810 3 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@4 {
+               led-out4 {
                        label = "out4";
                        gpios = <&tpic2810 4 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@5 {
+               led-out5 {
                        label = "out5";
                        gpios = <&tpic2810 5 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@6 {
+               led-out6 {
                        label = "out6";
                        gpios = <&tpic2810 6 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@7 {
+               led-out7 {
                        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";
        };
 };
 
+&spi0 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&spi0_pins_default>;
+
+       sn65hvs882@1 {
+               compatible = "pisosr-gpio";
+               gpio-controller;
+               #gpio-cells = <2>;
+
+               load-gpios = <&gpio3 18 GPIO_ACTIVE_LOW>;
+
+               reg = <1>;
+               spi-max-frequency = <1000000>;
+               spi-cpol;
+       };
+
+       spi_nor: flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "winbond,w25q64", "jedec,spi-nor";
+               spi-max-frequency = <80000000>;
+               m25p,fast-read;
+               reg = <0>;
+
+               partition@0 {
+                       label = "u-boot-spl";
+                       reg = <0x0 0x80000>;
+                       read-only;
+               };
+
+               partition@1 {
+                       label = "u-boot";
+                       reg = <0x80000 0x100000>;
+                       read-only;
+               };
+
+               partition@2 {
+                       label = "u-boot-env";
+                       reg = <0x180000 0x20000>;
+                       read-only;
+               };
+
+               partition@3 {
+                       label = "misc";
+                       reg = <0x1A0000 0x660000>;
+               };
+       };
+};
+
 #include "tps65910.dtsi"
 
 &tps {
 };
 
 &gpio3 {
-       p4 {
+       pr1-mii-ctl-hog {
                gpio-hog;
                gpios = <4 GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "PR1_MII_CTRL";
        };
 
-       p10 {
+       mux-mii-hog {
                gpio-hog;
                gpios = <10 GPIO_ACTIVE_HIGH>;
+               /* ETH1 mux: Low for MII-PRU, high for RMII-CPSW */
                output-high;
                line-name = "MUX_MII_CTRL";
        };
        };
 };
 
-&spi0 {
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&spi0_pins_default>;
-
-       sn65hvs882@1 {
-               compatible = "pisosr-gpio";
-               gpio-controller;
-               #gpio-cells = <2>;
-
-               load-gpios = <&gpio3 18 GPIO_ACTIVE_LOW>;
-
-               reg = <1>;
-               spi-max-frequency = <1000000>;
-               spi-cpol;
-       };
-
-       spi_nor: flash@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "winbond,w25q64", "jedec,spi-nor";
-               spi-max-frequency = <80000000>;
-               m25p,fast-read;
-               reg = <0>;
-
-               partition@0 {
-                       label = "u-boot-spl";
-                       reg = <0x0 0x80000>;
-                       read-only;
-               };
-
-               partition@1 {
-                       label = "u-boot";
-                       reg = <0x80000 0x100000>;
-                       read-only;
-               };
-
-               partition@2 {
-                       label = "u-boot-env";
-                       reg = <0x180000 0x20000>;
-                       read-only;
-               };
-
-               partition@3 {
-                       label = "misc";
-                       reg = <0x1A0000 0x660000>;
-               };
-       };
-};
index 911b894a683a3f4c4b07eb2244332500be0b9507..ad57c74fafc4da90f454b6eeeda561f4cbb25fa4 100644 (file)
                /* MTD partition table */
                partition@0 {
                        label = "SPL";
-                       reg = <0x00000000 0x000080000>;
+                       reg = <0x00000000 0x00080000>;
                };
 
                partition@1 {
 
                partition@4 {
                        label = "File System";
-                       reg = <0x00780000 0x007880000>;
+                       reg = <0x00780000 0x07880000>;
                };
        };
 };
index fb1f799a9eeea15fefc801584188af7f184198f8..582032461e757b3f44c9def721a26c589680dbf3 100644 (file)
                };
        };
 
-       mcp79400: mcp79400@6f {
+       mcp79400: rtc@6f {
                compatible = "microchip,mcp7940x";
                reg = <0x6f>;
        };
index ee6b1cb27ce550fd76c8f1d3de25b0599050f34c..3f9a4eada398dbff08048c389caa5ba9ac3f0f7c 100644 (file)
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
 
-       regulators {
-               compatible = "simple-bus";
-
-               vcc5v: fixedregulator0 {
-                       compatible = "regulator-fixed";
-                       regulator-name = "vcc5v";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-boot-on;
-                       regulator-always-on;
-               };
+       vcc5v: fixedregulator0 {
+               compatible = "regulator-fixed";
+               regulator-name = "vcc5v";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-boot-on;
+               regulator-always-on;
        };
 };
 
        pinctrl-0 = <&spi0_pins>;
        status = "okay";
 
-       serial_flash: m25p80@0 {
+       serial_flash: flash@0 {
                compatible = "jedec,spi-nor";
                spi-max-frequency = <48000000>;
                reg = <0x0>;
index 5cfd5731750f1f016008f83576e4249f46ff8752..b379e3a5570d4e8fd70ab69e996d909068d8538d 100644 (file)
 
                compatible = "gpio-leds";
 
-               usr0 {
+               led-usr0 {
                        label = "beaglebone:green:usr0";
                        gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";
                        default-state = "off";
                };
 
-               usr1 {
+               led-usr1 {
                        label = "beaglebone:green:usr1";
                        gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "mmc0";
                        default-state = "off";
                };
 
-               usr2 {
+               led-usr2 {
                        label = "beaglebone:green:usr2";
                        gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "cpu0";
                        default-state = "off";
                };
 
-               usr3 {
+               led-usr3 {
                        label = "beaglebone:green:usr3";
                        gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
index 645d221507b470f50fcda6acc6c08bebd7f39f20..a51d6aceb96f84290dccbe26d0eab92e2663fb0d 100644 (file)
 &epwmss0 {
        status = "okay";
 
-       ecap0: ecap@100 {
+       ecap0: pwm@100 {
                status = "okay";
                pinctrl-names = "default";
                pinctrl-0 = <&ecap0_pins>;
index cc06f5d23ad92f2da5b08993a6505de7597b146e..7760b9709a88bdb59982200c0dab1d9c36101af5 100644 (file)
 &epwmss0 {
        status = "okay";
 
-       ecap0: ecap@100 {
+       ecap0: pwm@100 {
                status = "okay";
                pinctrl-names = "default";
                pinctrl-0 = <&ecap0_pins>;
index 246a1a9b3e44f6b2cad0c4e36fc6ba2a86df30c5..a2676d10c24af1830ba6daabf22579db4f85f28c 100644 (file)
@@ -23,7 +23,7 @@
                regulator-name = "wlan-en-regulator";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
-               startup-delay-us= <100000>;
+               startup-delay-us = <100000>;
        };
 };
 
index 7724428e661e26cfcb679634ae17e600b28e6870..b44b15961bd00f92f4efa88660e9614f78ee15c9 100644 (file)
                };
        };
 
-       gpio_keys {
+       gpio-keys {
                compatible = "gpio-keys";
 
-               back_button {
+               back-button {
                        label = "Back Button";
                        gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>;
                        linux,code = <KEY_BACK>;
@@ -47,7 +47,7 @@
                        wakeup-source;
                };
 
-               front_button {
+               front-button {
                        label = "Front Button";
                        gpios = <&gpio1 25 GPIO_ACTIVE_HIGH>;
                        linux,code = <KEY_FRONT>;
 };
 
 &gpio1 {
-       hmtc_rst {
+       hmtc-rst-hog {
                gpio-hog;
                gpios = <24 GPIO_ACTIVE_LOW>;
                output-high;
                line-name = "homematic_reset";
        };
 
-       hmtc_prog {
+       hmtc-prog-hog {
                gpio-hog;
                gpios = <27 GPIO_ACTIVE_LOW>;
                output-high;
 };
 
 &gpio3 {
-       zgb_rst {
+       zgb-rst-hog {
                gpio-hog;
                gpios = <18 GPIO_ACTIVE_LOW>;
                output-low;
                line-name = "zigbee_reset";
        };
 
-       zgb_boot {
+       zgb-boot-hog {
                gpio-hog;
                gpios = <19 GPIO_ACTIVE_HIGH>;
                output-high;
index 644ba4b2c2cde1e76c0d960d4a726e858d2d8688..56c0943848aa85a83e470aca063d3d31879ed8b1 100644 (file)
                pinctrl-0 = <&led_pins>;
 
                led0 {
-                       label = "sl50:green:usr0";
+                       label = "sl50:red:usr0";
                        gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;
                        default-state = "off";
                };
 
                led1 {
-                       label = "sl50:red:usr1";
+                       label = "sl50:green:usr1";
                        gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
                        default-state = "off";
                };
 
                led2 {
-                       label = "sl50:green:usr2";
+                       label = "sl50:red:usr2";
                        gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;
                        default-state = "off";
                };
 
                led3 {
-                       label = "sl50:red:usr3";
+                       label = "sl50:green:usr3";
                        gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
                        default-state = "off";
                };
@@ -75,7 +75,7 @@
                #size-cells = <0>;
 
                /* audio external oscillator */
-               tlv320aic3x_mclk: oscillator@0 {
+               audio_mclk_fixed: oscillator@0 {
                        compatible = "fixed-clock";
                        #clock-cells = <0>;
                        clock-frequency  = <24576000>;  /* 24.576MHz */
@@ -88,7 +88,7 @@
                ti,audio-codec = <&audio_codec>;
                ti,mcasp-controller = <&mcasp0>;
 
-               clocks = <&tlv320aic3x_mclk>;
+               clocks = <&audio_mclk_fixed>;
                clock-names = "mclk";
 
                ti,audio-routing =
        pinctrl-names = "default";
        pinctrl-0 = <&spi0_pins>;
 
-       flash: n25q032@1 {
+       flash: flash@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "micron,n25q032";
index 3efcf31b84c0e98b1aef943853bfea96c974a770..408034df01105f0f63840d7c87ad7fe4dcce2fc4 100644 (file)
                compatible = "ti,da830-evm-audio";
        };
 
-       regulators {
-               compatible = "simple-bus";
-
-               vcc3v3: fixedregulator1 {
-                       compatible = "regulator-fixed";
-                       regulator-name = "vcc3v3";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-boot-on;
-               };
+       vcc3v3: fixedregulator1 {
+               compatible = "regulator-fixed";
+               regulator-name = "vcc3v3";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-boot-on;
        };
 };
 
index b7b7106f2deedc97eecb35f2b9b7c43b60f3a67a..2984b2f9f3cf02ac1bc5183beb1d3ac80e41d9a7 100644 (file)
@@ -5,7 +5,7 @@
  * Copyright (C) 2013 Texas Instruments, Inc.
  */
 &scm_clocks {
-       sys_clkin_ck: sys_clkin_ck@40 {
+       sys_clkin_ck: clock-sys-clkin-22@40 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&virt_19200000_ck>, <&virt_24000000_ck>, <&virt_25000000_ck>, <&virt_26000000_ck>;
@@ -13,7 +13,7 @@
                reg = <0x0040>;
        };
 
-       adc_tsc_fck: adc_tsc_fck {
+       adc_tsc_fck: clock-adc-tsc-fck {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&sys_clkin_ck>;
@@ -21,7 +21,7 @@
                clock-div = <1>;
        };
 
-       dcan0_fck: dcan0_fck {
+       dcan0_fck: clock-dcan0-fck {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&sys_clkin_ck>;
@@ -29,7 +29,7 @@
                clock-div = <1>;
        };
 
-       dcan1_fck: dcan1_fck {
+       dcan1_fck: clock-dcan1-fck {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&sys_clkin_ck>;
@@ -37,7 +37,7 @@
                clock-div = <1>;
        };
 
-       mcasp0_fck: mcasp0_fck {
+       mcasp0_fck: clock-mcasp0-fck {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&sys_clkin_ck>;
@@ -45,7 +45,7 @@
                clock-div = <1>;
        };
 
-       mcasp1_fck: mcasp1_fck {
+       mcasp1_fck: clock-mcasp1-fck {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&sys_clkin_ck>;
@@ -53,7 +53,7 @@
                clock-div = <1>;
        };
 
-       smartreflex0_fck: smartreflex0_fck {
+       smartreflex0_fck: clock-smartreflex0-fck {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&sys_clkin_ck>;
@@ -61,7 +61,7 @@
                clock-div = <1>;
        };
 
-       smartreflex1_fck: smartreflex1_fck {
+       smartreflex1_fck: clock-smartreflex1-fck {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&sys_clkin_ck>;
@@ -69,7 +69,7 @@
                clock-div = <1>;
        };
 
-       sha0_fck: sha0_fck {
+       sha0_fck: clock-sha0-fck {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&sys_clkin_ck>;
@@ -77,7 +77,7 @@
                clock-div = <1>;
        };
 
-       aes0_fck: aes0_fck {
+       aes0_fck: clock-aes0-fck {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&sys_clkin_ck>;
@@ -85,7 +85,7 @@
                clock-div = <1>;
        };
 
-       rng_fck: rng_fck {
+       rng_fck: clock-rng-fck {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&sys_clkin_ck>;
        };
 };
 &prcm_clocks {
-       clk_32768_ck: clk_32768_ck {
+       clk_32768_ck: clock-clk-32768 {
                #clock-cells = <0>;
                compatible = "fixed-clock";
                clock-frequency = <32768>;
        };
 
-       clk_rc32k_ck: clk_rc32k_ck {
+       clk_rc32k_ck: clock-clk-rc32k {
                #clock-cells = <0>;
                compatible = "fixed-clock";
                clock-frequency = <32000>;
        };
 
-       virt_19200000_ck: virt_19200000_ck {
+       virt_19200000_ck: clock-virt-19200000 {
                #clock-cells = <0>;
                compatible = "fixed-clock";
                clock-frequency = <19200000>;
        };
 
-       virt_24000000_ck: virt_24000000_ck {
+       virt_24000000_ck: clock-virt-24000000 {
                #clock-cells = <0>;
                compatible = "fixed-clock";
                clock-frequency = <24000000>;
        };
 
-       virt_25000000_ck: virt_25000000_ck {
+       virt_25000000_ck: clock-virt-25000000 {
                #clock-cells = <0>;
                compatible = "fixed-clock";
                clock-frequency = <25000000>;
        };
 
-       virt_26000000_ck: virt_26000000_ck {
+       virt_26000000_ck: clock-virt-26000000 {
                #clock-cells = <0>;
                compatible = "fixed-clock";
                clock-frequency = <26000000>;
        };
 
-       tclkin_ck: tclkin_ck {
+       tclkin_ck: clock-tclkin {
                #clock-cells = <0>;
                compatible = "fixed-clock";
                clock-frequency = <12000000>;
        };
 
-       dpll_core_ck: dpll_core_ck@490 {
+       dpll_core_ck: clock@490 {
                #clock-cells = <0>;
                compatible = "ti,am3-dpll-core-clock";
                clocks = <&sys_clkin_ck>, <&sys_clkin_ck>;
                reg = <0x0490>, <0x045c>, <0x0468>, <0x0460>, <0x0464>;
        };
 
-       dpll_core_x2_ck: dpll_core_x2_ck {
+       dpll_core_x2_ck: clock-dpll-core-x2 {
                #clock-cells = <0>;
                compatible = "ti,am3-dpll-x2-clock";
                clocks = <&dpll_core_ck>;
        };
 
-       dpll_core_m4_ck: dpll_core_m4_ck@480 {
+       dpll_core_m4_ck: clock-dpll-core-m4@480 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_core_x2_ck>;
                ti,index-starts-at-one;
        };
 
-       dpll_core_m5_ck: dpll_core_m5_ck@484 {
+       dpll_core_m5_ck: clock-dpll-core-m5@484 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_core_x2_ck>;
                ti,index-starts-at-one;
        };
 
-       dpll_core_m6_ck: dpll_core_m6_ck@4d8 {
+       dpll_core_m6_ck: clock-dpll-core-m6@4d8 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_core_x2_ck>;
                ti,index-starts-at-one;
        };
 
-       dpll_mpu_ck: dpll_mpu_ck@488 {
+       dpll_mpu_ck: clock@488 {
                #clock-cells = <0>;
                compatible = "ti,am3-dpll-clock";
                clocks = <&sys_clkin_ck>, <&sys_clkin_ck>;
                reg = <0x0488>, <0x0420>, <0x042c>, <0x0424>, <0x0428>;
        };
 
-       dpll_mpu_m2_ck: dpll_mpu_m2_ck@4a8 {
+       dpll_mpu_m2_ck: clock-dpll-mpu-m2@4a8 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_mpu_ck>;
                ti,index-starts-at-one;
        };
 
-       dpll_ddr_ck: dpll_ddr_ck@494 {
+       dpll_ddr_ck: clock@494 {
                #clock-cells = <0>;
                compatible = "ti,am3-dpll-no-gate-clock";
                clocks = <&sys_clkin_ck>, <&sys_clkin_ck>;
                reg = <0x0494>, <0x0434>, <0x0440>, <0x0438>, <0x043c>;
        };
 
-       dpll_ddr_m2_ck: dpll_ddr_m2_ck@4a0 {
+       dpll_ddr_m2_ck: clock-dpll-ddr-m2@4a0 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_ddr_ck>;
                ti,index-starts-at-one;
        };
 
-       dpll_ddr_m2_div2_ck: dpll_ddr_m2_div2_ck {
+       dpll_ddr_m2_div2_ck: clock-dpll-ddr-m2-div2 {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&dpll_ddr_m2_ck>;
                clock-div = <2>;
        };
 
-       dpll_disp_ck: dpll_disp_ck@498 {
+       dpll_disp_ck: clock@498 {
                #clock-cells = <0>;
                compatible = "ti,am3-dpll-no-gate-clock";
                clocks = <&sys_clkin_ck>, <&sys_clkin_ck>;
                reg = <0x0498>, <0x0448>, <0x0454>, <0x044c>, <0x0450>;
        };
 
-       dpll_disp_m2_ck: dpll_disp_m2_ck@4a4 {
+       dpll_disp_m2_ck: clock-dpll-disp-m2@4a4 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_disp_ck>;
                ti,set-rate-parent;
        };
 
-       dpll_per_ck: dpll_per_ck@48c {
+       dpll_per_ck: clock@48c {
                #clock-cells = <0>;
                compatible = "ti,am3-dpll-no-gate-j-type-clock";
                clocks = <&sys_clkin_ck>, <&sys_clkin_ck>;
                reg = <0x048c>, <0x0470>, <0x049c>, <0x0474>, <0x0478>;
        };
 
-       dpll_per_m2_ck: dpll_per_m2_ck@4ac {
+       dpll_per_m2_ck: clock-dpll-per-m2@4ac {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_per_ck>;
                ti,index-starts-at-one;
        };
 
-       dpll_per_m2_div4_wkupdm_ck: dpll_per_m2_div4_wkupdm_ck {
+       dpll_per_m2_div4_wkupdm_ck: clock-dpll-per-m2-div4-wkupdm {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&dpll_per_m2_ck>;
                clock-div = <4>;
        };
 
-       dpll_per_m2_div4_ck: dpll_per_m2_div4_ck {
+       dpll_per_m2_div4_ck: clock-dpll-per-m2-div4 {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&dpll_per_m2_ck>;
                clock-div = <4>;
        };
 
-       clk_24mhz: clk_24mhz {
+       clk_24mhz: clock-clk-24mhz {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&dpll_per_m2_ck>;
                clock-div = <8>;
        };
 
-       clkdiv32k_ck: clkdiv32k_ck {
+       clkdiv32k_ck: clock-clkdiv32k {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&clk_24mhz>;
                clock-div = <732>;
        };
 
-       l3_gclk: l3_gclk {
+       l3_gclk: clock-l3-gclk {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&dpll_core_m4_ck>;
                clock-div = <1>;
        };
 
-       pruss_ocp_gclk: pruss_ocp_gclk@530 {
+       pruss_ocp_gclk: clock-pruss-ocp-gclk@530 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&l3_gclk>, <&dpll_disp_m2_ck>;
                reg = <0x0530>;
        };
 
-       mmu_fck: mmu_fck@914 {
+       mmu_fck: clock-mmu-fck-1@914 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&dpll_core_m4_ck>;
                reg = <0x0914>;
        };
 
-       timer1_fck: timer1_fck@528 {
+       timer1_fck: clock-timer1-fck@528 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>, <&tclkin_ck>, <&clk_rc32k_ck>, <&clk_32768_ck>;
                reg = <0x0528>;
        };
 
-       timer2_fck: timer2_fck@508 {
+       timer2_fck: clock-timer2-fck@508 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;
                reg = <0x0508>;
        };
 
-       timer3_fck: timer3_fck@50c {
+       timer3_fck: clock-timer3-fck@50c {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;
                reg = <0x050c>;
        };
 
-       timer4_fck: timer4_fck@510 {
+       timer4_fck: clock-timer4-fck@510 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;
                reg = <0x0510>;
        };
 
-       timer5_fck: timer5_fck@518 {
+       timer5_fck: clock-timer5-fck@518 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;
                reg = <0x0518>;
        };
 
-       timer6_fck: timer6_fck@51c {
+       timer6_fck: clock-timer6-fck@51c {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;
                reg = <0x051c>;
        };
 
-       timer7_fck: timer7_fck@504 {
+       timer7_fck: clock-timer7-fck@504 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;
                reg = <0x0504>;
        };
 
-       usbotg_fck: usbotg_fck@47c {
+       usbotg_fck: clock-usbotg-fck-8@47c {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&dpll_per_ck>;
                reg = <0x047c>;
        };
 
-       dpll_core_m4_div2_ck: dpll_core_m4_div2_ck {
+       dpll_core_m4_div2_ck: clock-dpll-core-m4-div2 {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&dpll_core_m4_ck>;
                clock-div = <2>;
        };
 
-       ieee5000_fck: ieee5000_fck@e4 {
+       ieee5000_fck: clock-ieee5000-fck-1@e4 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&dpll_core_m4_div2_ck>;
                reg = <0x00e4>;
        };
 
-       wdt1_fck: wdt1_fck@538 {
+       wdt1_fck: clock-wdt1-fck@538 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&clk_rc32k_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;
                reg = <0x0538>;
        };
 
-       l4_rtc_gclk: l4_rtc_gclk {
+       l4_rtc_gclk: clock-l4-rtc-gclk {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&dpll_core_m4_ck>;
                clock-div = <2>;
        };
 
-       l4hs_gclk: l4hs_gclk {
+       l4hs_gclk: clock-l4hs-gclk {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&dpll_core_m4_ck>;
                clock-div = <1>;
        };
 
-       l3s_gclk: l3s_gclk {
+       l3s_gclk: clock-l3s-gclk {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&dpll_core_m4_div2_ck>;
                clock-div = <1>;
        };
 
-       l4fw_gclk: l4fw_gclk {
+       l4fw_gclk: clock-l4fw-gclk {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&dpll_core_m4_div2_ck>;
                clock-div = <1>;
        };
 
-       l4ls_gclk: l4ls_gclk {
+       l4ls_gclk: clock-l4ls-gclk {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&dpll_core_m4_div2_ck>;
                clock-div = <1>;
        };
 
-       sysclk_div_ck: sysclk_div_ck {
+       sysclk_div_ck: clock-sysclk-div {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&dpll_core_m4_ck>;
                clock-div = <1>;
        };
 
-       cpsw_125mhz_gclk: cpsw_125mhz_gclk {
+       cpsw_125mhz_gclk: clock-cpsw-125mhz-gclk {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&dpll_core_m5_ck>;
                clock-div = <2>;
        };
 
-       cpsw_cpts_rft_clk: cpsw_cpts_rft_clk@520 {
+       cpsw_cpts_rft_clk: clock-cpsw-cpts-rft@520 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&dpll_core_m5_ck>, <&dpll_core_m4_ck>;
                reg = <0x0520>;
        };
 
-       gpio0_dbclk_mux_ck: gpio0_dbclk_mux_ck@53c {
+       gpio0_dbclk_mux_ck: clock-gpio0-dbclk-mux@53c {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&clk_rc32k_ck>, <&clk_32768_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;
                reg = <0x053c>;
        };
 
-       lcd_gclk: lcd_gclk@534 {
+       lcd_gclk: clock-lcd-gclk@534 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&dpll_disp_m2_ck>, <&dpll_core_m5_ck>, <&dpll_per_m2_ck>;
                ti,set-rate-parent;
        };
 
-       mmc_clk: mmc_clk {
+       mmc_clk: clock-mmc {
                #clock-cells = <0>;
                compatible = "fixed-factor-clock";
                clocks = <&dpll_per_m2_ck>;
 };
 
 &prcm {
-       per_cm: per-cm@0 {
+       per_cm: clock@0 {
                compatible = "ti,omap4-cm";
                reg = <0x0 0x400>;
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0 0x0 0x400>;
 
-               l4ls_clkctrl: l4ls-clkctrl@38 {
+               l4ls_clkctrl: clock@38 {
                        compatible = "ti,clkctrl";
                        reg = <0x38 0x2c>, <0x6c 0x28>, <0xac 0xc>, <0xc0 0x1c>, <0xec 0xc>, <0x10c 0x8>, <0x130 0x4>;
                        #clock-cells = <2>;
                };
 
-               l3s_clkctrl: l3s-clkctrl@1c {
+               l3s_clkctrl: clock@1c {
                        compatible = "ti,clkctrl";
                        reg = <0x1c 0x4>, <0x30 0x8>, <0x68 0x4>, <0xf8 0x4>;
                        #clock-cells = <2>;
                };
 
-               l3_clkctrl: l3-clkctrl@24 {
+               l3_clkctrl: clock@24 {
                        compatible = "ti,clkctrl";
                        reg = <0x24 0xc>, <0x94 0x10>, <0xbc 0x4>, <0xdc 0x8>, <0xfc 0x8>;
                        #clock-cells = <2>;
                };
 
-               l4hs_clkctrl: l4hs-clkctrl@120 {
+               l4hs_clkctrl: clock@120 {
                        compatible = "ti,clkctrl";
                        reg = <0x120 0x4>;
                        #clock-cells = <2>;
                };
 
-               pruss_ocp_clkctrl: pruss-ocp-clkctrl@e8 {
+               pruss_ocp_clkctrl: clock@e8 {
                        compatible = "ti,clkctrl";
                        reg = <0xe8 0x4>;
                        #clock-cells = <2>;
                };
 
-               cpsw_125mhz_clkctrl: cpsw-125mhz-clkctrl@0 {
+               cpsw_125mhz_clkctrl: clock@0 {
                        compatible = "ti,clkctrl";
                        reg = <0x0 0x18>;
                        #clock-cells = <2>;
                };
 
-               lcdc_clkctrl: lcdc-clkctrl@18 {
+               lcdc_clkctrl: clock@18 {
                        compatible = "ti,clkctrl";
                        reg = <0x18 0x4>;
                        #clock-cells = <2>;
                };
 
-               clk_24mhz_clkctrl: clk-24mhz-clkctrl@14c {
+               clk_24mhz_clkctrl: clock@14c {
                        compatible = "ti,clkctrl";
                        reg = <0x14c 0x4>;
                        #clock-cells = <2>;
                };
        };
 
-       wkup_cm: wkup-cm@400 {
+       wkup_cm: clock@400 {
                compatible = "ti,omap4-cm";
                reg = <0x400 0x100>;
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0 0x400 0x100>;
 
-               l4_wkup_clkctrl: l4-wkup-clkctrl@0 {
+               l4_wkup_clkctrl: clock@0 {
                        compatible = "ti,clkctrl";
                        reg = <0x0 0x10>, <0xb4 0x24>;
                        #clock-cells = <2>;
                };
 
-               l3_aon_clkctrl: l3-aon-clkctrl@14 {
+               l3_aon_clkctrl: clock@14 {
                        compatible = "ti,clkctrl";
                        reg = <0x14 0x4>;
                        #clock-cells = <2>;
                };
 
-               l4_wkup_aon_clkctrl: l4-wkup-aon-clkctrl@b0 {
+               l4_wkup_aon_clkctrl: clock@b0 {
                        compatible = "ti,clkctrl";
                        reg = <0xb0 0x4>;
                        #clock-cells = <2>;
                };
        };
 
-       mpu_cm: mpu-cm@600 {
+       mpu_cm: clock@600 {
                compatible = "ti,omap4-cm";
                reg = <0x600 0x100>;
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0 0x600 0x100>;
 
-               mpu_clkctrl: mpu-clkctrl@0 {
+               mpu_clkctrl: clock@0 {
                        compatible = "ti,clkctrl";
                        reg = <0x0 0x8>;
                        #clock-cells = <2>;
                };
        };
 
-       l4_rtc_cm: l4-rtc-cm@800 {
+       l4_rtc_cm: clock@800 {
                compatible = "ti,omap4-cm";
                reg = <0x800 0x100>;
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0 0x800 0x100>;
 
-               l4_rtc_clkctrl: l4-rtc-clkctrl@0 {
+               l4_rtc_clkctrl: clock@0 {
                        compatible = "ti,clkctrl";
                        reg = <0x0 0x4>;
                        #clock-cells = <2>;
                };
        };
 
-       gfx_l3_cm: gfx-l3-cm@900 {
+       gfx_l3_cm: clock@900 {
                compatible = "ti,omap4-cm";
                reg = <0x900 0x100>;
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0 0x900 0x100>;
 
-               gfx_l3_clkctrl: gfx-l3-clkctrl@0 {
+               gfx_l3_clkctrl: clock@0 {
                        compatible = "ti,clkctrl";
                        reg = <0x0 0x8>;
                        #clock-cells = <2>;
                };
        };
 
-       l4_cefuse_cm: l4-cefuse-cm@a00 {
+       l4_cefuse_cm: clock@a00 {
                compatible = "ti,omap4-cm";
                reg = <0xa00 0x100>;
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0 0xa00 0x100>;
 
-               l4_cefuse_clkctrl: l4-cefuse-clkctrl@0 {
+               l4_cefuse_clkctrl: clock@0 {
                        compatible = "ti,clkctrl";
                        reg = <0x0 0x24>;
                        #clock-cells = <2>;
index 5892612efa8079ed9820d46c12d866d523918d55..2264a1a80d01e6dd74813ca11949dec67f3f19cc 100644 (file)
                                #mbox-cells = <1>;
                                ti,mbox-num-users = <4>;
                                ti,mbox-num-fifos = <8>;
-                               mbox_wkupm3: wkup_m3 {
+                               mbox_wkupm3: mbox-wkup-m3 {
                                        ti,mbox-send-noirq;
                                        ti,mbox-tx = <0 0 0>;
                                        ti,mbox-rx = <0 0 3>;
                        };
                };
 
-               target-module@ae000 {                   /* 0x481ae000, ap 56 3a.0 */
+               target-module@ae000 {           /* 0x481ae000, ap 56 3a.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
                        reg = <0xae000 0x4>,
                              <0xae010 0x4>,
                                status = "disabled";
                                ranges = <0 0 0x1000>;
 
-                               ecap0: ecap@100 {
+                               ecap0: pwm@100 {
                                        compatible = "ti,am3352-ecap",
                                                     "ti,am33xx-ecap";
                                        #pwm-cells = <3>;
                                status = "disabled";
                                ranges = <0 0 0x1000>;
 
-                               ecap1: ecap@100 {
+                               ecap1: pwm@100 {
                                        compatible = "ti,am3352-ecap",
                                                     "ti,am33xx-ecap";
                                        #pwm-cells = <3>;
                                status = "disabled";
                                ranges = <0 0 0x1000>;
 
-                               ecap2: ecap@100 {
+                               ecap2: pwm@100 {
                                        compatible = "ti,am3352-ecap",
                                                     "ti,am33xx-ecap";
                                        #pwm-cells = <3>;
index a9ce8fdd3d546447990d17b4adbd7908795e41ca..3c7e0385f36405c3b580892b307b861be4a5582c 100644 (file)
         * for the moment, just use a fake OCP bus entry to represent
         * the whole bus hierarchy.
         */
-       ocp {
+       ocp: ocp {
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;
                        ranges = <0x0 0x47810000 0x1000>;
 
                        mmc3: mmc@0 {
-                             compatible = "ti,am335-sdhci";
-                             ti,needs-special-reset;
-                             interrupts = <29>;
-                             reg = <0x0 0x1000>;
-                             status = "disabled";
+                               compatible = "ti,am335-sdhci";
+                               ti,needs-special-reset;
+                               interrupts = <29>;
+                               reg = <0x0 0x1000>;
+                               status = "disabled";
                        };
                };
 
index 340e68178ce64491f8736209c499eb624272c885..75ad42179aeebeb9e1b43f39cf6f0719ba2235b7 100644 (file)
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
-               record {
+               key-record {
                        label = "Record";
-                       linux,code = <KEY_RECORD>;
+                       /* linux,code = <BTN_0>; */
                        gpios = <&tca6416_2 15 GPIO_ACTIVE_LOW>;
                };
 
-               play {
+               key-play {
                        label = "Play";
                        linux,code = <KEY_PLAY>;
                        gpios = <&tca6416_2 14 GPIO_ACTIVE_LOW>;
                };
 
-               Stop {
+               key-stop {
                        label = "Stop";
                        linux,code = <KEY_STOP>;
                        gpios = <&tca6416_2 13 GPIO_ACTIVE_LOW>;
                };
 
-               fwd {
+               key-fwd {
                        label = "FWD";
                        linux,code = <KEY_FASTFORWARD>;
                        gpios = <&tca6416_2 12 GPIO_ACTIVE_LOW>;
                };
 
-               rwd {
+               key-rwd {
                        label = "RWD";
                        linux,code = <KEY_REWIND>;
                        gpios = <&tca6416_2 11 GPIO_ACTIVE_LOW>;
                };
 
-               shift {
+               key-shift {
                        label = "Shift";
                        linux,code = <KEY_LEFTSHIFT>;
                        gpios = <&tca6416_2 10 GPIO_ACTIVE_LOW>;
                };
 
-               Mode {
+               key-mode {
                        label = "Mode";
                        linux,code = <BTN_MODE>;
                        gpios = <&tca6416_2 9 GPIO_ACTIVE_LOW>;
                };
 
-               Menu {
+               key-menu {
                        label = "Menu";
                        linux,code = <KEY_MENU>;
                        gpios = <&tca6416_2 8 GPIO_ACTIVE_LOW>;
                };
 
-               Up {
+               key-up {
                        label = "Up";
                        linux,code = <KEY_UP>;
                        gpios = <&tca6416_2 7 GPIO_ACTIVE_LOW>;
                };
 
-               Down {
+               key-down {
                        label = "Down";
                        linux,code = <KEY_DOWN>;
                        gpios = <&tca6416_2 6 GPIO_ACTIVE_LOW>;
        tlv320aic23_1: codec@1a {
                compatible = "ti,tlv320aic23";
                reg = <0x1a>;
-               #sound-dai-cells= <0>;
+               #sound-dai-cells = <0>;
                status = "okay";
        };
 
        tlv320aic23_2: codec@1b {
                compatible = "ti,tlv320aic23";
                reg = <0x1b>;
-               #sound-dai-cells= <0>;
+               #sound-dai-cells = <0>;
                status = "okay";
        };
 };
        tlv320aic23_3: codec@1a {
                compatible = "ti,tlv320aic23";
                reg = <0x1a>;
-               #sound-dai-cells= <0>;
+               #sound-dai-cells = <0>;
                status = "okay";
        };
 
index a01f9cf047d055e53171f445af13fc962bb9efdd..d21bb2ccd0f500cce3db499effb1bce2989897b8 100644 (file)
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
 
-        vmmc_fixed: vmmc {
-                compatible = "regulator-fixed";
-                regulator-name = "vmmc_fixed";
-                regulator-min-microvolt = <3300000>;
-                regulator-max-microvolt = <3300000>;
-        };
+       vmmc_fixed: vmmc {
+               compatible = "regulator-fixed";
+               regulator-name = "vmmc_fixed";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+       };
 
        gpio-keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
-               user_pb {
+               button-user {
                        label = "User Push Button";
                        linux,code = <BTN_0>;
                        gpios = <&tca6416 5 GPIO_ACTIVE_LOW>;
                };
 
-               user_sw_1 {
+               switch-1 {
                        label = "User Switch 1";
                        linux,code = <BTN_1>;
                        gpios = <&tca6416 8 GPIO_ACTIVE_LOW>;
                };
 
-               user_sw_2 {
+               switch-2 {
                        label = "User Switch 2";
                        linux,code = <BTN_2>;
                        gpios = <&tca6416 9 GPIO_ACTIVE_LOW>;
                };
 
-               user_sw_3 {
+               switch-3 {
                        label = "User Switch 3";
                        linux,code = <BTN_3>;
                        gpios = <&tca6416 10 GPIO_ACTIVE_LOW>;
                };
 
-               user_sw_4 {
+               switch-4 {
                        label = "User Switch 4";
                        linux,code = <BTN_4>;
                        gpios = <&tca6416 11 GPIO_ACTIVE_LOW>;
                };
 
-               user_sw_5 {
+               switch-5 {
                        label = "User Switch 5";
                        linux,code = <BTN_5>;
                        gpios = <&tca6416 12 GPIO_ACTIVE_LOW>;
                };
 
-               user_sw_6 {
+               switch-6 {
                        label = "User Switch 6";
                        linux,code = <BTN_6>;
                        gpios = <&tca6416 13 GPIO_ACTIVE_LOW>;
                };
 
-               user_sw_7 {
+               switch-7 {
                        label = "User Switch 7";
                        linux,code = <BTN_7>;
                        gpios = <&tca6416 14 GPIO_ACTIVE_LOW>;
                };
 
-               user_sw_8 {
+               switch-8 {
                        label = "User Switch 8";
                        linux,code = <BTN_8>;
                        gpios = <&tca6416 15 GPIO_ACTIVE_LOW>;
                enable-gpios = <&gpio6 22 GPIO_ACTIVE_HIGH>; /* gpio_182 */
        };
 
-       pwm11: dmtimer-pwm@11 {
+       pwm11: pwm-11 {
                compatible = "ti,omap-dmtimer-pwm";
                pinctrl-names = "default";
                pinctrl-0 = <&pwm_pins>;
 };
 
 &davinci_mdio {
-            status = "okay";
+       status = "okay";
 };
 
 &dss {
 };
 
 &mmc3 {
-      status = "disabled";
+       status = "disabled";
 };
 
 &usbhshost {
index 71f2b7b970cef14ab8fa709def0e4b25f02cf965..2633fae14b3012e0081cb6183eea280602073b7a 100644 (file)
@@ -40,7 +40,7 @@
                        clock-names = "ick";
                };
 
-               davinci_mdio: ethernet@5c030000 {
+               davinci_mdio: mdio@5c030000 {
                        compatible = "ti,davinci_mdio";
                        ti,hwmods = "davinci_mdio";
                        status = "disabled";