Merge tag 'v5.7-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git...

Improvements for the rk3288-vyasa board and a lot of cleanups from
verifying devicetrees against new yaml bindings.

* tag 'v5.7-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (25 commits)
  ARM: dts: rockchip: remove #address-cells and #size-cells from i2s nodes
  ARM: dts: rockchip: swap clocks and clock-names values for i2s nodes
  ARM: dts: rockchip: remove clock-names property from 'generic-ohci' nodes
  ARM: dts: rockchip: remove clock-names property from 'generic-ehci' nodes
  ARM: dts: rockchip: swap clocks and clock-names values for spdif nodes
  ARM: dts: rockchip: Keep rk3288-tinker SD card IO powered during reboot
  ARM: dts: rockchip: remove clock-frequency from saradc node rv1108
  ARM: dts: rockchip: fix vref-supply for &saradc node rk3288 firefly reload
  ARM: dts: rockchip: use DMA channels for UARTs for RK3288
  ARM: dts: rockchip: rk3xxx: fix L2 cache-controller nodename
  ARM: dts: rockchip: fix lvds-encoder ports subnode for rk3188-bqedison2qc
  ARM: dts: add bus to rockchip amba nodenames
  ARM: dts: rockchip: remove #dma-cells from dma client nodes for rv1108
  ARM: dts: rockchip: fix rockchip,default-sample-phase property names
  ARM: dts: rockchip: fix vqmmc-supply property name for rk3188-bqedison2qc
  dt-bindings: arm: add Rockchip rk3036-evb board
  dt-bindings: arm: fix Rockchip Kylin board bindings
  ARM: dts: rockchip: add missing model properties
  ARM: dts: rockchip: Add vcc50_hdmi for rk3288-vyasa
  ARM: dts: rockchip: Fix ddc-i2c-bus for rk3288-vyasa
  ...

Link: https://lore.kernel.org/r/7846023.TtVhTo4ACP@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
index 874b0ea..d303790 100644 (file)
--- a/Documentation/devicetree/bindings/arm/rockchip.yaml
+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
@@ -443,7 +443,7 @@ properties:
 
       - description: Rockchip Kylin
         items:
-          - const: rockchip,kylin-rk3036
+          - const: rockchip,rk3036-kylin
           - const: rockchip,rk3036
 
       - description: Rockchip PX3 Evaluation board
@@ -468,6 +468,11 @@ properties:
           - const: rockchip,r88
           - const: rockchip,rk3368
 
+      - description: Rockchip RK3036 Evaluation board
+        items:
+          - const: rockchip,rk3036-evb
+          - const: rockchip,rk3036
+
       - description: Rockchip RK3228 Evaluation board
         items:
           - const: rockchip,rk3228-evb

diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts
index fb3cf00..2ff9f15 100644 (file)
--- a/arch/arm/boot/dts/rk3036-kylin.dts
+++ b/arch/arm/boot/dts/rk3036-kylin.dts
@@ -319,7 +319,7 @@
        bus-width = <4>;
        cap-sd-highspeed;
        cap-sdio-irq;
-       default-sample-phase = <90>;
+       rockchip,default-sample-phase = <90>;
        keep-power-in-suspend;
        mmc-pwrseq = <&sdio_pwrseq>;
        non-removable;

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index cf36e25..781ac75 100644 (file)
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -54,7 +54,7 @@
                };
        };
 
