Merge branch 'topic/nhlt' into for-next

[linux-2.6-microblaze.git] / arch / arm / boot / dts / rk322x.dtsi

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";