ARM64: dts: rockchip: move i2c0 node more ahead

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / boot / dts / rockchip / rk3368.dtsi

diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
index b12858c7a1b35bd0180254061afd1e114b75132c..44469bc064d3a1555cf8fd40e0708f10b667264c 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
@@ -333,16 +333,29 @@
                status = "disabled";
        };
 
-       i2c1: i2c@ff140000 {
+       i2c0: i2c@ff650000 {
+               compatible = "rockchip,rk3368-i2c", "rockchip,rk3288-i2c";
+               reg = <0x0 0xff650000 0x0 0x1000>;
+               clocks = <&cru PCLK_I2C0>;
+               clock-names = "i2c";
+               interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&i2c0_xfer>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               status = "disabled";
+       };
+
+       i2c2: i2c@ff140000 {
                compatible = "rockchip,rk3368-i2c", "rockchip,rk3288-i2c";
                reg = <0x0 0xff140000 0x0 0x1000>;
                interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
                #address-cells = <1>;
                #size-cells = <0>;
                clock-names = "i2c";
-               clocks = <&cru PCLK_I2C1>;
+               clocks = <&cru PCLK_I2C2>;
                pinctrl-names = "default";
-               pinctrl-0 = <&i2c1_xfer>;
+               pinctrl-0 = <&i2c2_xfer>;
                status = "disabled";
        };
 
@@ -479,29 +492,16 @@
                reg = <0x0 0xff610000 0x0 0x400>;
        };
 
-       i2c0: i2c@ff650000 {
-               compatible = "rockchip,rk3368-i2c", "rockchip,rk3288-i2c";
-               reg = <0x0 0xff650000 0x0 0x1000>;
-               clocks = <&cru PCLK_I2C0>;
-               clock-names = "i2c";
-               interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&i2c0_xfer>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "disabled";
-       };
-
-       i2c2: i2c@ff660000 {
+       i2c1: i2c@ff660000 {
                compatible = "rockchip,rk3368-i2c", "rockchip,rk3288-i2c";
                reg = <0x0 0xff660000 0x0 0x1000>;
                interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
                #address-cells = <1>;
                #size-cells = <0>;
                clock-names = "i2c";
-               clocks = <&cru PCLK_I2C2>;
+               clocks = <&cru PCLK_I2C1>;
                pinctrl-names = "default";
-               pinctrl-0 = <&i2c2_xfer>;
+               pinctrl-0 = <&i2c1_xfer>;
                status = "disabled";
        };
 
@@ -605,6 +605,21 @@
                      (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_HIGH)>;
        };
 
+       gpu: rogue-g6110@ffa30000 {
+               compatible = "arm,rogue-G6110", "arm,rk3368-gpu";
+               reg = <0x0 0xffa30000 0x0 0x10000>;
+               clocks =
+                       <&cru SCLK_GPU_CORE>,
+                       <&cru ACLK_GPU_MEM>,
+                       <&cru ACLK_GPU_CFG>;
+               clock-names =
+                       "clk_gpu",
+                       "aclk_gpu_mem",
+                       "aclk_gpu_cfg";
+               interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-names = "rogue-g6110-irq";
+       };
+
        i2s_2ch: i2s-2ch@ff890000 {
                compatible = "rockchip,rk3368-i2s", "rockchip,rk3066-i2s";
                reg = <0x0 0xff898000 0x0 0x1000>;