-       amba {
+       amba: bus {
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;
@@ -101,7 +101,7 @@
                #clock-cells = <0>;
        };
 
-       bus_intmem@10080000 {
+       bus_intmem: sram@10080000 {
                compatible = "mmio-sram";
                reg = <0x10080000 0x2000>;
                #address-cells = <1>;
@@ -263,7 +263,7 @@
                clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
                         <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
                clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
-               default-sample-phase = <158>;
+               rockchip,default-sample-phase = <158>;
                disable-wp;
                dmas = <&pdma 12>;
                dma-names = "rx-tx";
@@ -281,8 +281,6 @@
                compatible = "rockchip,rk3036-i2s", "rockchip,rk3066-i2s";
                reg = <0x10220000 0x4000>;
                interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
-               #address-cells = <1>;
-               #size-cells = <0>;
                clock-names = "i2s_clk", "i2s_hclk";
                clocks = <&cru SCLK_I2S>, <&cru HCLK_I2S>;
                dmas = <&pdma 0>, <&pdma 1>;

diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi
index 3d1b02f..b599394 100644 (file)
--- a/arch/arm/boot/dts/rk3066a.dtsi
+++ b/arch/arm/boot/dts/rk3066a.dtsi
@@ -156,14 +156,12 @@
                compatible = "rockchip,rk3066-i2s";
                reg = <0x10118000 0x2000>;
                interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
-               #address-cells = <1>;
-               #size-cells = <0>;
                pinctrl-names = "default";
                pinctrl-0 = <&i2s0_bus>;
+               clocks = <&cru SCLK_I2S0>, <&cru HCLK_I2S0>;
+               clock-names = "i2s_clk", "i2s_hclk";
                dmas = <&dmac1_s 4>, <&dmac1_s 5>;
                dma-names = "tx", "rx";
-               clock-names = "i2s_hclk", "i2s_clk";
-               clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>;
                rockchip,playback-channels = <8>;
                rockchip,capture-channels = <2>;
                #sound-dai-cells = <0>;
@@ -174,14 +172,12 @@
                compatible = "rockchip,rk3066-i2s";
                reg = <0x1011a000 0x2000>;
                interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
-               #address-cells = <1>;
-               #size-cells = <0>;
                pinctrl-names = "default";
                pinctrl-0 = <&i2s1_bus>;
+               clocks = <&cru SCLK_I2S1>, <&cru HCLK_I2S1>;
+               clock-names = "i2s_clk", "i2s_hclk";
                dmas = <&dmac1_s 6>, <&dmac1_s 7>;
                dma-names = "tx", "rx";
-               clock-names = "i2s_hclk", "i2s_clk";
-               clocks = <&cru HCLK_I2S1>, <&cru SCLK_I2S1>;
                rockchip,playback-channels = <2>;
                rockchip,capture-channels = <2>;
                #sound-dai-cells = <0>;
@@ -192,14 +188,12 @@
                compatible = "rockchip,rk3066-i2s";
                reg = <0x1011c000 0x2000>;
                interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
-               #address-cells = <1>;
-               #size-cells = <0>;
                pinctrl-names = "default";
                pinctrl-0 = <&i2s2_bus>;
+               clocks = <&cru SCLK_I2S2>, <&cru HCLK_I2S2>;
+               clock-names = "i2s_clk", "i2s_hclk";
                dmas = <&dmac1_s 9>, <&dmac1_s 10>;
                dma-names = "tx", "rx";
-               clock-names = "i2s_hclk", "i2s_clk";
-               clocks = <&cru HCLK_I2S2>, <&cru SCLK_I2S2>;
                rockchip,playback-channels = <2>;
                rockchip,capture-channels = <2>;
                #sound-dai-cells = <0>;

diff --git a/arch/arm/boot/dts/rk3188-bqedison2qc.dts b/arch/arm/boot/dts/rk3188-bqedison2qc.dts
index ad1afd4..66a0ff1 100644 (file)
--- a/arch/arm/boot/dts/rk3188-bqedison2qc.dts
+++ b/arch/arm/boot/dts/rk3188-bqedison2qc.dts
@@ -58,20 +58,25 @@
 
        lvds-encoder {
                compatible = "ti,sn75lvds83", "lvds-encoder";
-               #address-cells = <1>;
-               #size-cells = <0>;
 
-               port@0 {
-                       reg = <0>;
-                       lvds_in_vop0: endpoint {
-                               remote-endpoint = <&vop0_out_lvds>;
+               ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       port@0 {
+                               reg = <0>;
+
+                               lvds_in_vop0: endpoint {
+                                       remote-endpoint = <&vop0_out_lvds>;
+                               };
                        };
-               };
 
-               port@1 {
-                       reg = <1>;
-                       lvds_out_panel: endpoint {
-                               remote-endpoint = <&panel_in_lvds>;
+                       port@1 {
+                               reg = <1>;
+
+                               lvds_out_panel: endpoint {
+                                       remote-endpoint = <&panel_in_lvds>;
+                               };
                        };
                };
        };
@@ -465,7 +470,7 @@
        non-removable;
        pinctrl-names = "default";
        pinctrl-0 = <&sd1_clk>, <&sd1_cmd>, <&sd1_bus4>;
-       vmmcq-supply = <&vccio_wl>;
+       vqmmc-supply = <&vccio_wl>;
        #address-cells = <1>;
        #size-cells = <0>;
        status = "okay";

diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index 10ede65..2298a8d 100644 (file)
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -166,14 +166,12 @@
                compatible = "rockchip,rk3188-i2s", "rockchip,rk3066-i2s";
                reg = <0x1011a000 0x2000>;
                interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
-               #address-cells = <1>;
-               #size-cells = <0>;
                pinctrl-names = "default";
                pinctrl-0 = <&i2s0_bus>;
+               clocks = <&cru SCLK_I2S0>, <&cru HCLK_I2S0>;
+               clock-names = "i2s_clk", "i2s_hclk";
                dmas = <&dmac1_s 6>, <&dmac1_s 7>;
                dma-names = "tx", "rx";
-               clock-names = "i2s_hclk", "i2s_clk";
-               clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>;
                rockchip,playback-channels = <2>;
                rockchip,capture-channels = <2>;
                #sound-dai-cells = <0>;
@@ -184,8 +182,8 @@
                compatible = "rockchip,rk3188-spdif", "rockchip,rk3066-spdif";
                reg = <0x1011e000 0x2000>;
                #sound-dai-cells = <0>;
-               clock-names = "hclk", "mclk";
-               clocks = <&cru HCLK_SPDIF>, <&cru SCLK_SPDIF>;
+               clocks = <&cru SCLK_SPDIF>, <&cru HCLK_SPDIF>;
+               clock-names = "mclk", "hclk";
                dmas = <&dmac1_s 8>;
                dma-names = "tx";
                interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index 4e90efd..06172eb 100644 (file)
--- a/arch/arm/boot/dts/rk322x.dtsi
+++ b/arch/arm/boot/dts/rk322x.dtsi
@@ -95,7 +95,7 @@
                };
        };
 
-       amba {
+       amba: bus {
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;
@@ -152,8 +152,6 @@
                compatible = "rockchip,rk3228-i2s", "rockchip,rk3066-i2s";
                reg = <0x100b0000 0x4000>;
                interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
-               #address-cells = <1>;
-               #size-cells = <0>;
                clock-names = "i2s_clk", "i2s_hclk";
                clocks = <&cru SCLK_I2S1>, <&cru HCLK_I2S1_8CH>;
                dmas = <&pdma 14>, <&pdma 15>;
@@ -167,8 +165,6 @@
                compatible = "rockchip,rk3228-i2s", "rockchip,rk3066-i2s";
                reg = <0x100c0000 0x4000>;
                interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
-               #address-cells = <1>;
-               #size-cells = <0>;
                clock-names = "i2s_clk", "i2s_hclk";
                clocks = <&cru SCLK_I2S0>, <&cru HCLK_I2S0_8CH>;
                dmas = <&pdma 11>, <&pdma 12>;
@@ -193,8 +189,6 @@
                compatible = "rockchip,rk3228-i2s", "rockchip,rk3066-i2s";
                reg = <0x100e0000 0x4000>;
                interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
-               #address-cells = <1>;
-               #size-cells = <0>;
                clock-names = "i2s_clk", "i2s_hclk";
                clocks = <&cru SCLK_I2S2>, <&cru HCLK_I2S2_2CH>;
                dmas = <&pdma 0>, <&pdma 1>;
@@ -698,7 +692,7 @@
                         <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
                clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
                bus-width = <8>;
-               default-sample-phase = <158>;
+               rockchip,default-sample-phase = <158>;
                fifo-depth = <0x100>;
                pinctrl-names = "default";
                pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
@@ -718,7 +712,6 @@
                g-np-tx-fifo-size = <16>;
                g-rx-fifo-size = <280>;
                g-tx-fifo-size = <256 128 128 64 32 16>;
-               g-use-dma;
                phys = <&u2phy0_otg>;
                phy-names = "usb2-phy";
                status = "disabled";
@@ -729,7 +722,6 @@
                reg = <0x30080000 0x20000>;
                interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&cru HCLK_HOST0>, <&u2phy0>;
-               clock-names = "usbhost", "utmi";
                phys = <&u2phy0_host>;
                phy-names = "usb";
                status = "disabled";
@@ -740,7 +732,6 @@
                reg = <0x300a0000 0x20000>;
                interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&cru HCLK_HOST0>, <&u2phy0>;
-               clock-names = "usbhost", "utmi";
                phys = <&u2phy0_host>;
                phy-names = "usb";
                status = "disabled";
@@ -751,7 +742,6 @@
                reg = <0x300c0000 0x20000>;
                interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&cru HCLK_HOST1>, <&u2phy1>;
-               clock-names = "usbhost", "utmi";
                phys = <&u2phy1_otg>;
                phy-names = "usb";
                status = "disabled";
@@ -762,7 +752,6 @@
                reg = <0x300e0000 0x20000>;
                interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&cru HCLK_HOST1>, <&u2phy1>;
-               clock-names = "usbhost", "utmi";
                phys = <&u2phy1_otg>;
                phy-names = "usb";
                status = "disabled";
@@ -775,7 +764,6 @@
                clocks = <&cru HCLK_HOST2>, <&u2phy1>;
                phys = <&u2phy1_host>;
                phy-names = "usb";
-               clock-names = "usbhost", "utmi";
                status = "disabled";
        };
 
@@ -784,7 +772,6 @@
                reg = <0x30120000 0x20000>;
                interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&cru HCLK_HOST2>, <&u2phy1>;
-               clock-names = "usbhost", "utmi";
                phys = <&u2phy1_host>;
                phy-names = "usb";
                status = "disabled";

diff --git a/arch/arm/boot/dts/rk3288-evb-act8846.dts b/arch/arm/boot/dts/rk3288-evb-act8846.dts
index 8008076..be695b8 100644 (file)
--- a/arch/arm/boot/dts/rk3288-evb-act8846.dts
+++ b/arch/arm/boot/dts/rk3288-evb-act8846.dts
@@ -4,6 +4,7 @@
 #include "rk3288-evb.dtsi"
 
 / {
+       model = "Rockchip RK3288 EVB ACT8846";
        compatible = "rockchip,rk3288-evb-act8846", "rockchip,rk3288";
 
        vcc_lcd: vcc-lcd {

diff --git a/arch/arm/boot/dts/rk3288-evb-rk808.dts b/arch/arm/boot/dts/rk3288-evb-rk808.dts
index 1678820..42384ea 100644 (file)
--- a/arch/arm/boot/dts/rk3288-evb-rk808.dts
+++ b/arch/arm/boot/dts/rk3288-evb-rk808.dts
@@ -4,6 +4,7 @@
 #include "rk3288-evb.dtsi"
 
 / {
+       model = "Rockchip RK3288 EVB RK808";
        compatible = "rockchip,rk3288-evb-rk808", "rockchip,rk3288";
 };
 

diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts
index 1574383..8c38bda 100644 (file)
--- a/arch/arm/boot/dts/rk3288-firefly-reload.dts
+++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts
@@ -234,6 +234,7 @@
 };
 
 &saradc {
+       vref-supply = <&vcc_18>;
        status = "okay";
 };
 

diff --git a/arch/arm/boot/dts/rk3288-r89.dts b/arch/arm/boot/dts/rk3288-r89.dts
index a6ffc38..a258c7a 100644 (file)
--- a/arch/arm/boot/dts/rk3288-r89.dts
+++ b/arch/arm/boot/dts/rk3288-r89.dts
@@ -9,6 +9,7 @@
 #include "rk3288.dtsi"
 
 / {
+       model = "Netxeon R89";
        compatible = "netxeon,r89", "rockchip,rk3288";
 
        memory@0 {

diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
index 312582c..acfaa12 100644 (file)
--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
@@ -276,6 +276,7 @@
                        };
 
                        vccio_sd: LDO_REG5 {
+                               regulator-always-on;
                                regulator-boot-on;
                                regulator-min-microvolt = <1800000>;
                                regulator-max-microvolt = <3300000>;

diff --git a/arch/arm/boot/dts/rk3288-vyasa.dts b/arch/arm/boot/dts/rk3288-vyasa.dts
index ba06e9f..385dd59 100644 (file)
--- a/arch/arm/boot/dts/rk3288-vyasa.dts
+++ b/arch/arm/boot/dts/rk3288-vyasa.dts
@@ -78,6 +78,18 @@
                vin-supply = <&vcc_io>;
        };
 
+       vcc50_hdmi: vcc50-hdmi {
+               compatible = "regulator-fixed";
+               regulator-name = "vcc50_hdmi";
+               enable-active-high;
+               gpio = <&gpio7 RK_PB4 GPIO_ACTIVE_HIGH>; /* HDMI_EN */
+               pinctrl-names = "default";
+               pinctrl-0 = <&vcc50_hdmi_en>;
+               regulator-always-on;
+               regulator-boot-on;
+               vin-supply = <&vsus_5v>;
+       };
+
        vusb1_5v: vusb1-5v {
                compatible = "regulator-fixed";
                regulator-name = "vusb1_5v";
@@ -150,7 +162,7 @@
 };
 
 &hdmi {
-       ddc-i2c-bus = <&i2c2>;
+       ddc-i2c-bus = <&i2c5>;
        status = "okay";
 };
 
@@ -286,15 +298,15 @@
                                };
                        };
 
-                       vcc10_lcd: LDO_REG6 {
-                               regulator-name = "vcc10_lcd";
+                       vdd10_lcd: LDO_REG6 {
+                               regulator-name = "vdd10_lcd";
                                regulator-min-microvolt = <1000000>;
                                regulator-max-microvolt = <1000000>;
                                regulator-always-on;
                                regulator-boot-on;
                                regulator-state-mem {
                                        regulator-on-in-suspend;
-                                       regulator-suspend-microvolt = <1800000>;
+                                       regulator-suspend-microvolt = <1000000>;
                                };
                        };
 
@@ -347,7 +359,7 @@
        };
 };
 
-&i2c2 {
+&i2c5 {
        status = "okay";
 };
 
@@ -446,6 +458,12 @@
                };
        };
 
+       hdmi {
+               vcc50_hdmi_en: vcc50-hdmi-en {
+                       rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+       };
+
        pmic {
                pmic_int: pmic-int {
                        rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 9beb662..0cd8877 100644 (file)
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -155,7 +155,7 @@
                };
        };
 
-       amba {
+       amba: bus {
                compatible = "simple-bus";
                #address-cells = <2>;
                #size-cells = <2>;
@@ -420,6 +420,8 @@
                reg-io-width = <4>;
                clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>;
                clock-names = "baudclk", "apb_pclk";
+               dmas = <&dmac_peri 1>, <&dmac_peri 2>;
+               dma-names = "tx", "rx";
                pinctrl-names = "default";
                pinctrl-0 = <&uart0_xfer>;
                status = "disabled";
@@ -433,6 +435,8 @@
                reg-io-width = <4>;
                clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>;
                clock-names = "baudclk", "apb_pclk";
+               dmas = <&dmac_peri 3>, <&dmac_peri 4>;
+               dma-names = "tx", "rx";
                pinctrl-names = "default";
                pinctrl-0 = <&uart1_xfer>;
                status = "disabled";
@@ -459,6 +463,8 @@
                reg-io-width = <4>;
                clocks = <&cru SCLK_UART3>, <&cru PCLK_UART3>;
                clock-names = "baudclk", "apb_pclk";
+               dmas = <&dmac_peri 7>, <&dmac_peri 8>;
+               dma-names = "tx", "rx";
                pinctrl-names = "default";
                pinctrl-0 = <&uart3_xfer>;
                status = "disabled";
@@ -472,6 +478,8 @@
                reg-io-width = <4>;
                clocks = <&cru SCLK_UART4>, <&cru PCLK_UART4>;
                clock-names = "baudclk", "apb_pclk";
+               dmas = <&dmac_peri 9>, <&dmac_peri 10>;
+               dma-names = "tx", "rx";
                pinctrl-names = "default";
                pinctrl-0 = <&uart4_xfer>;
                status = "disabled";
@@ -601,7 +609,6 @@
                reg = <0x0 0xff500000 0x0 0x100>;
                interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&cru HCLK_USBHOST0>;
-               clock-names = "usbhost";
                phys = <&usbphy1>;
                phy-names = "usb";
                status = "disabled";
@@ -644,7 +651,6 @@
                reg = <0x0 0xff5c0000 0x0 0x100>;
                interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&cru HCLK_HSIC>;
-               clock-names = "usbhost";
                status = "disabled";
        };
 
@@ -718,7 +724,7 @@
                status = "disabled";
        };
 
-       bus_intmem@ff700000 {
+       bus_intmem: sram@ff700000 {
                compatible = "mmio-sram";
                reg = <0x0 0xff700000 0x0 0x18000>;
                #address-cells = <1>;
@@ -730,7 +736,7 @@
                };
        };
 
-       sram@ff720000 {
+       pmu_sram: sram@ff720000 {
                compatible = "rockchip,rk3288-pmu-sram", "mmio-sram";
                reg = <0x0 0xff720000 0x0 0x1000>;
        };
@@ -946,8 +952,8 @@
                compatible = "rockchip,rk3288-spdif", "rockchip,rk3066-spdif";
                reg = <0x0 0xff8b0000 0x0 0x10000>;
                #sound-dai-cells = <0>;
-               clock-names = "hclk", "mclk";
-               clocks = <&cru HCLK_SPDIF8CH>, <&cru SCLK_SPDIF8CH>;
+               clocks = <&cru SCLK_SPDIF8CH>, <&cru HCLK_SPDIF8CH>;
+               clock-names = "mclk", "hclk";
                dmas = <&dmac_bus_s 3>;
                dma-names = "tx";
                interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
@@ -962,12 +968,10 @@
                reg = <0x0 0xff890000 0x0 0x10000>;
                #sound-dai-cells = <0>;
                interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
-               #address-cells = <1>;
-               #size-cells = <0>;
+               clocks = <&cru SCLK_I2S0>, <&cru HCLK_I2S0>;
+               clock-names = "i2s_clk", "i2s_hclk";
                dmas = <&dmac_bus_s 0>, <&dmac_bus_s 1>;
                dma-names = "tx", "rx";
-               clock-names = "i2s_hclk", "i2s_clk";
-               clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>;
                pinctrl-names = "default";
                pinctrl-0 = <&i2s0_bus>;
                rockchip,playback-channels = <8>;

diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi
index 241f43e..f9fcb7e 100644 (file)
--- a/arch/arm/boot/dts/rk3xxx.dtsi
+++ b/arch/arm/boot/dts/rk3xxx.dtsi
@@ -32,7 +32,7 @@
                spi1 = &spi1;
        };
 
-       amba {
+       amba: bus {
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;
@@ -91,7 +91,7 @@
                status = "disabled";
        };
 
-       L2: l2-cache-controller@10138000 {
+       L2: cache-controller@10138000 {
                compatible = "arm,pl310-cache";
                reg = <0x10138000 0x1000>;
                cache-unified;

diff --git a/arch/arm/boot/dts/rv1108.dtsi b/arch/arm/boot/dts/rv1108.dtsi
index 1fd06e7..f9cfe2c 100644 (file)
--- a/arch/arm/boot/dts/rv1108.dtsi
+++ b/arch/arm/boot/dts/rv1108.dtsi
@@ -85,7 +85,7 @@
                #clock-cells = <0>;
        };
 
-       amba {
+       amba: bus {
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;
@@ -102,7 +102,7 @@
                };
        };
 
-       bus_intmem@10080000 {
+       bus_intmem: sram@10080000 {
                compatible = "mmio-sram";
                reg = <0x10080000 0x2000>;
                #address-cells = <1>;
@@ -120,7 +120,6 @@
                clocks = <&cru SCLK_UART2>, <&cru PCLK_UART2>;
                clock-names = "baudclk", "apb_pclk";
                dmas = <&pdma 6>, <&pdma 7>;
-               #dma-cells = <2>;
                pinctrl-names = "default";
                pinctrl-0 = <&uart2m0_xfer>;
                status = "disabled";
@@ -136,7 +135,6 @@
                clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>;
                clock-names = "baudclk", "apb_pclk";
                dmas = <&pdma 4>, <&pdma 5>;
-               #dma-cells = <2>;
                pinctrl-names = "default";
                pinctrl-0 = <&uart1_xfer>;
                status = "disabled";
@@ -152,7 +150,6 @@
                clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>;
                clock-names = "baudclk", "apb_pclk";
                dmas = <&pdma 2>, <&pdma 3>;
-               #dma-cells = <2>;
                pinctrl-names = "default";
                pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
                status = "disabled";
@@ -208,7 +205,6 @@
                clock-names = "spiclk", "apb_pclk";
                dmas = <&pdma 8>, <&pdma 9>;
                dma-names = "tx", "rx";
-               #dma-cells = <2>;
                #address-cells = <1>;
                #size-cells = <0>;
                status = "disabled";
@@ -370,7 +366,6 @@
                reg = <0x1038c000 0x100>;
                interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
                #io-channel-cells = <1>;
-               clock-frequency = <1000000>;
                clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>;
                clock-names = "saradc", "apb_pclk";
                status = "disabled";
@@ -499,7 +494,6 @@
                reg = <0x30140000 0x20000>;
                interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&cru HCLK_HOST0>, <&u2phy>;
-               clock-names = "usbhost", "utmi";
                phys = <&u2phy_host>;
                phy-names = "usb";
                status = "disabled";
@@ -510,7 +504,6 @@
                reg = <0x30160000 0x20000>;
                interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&cru HCLK_HOST0>, <&u2phy>;
-               clock-names = "usbhost", "utmi";
                phys = <&u2phy_host>;
                phy-names = "usb";
                status = "disabled";
@@ -527,7 +520,6 @@
                g-np-tx-fifo-size = <16>;
                g-rx-fifo-size = <280>;
                g-tx-fifo-size = <256 128 128 64 32 16>;
-               g-use-dma;
                phys = <&u2phy_otg>;
                phy-names = "usb2-phy";
                status = "disabled";