Skip to contentSkip to conversation

rockchip: rk3228-power: sync power domain dt-binding header from Linux

PATCH Superseded Johan Jonker 4 participants 30 messages Mar 3, 2022 – Apr 15, 2022 Page 1 of 2

Subsystems (5)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/12 rockchip: rk3228-power: sync power domain dt-binding header from Linux

In order to update the DT for rk3228
sync the power domain dt-binding header.
This is the state as of v5.17 in Linux.

---
 include/dt-bindings/power/rk3228-power.h | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 include/dt-bindings/power/rk3228-power.h
include/dt-bindings/power/rk3228-power.h new file +21 -0
new file mode 100644
index 00000000..6a8dc1bf
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __DT_BINDINGS_POWER_RK3228_POWER_H__
+#define __DT_BINDINGS_POWER_RK3228_POWER_H__
+
+/**
+ * RK3228 idle id Summary.
+ */
+
+#define RK3228_PD_CORE		0
+#define RK3228_PD_MSCH		1
+#define RK3228_PD_BUS		2
+#define RK3228_PD_SYS		3
+#define RK3228_PD_VIO		4
+#define RK3228_PD_VOP		5
+#define RK3228_PD_VPU		6
+#define RK3228_PD_RKVDEC	7
+#define RK3228_PD_GPU		8
+#define RK3228_PD_PERI		9
+#define RK3228_PD_GMAC		10
+
+#endif
Signature · 1 line
2.20.1
#1 lore raw

PATCH v3 2/12 rockchip: rk3228-cru: sync the clock dt-binding header from Linux

In order to update the DT for rk3228 sync the clock dt-binding header.
This is the state as of v5.17 in Linux.

---
 include/dt-bindings/clock/rk3228-cru.h | 54 +++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 2 deletions(-)
include/dt-bindings/clock/rk3228-cru.h +52 -2
index 1217d523..de550ea5 100644
@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
- * (C) Copyright 2017 Rockchip Electronics Co., Ltd.
+ * Copyright (c) 2015 Rockchip Electronics Co. Ltd.
+ * Author: Jeffy Chen <[email protected]>
  */
 
 #ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3228_H
@@ -39,6 +40,7 @@
 #define SCLK_EMMC_DRV		117
 #define SCLK_SDMMC_SAMPLE	118
 #define SCLK_SDIO_SAMPLE	119
+#define SCLK_SDIO_SRC		120
 #define SCLK_EMMC_SAMPLE	121
 #define SCLK_VOP		122
 #define SCLK_HDMI_HDCP		123
@@ -51,6 +53,18 @@
 #define SCLK_MAC_TX		130
 #define SCLK_MAC_PHY		131
 #define SCLK_MAC_OUT		132
+#define SCLK_VDEC_CABAC		133
+#define SCLK_VDEC_CORE		134
+#define SCLK_RGA		135
+#define SCLK_HDCP		136
+#define SCLK_HDMI_CEC		137
+#define SCLK_CRYPTO		138
+#define SCLK_TSP		139
+#define SCLK_HSADC		140
+#define SCLK_WIFI		141
+#define SCLK_OTGPHY0		142
+#define SCLK_OTGPHY1		143
+#define SCLK_HDMI_PHY		144
 
 /* dclk gates */
 #define DCLK_VOP		190
@@ -58,15 +72,32 @@
 
 /* aclk gates */
 #define ACLK_DMAC		194
+#define ACLK_CPU		195
+#define ACLK_VPU_PRE		196
+#define ACLK_RKVDEC_PRE		197
+#define ACLK_RGA_PRE		198
+#define ACLK_IEP_PRE		199
+#define ACLK_HDCP_PRE		200
+#define ACLK_VOP_PRE		201
+#define ACLK_VPU		202
+#define ACLK_RKVDEC		203
+#define ACLK_IEP		204
+#define ACLK_RGA		205
+#define ACLK_HDCP		206
 #define ACLK_PERI		210
 #define ACLK_VOP		211
 #define ACLK_GMAC		212
+#define ACLK_GPU		213
 
 /* pclk gates */
 #define PCLK_GPIO0		320
 #define PCLK_GPIO1		321
 #define PCLK_GPIO2		322
 #define PCLK_GPIO3		323
+#define PCLK_VIO_H2P		324
+#define PCLK_HDCP		325
+#define PCLK_EFUSE_1024		326
+#define PCLK_EFUSE_256		327
 #define PCLK_GRF		329
 #define PCLK_I2C0		332
 #define PCLK_I2C1		333
@@ -79,6 +110,7 @@
 #define PCLK_TSADC		344
 #define PCLK_PWM		350
 #define PCLK_TIMER		353
+#define PCLK_CPU		354
 #define PCLK_PERI		363
 #define PCLK_HDMI_CTRL		364
 #define PCLK_HDMI_PHY		365
@@ -94,6 +126,24 @@
 #define HCLK_SDMMC		456
 #define HCLK_SDIO		457
 #define HCLK_EMMC		459
+#define HCLK_CPU		460
+#define HCLK_VPU_PRE		461
+#define HCLK_RKVDEC_PRE		462
+#define HCLK_VIO_PRE		463
+#define HCLK_VPU		464
+#define HCLK_RKVDEC		465
+#define HCLK_VIO		466
+#define HCLK_RGA		467
+#define HCLK_IEP		468
+#define HCLK_VIO_H2P		469
+#define HCLK_HDCP_MMU		470
+#define HCLK_HOST0		471
+#define HCLK_HOST1		472
+#define HCLK_HOST2		473
+#define HCLK_OTG		474
+#define HCLK_TSP		475
+#define HCLK_M_CRYPTO		476
+#define HCLK_S_CRYPTO		477
 #define HCLK_PERI		478
 
 #define CLK_NR_CLKS		(HCLK_PERI + 1)
Signature · 1 line
2.20.1
Reviewed-by on v3 2/12
#2 lore raw

Re: [PATCH v3 02/12] rockchip: rk3228-cru: sync the clock dt-binding header from Linux

Quoted 6 lines · Johan Jonker

In order to update the DT for rk3228 sync the clock dt-binding header.
This is the state as of v5.17 in Linux.

Thanks,
- Kever

Quoted 111 lines
---
  include/dt-bindings/clock/rk3228-cru.h | 54 +++++++++++++++++++++++++-
  1 file changed, 52 insertions(+), 2 deletions(-)
include/dt-bindings/clock/rk3228-cru.h +52 -2
index 1217d523..de550ea5 100644
@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
  /*
- * (C) Copyright 2017 Rockchip Electronics Co., Ltd.
+ * Copyright (c) 2015 Rockchip Electronics Co. Ltd.
+ * Author: Jeffy Chen <[email protected]>
   */
 
  #ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3228_H
@@ -39,6 +40,7 @@
  #define SCLK_EMMC_DRV		117
  #define SCLK_SDMMC_SAMPLE	118
  #define SCLK_SDIO_SAMPLE	119
+#define SCLK_SDIO_SRC		120
  #define SCLK_EMMC_SAMPLE	121
  #define SCLK_VOP		122
  #define SCLK_HDMI_HDCP		123
@@ -51,6 +53,18 @@
  #define SCLK_MAC_TX		130
  #define SCLK_MAC_PHY		131
  #define SCLK_MAC_OUT		132
+#define SCLK_VDEC_CABAC		133
+#define SCLK_VDEC_CORE		134
+#define SCLK_RGA		135
+#define SCLK_HDCP		136
+#define SCLK_HDMI_CEC		137
+#define SCLK_CRYPTO		138
+#define SCLK_TSP		139
+#define SCLK_HSADC		140
+#define SCLK_WIFI		141
+#define SCLK_OTGPHY0		142
+#define SCLK_OTGPHY1		143
+#define SCLK_HDMI_PHY		144
 
  /* dclk gates */
  #define DCLK_VOP		190
@@ -58,15 +72,32 @@
 
  /* aclk gates */
  #define ACLK_DMAC		194
+#define ACLK_CPU		195
+#define ACLK_VPU_PRE		196
+#define ACLK_RKVDEC_PRE		197
+#define ACLK_RGA_PRE		198
+#define ACLK_IEP_PRE		199
+#define ACLK_HDCP_PRE		200
+#define ACLK_VOP_PRE		201
+#define ACLK_VPU		202
+#define ACLK_RKVDEC		203
+#define ACLK_IEP		204
+#define ACLK_RGA		205
+#define ACLK_HDCP		206
  #define ACLK_PERI		210
  #define ACLK_VOP		211
  #define ACLK_GMAC		212
+#define ACLK_GPU		213
 
  /* pclk gates */
  #define PCLK_GPIO0		320
  #define PCLK_GPIO1		321
  #define PCLK_GPIO2		322
  #define PCLK_GPIO3		323
+#define PCLK_VIO_H2P		324
+#define PCLK_HDCP		325
+#define PCLK_EFUSE_1024		326
+#define PCLK_EFUSE_256		327
  #define PCLK_GRF		329
  #define PCLK_I2C0		332
  #define PCLK_I2C1		333
@@ -79,6 +110,7 @@
  #define PCLK_TSADC		344
  #define PCLK_PWM		350
  #define PCLK_TIMER		353
+#define PCLK_CPU		354
  #define PCLK_PERI		363
  #define PCLK_HDMI_CTRL		364
  #define PCLK_HDMI_PHY		365
@@ -94,6 +126,24 @@
  #define HCLK_SDMMC		456
  #define HCLK_SDIO		457
  #define HCLK_EMMC		459
+#define HCLK_CPU		460
+#define HCLK_VPU_PRE		461
+#define HCLK_RKVDEC_PRE		462
+#define HCLK_VIO_PRE		463
+#define HCLK_VPU		464
+#define HCLK_RKVDEC		465
+#define HCLK_VIO		466
+#define HCLK_RGA		467
+#define HCLK_IEP		468
+#define HCLK_VIO_H2P		469
+#define HCLK_HDCP_MMU		470
+#define HCLK_HOST0		471
+#define HCLK_HOST1		472
+#define HCLK_HOST2		473
+#define HCLK_OTG		474
+#define HCLK_TSP		475
+#define HCLK_M_CRYPTO		476
+#define HCLK_S_CRYPTO		477
  #define HCLK_PERI		478
 
  #define CLK_NR_CLKS		(HCLK_PERI + 1)
#3 lore raw

PATCH v3 3/12 arm: dts: rockchip: move all rk322x u-boot specific properties in separate dtsi files

In reply to Johan Jonker

In order to sync rk322x.dtsi from Linux, move all U-boot specific properties in separate dtsi files.

---

Changed V3:
add include "rockchip-u-boot.dtsi"

---
 arch/arm/dts/rk3229-evb-u-boot.dtsi | 28 +++++++++++++++
 arch/arm/dts/rk3229-evb.dts         | 17 ---------
 arch/arm/dts/rk322x-u-boot.dtsi     | 56 +++++++++++++++++++++++++++++
 arch/arm/dts/rk322x.dtsi            | 37 -------------------
 4 files changed, 84 insertions(+), 54 deletions(-)
 create mode 100644 arch/arm/dts/rk3229-evb-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk322x-u-boot.dtsi
arch/arm/dts/rk3229-evb-u-boot.dtsi new file +28 -0
new file mode 100644
index 00000000..b65149c2
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+#include "rk322x-u-boot.dtsi"
+
+/ {
+	chosen {
+		stdout-path = &uart2;
+	};
+};
+
+&dmc {
+	rockchip,pctl-timing = <0x96 0xC8 0x1F3 0xF 0x8000004D 0x4 0x4E 0x6 0x3
+		0x0 0x6 0x5 0xC 0x10 0x6 0x4 0x4
+		0x5 0x4 0x200 0x3 0xA 0x40 0x0 0x1
+		0x5 0x5 0x3 0xC 0x1E 0x100 0x0 0x4
+		0x0 0x924>;
+	rockchip,phy-timing = <0x220 0x1 0x0 0x0 0x0 0x4 0x60>;
+	rockchip,sdram-params = <0x428B188 0x0 0x21 0x472 0x15
+		0 300 3 0 120>;
+};
+
+&emmc {
+	u-boot,dm-pre-reloc;
+};
+
+&uart2 {
+	u-boot,dm-pre-reloc;
+};
arch/arm/dts/rk3229-evb.dts +0 -17
index 632cdc9b..66a3ba23 100644
@@ -11,10 +11,6 @@
 	model = "Rockchip RK3229 Evaluation board";
 	compatible = "rockchip,rk3229-evb", "rockchip,rk3229";
 
-	chosen {
-		stdout-path = &uart2;
-	};
-
 	memory@60000000 {
 		device_type = "memory";
 		reg = <0x60000000 0x40000000>;
@@ -38,17 +34,6 @@
 	};
 };
 
-&dmc {
-	rockchip,pctl-timing = <0x96 0xC8 0x1F3 0xF 0x8000004D 0x4 0x4E 0x6 0x3
-		0x0 0x6 0x5 0xC 0x10 0x6 0x4 0x4
-		0x5 0x4 0x200 0x3 0xA 0x40 0x0 0x1
-		0x5 0x5 0x3 0xC 0x1E 0x100 0x0 0x4
-		0x0 0x924>;
-	rockchip,phy-timing = <0x220 0x1 0x0 0x0 0x0 0x4 0x60>;
-	rockchip,sdram-params = <0x428B188 0x0 0x21 0x472 0x15
-		0 300 3 0 120>;
-};
-
 &gmac {
 	assigned-clocks = <&cru SCLK_MAC_EXTCLK>, <&cru SCLK_MAC>;
 	assigned-clock-parents = <&ext_gmac>, <&cru SCLK_MAC_EXTCLK>;
@@ -66,7 +51,6 @@
 };
 
 &emmc {
-	u-boot,dm-pre-reloc;
 	status = "okay";
 };
 
@@ -82,7 +66,6 @@
 };
 
 &uart2 {
-	u-boot,dm-pre-reloc;
 	status = "okay";
 };
 
arch/arm/dts/rk322x-u-boot.dtsi new file +56 -0

56 lines not on this page · raw message

arch/arm/dts/rk322x.dtsi +0 -37
index 4a8be5da..3245da3c 100644
@@ -107,22 +107,6 @@
 		#clock-cells = <0>;
 	};
 
-	bus_intmem@10080000 {
-		compatible = "mmio-sram";
-		reg = <0x10080000 0x9000>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges = <0 0x10080000 0x9000>;
-		smp-sram@0 {
-			compatible = "rockchip,rk322x-smp-sram";
-			reg = <0x00 0x10>;
-		};
-		ddr_sram: ddr-sram@1000 {
-			compatible = "rockchip,rk322x-ddr-sram";
-			reg = <0x1000 0x8000>;
-		};
-	};
-
 	i2s1: i2s1@100b0000 {
 		compatible = "rockchip,rk3228-i2s", "rockchip,rk3066-i2s";
 		reg = <0x100b0000 0x4000>;
@@ -165,7 +149,6 @@
 	};
 
 	grf: syscon@11000000 {
-		u-boot,dm-pre-reloc;
 		compatible = "rockchip,rk3228-grf", "syscon";
 		reg = <0x11000000 0x1000>;
 	};
@@ -317,7 +300,6 @@
 	};
 
 	cru: clock-controller@110e0000 {
-		u-boot,dm-pre-reloc;
 		compatible = "rockchip,rk3228-cru";
 		reg = <0x110e0000 0x1000>;
 		rockchip,grf = <&grf>;
@@ -387,7 +369,6 @@
 	sdmmc: dwmmc@30000000 {
 		compatible = "rockchip,rk3228-dw-mshc", "rockchip,rk3288-dw-mshc";
 		reg = <0x30000000 0x4000>;
-		max-frequency = <150000000>;
 		interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
 			 <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
@@ -414,7 +395,6 @@
 	emmc: dwmmc@30020000 {
 		compatible = "rockchip,rk3288-dw-mshc";
 		reg = <0x30020000 0x4000>;
-		max-frequency = <150000000>;
 		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
 			 <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
@@ -768,21 +748,4 @@
 			};
 		};
 	};
-
-	dmc: dmc@11200000 {
-		u-boot,dm-pre-reloc;
-		compatible = "rockchip,rk3228-dmc", "syscon";
-		rockchip,cru = <&cru>;
-		rockchip,grf = <&grf>;
-		rockchip,msch = <&service_msch>;
-		reg = <0x11200000 0x3fc
-		       0x12000000 0x400>;
-		rockchip,sram = <&ddr_sram>;
-	};
-
-	service_msch: syscon@31090000 {
-		u-boot,dm-pre-reloc;
-		compatible = "rockchip,rk3228-msch", "syscon";
-		reg = <0x31090000 0x2000>;
-	};
 };
Signature · 1 line
2.20.1
Reviewed-by on v3 3/12
#4 lore raw

Re: [PATCH v3 03/12] arm: dts: rockchip: move all rk322x u-boot specific properties in separate dtsi files

Quoted 4 lines · Johan Jonker

In order to sync rk322x.dtsi from Linux, move all U-boot specific properties in separate dtsi files.

Thanks,
- Kever

Quoted 239 lines

---

Changed V3:
add include "rockchip-u-boot.dtsi"

---
  arch/arm/dts/rk3229-evb-u-boot.dtsi | 28 +++++++++++++++
  arch/arm/dts/rk3229-evb.dts         | 17 ---------
  arch/arm/dts/rk322x-u-boot.dtsi     | 56 +++++++++++++++++++++++++++++
  arch/arm/dts/rk322x.dtsi            | 37 -------------------
  4 files changed, 84 insertions(+), 54 deletions(-)

create mode 100644 arch/arm/dts/rk3229-evb-u-boot.dtsi create mode 100644 arch/arm/dts/rk322x-u-boot.dtsi

arch/arm/dts/rk3229-evb-u-boot.dtsi new file +28 -0
new file mode 100644
index 00000000..b65149c2
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+#include "rk322x-u-boot.dtsi"
+
+/ {
+	chosen {
+		stdout-path = &uart2;
+	};
+};
+
+&dmc {
+	rockchip,pctl-timing = <0x96 0xC8 0x1F3 0xF 0x8000004D 0x4 0x4E 0x6 0x3
+		0x0 0x6 0x5 0xC 0x10 0x6 0x4 0x4
+		0x5 0x4 0x200 0x3 0xA 0x40 0x0 0x1
+		0x5 0x5 0x3 0xC 0x1E 0x100 0x0 0x4
+		0x0 0x924>;
+	rockchip,phy-timing = <0x220 0x1 0x0 0x0 0x0 0x4 0x60>;
+	rockchip,sdram-params = <0x428B188 0x0 0x21 0x472 0x15
+		0 300 3 0 120>;
+};
+
+&emmc {
+	u-boot,dm-pre-reloc;
+};
+
+&uart2 {
+	u-boot,dm-pre-reloc;
+};
arch/arm/dts/rk3229-evb.dts +0 -17
index 632cdc9b..66a3ba23 100644
@@ -11,10 +11,6 @@
  	model = "Rockchip RK3229 Evaluation board";
  	compatible = "rockchip,rk3229-evb", "rockchip,rk3229";
 
-	chosen {
-		stdout-path = &uart2;
-	};
-
  	memory@60000000 {
  		device_type = "memory";
  		reg = <0x60000000 0x40000000>;
@@ -38,17 +34,6 @@
  	};
  };
 
-&dmc {
-	rockchip,pctl-timing = <0x96 0xC8 0x1F3 0xF 0x8000004D 0x4 0x4E 0x6 0x3
-		0x0 0x6 0x5 0xC 0x10 0x6 0x4 0x4
-		0x5 0x4 0x200 0x3 0xA 0x40 0x0 0x1
-		0x5 0x5 0x3 0xC 0x1E 0x100 0x0 0x4
-		0x0 0x924>;
-	rockchip,phy-timing = <0x220 0x1 0x0 0x0 0x0 0x4 0x60>;
-	rockchip,sdram-params = <0x428B188 0x0 0x21 0x472 0x15
-		0 300 3 0 120>;
-};
-
  &gmac {
  	assigned-clocks = <&cru SCLK_MAC_EXTCLK>, <&cru SCLK_MAC>;
  	assigned-clock-parents = <&ext_gmac>, <&cru SCLK_MAC_EXTCLK>;
@@ -66,7 +51,6 @@
  };
 
  &emmc {
-	u-boot,dm-pre-reloc;
  	status = "okay";
  };
 
@@ -82,7 +66,6 @@
  };
 
  &uart2 {
-	u-boot,dm-pre-reloc;
  	status = "okay";
  };
 
arch/arm/dts/rk322x-u-boot.dtsi new file +56 -0
new file mode 100644
index 00000000..79c41e48
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include "rockchip-u-boot.dtsi"
+
+/ {
+	bus_intmem@10080000 {
+		compatible = "mmio-sram";
+		reg = <0x10080000 0x9000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges = <0 0x10080000 0x9000>;
+
+		smp-sram@0 {
+			compatible = "rockchip,rk322x-smp-sram";
+			reg = <0x00 0x10>;
+		};
+
+		ddr_sram: ddr-sram@1000 {
+			compatible = "rockchip,rk322x-ddr-sram";
+			reg = <0x1000 0x8000>;
+		};
+	};
+
+	dmc: dmc@11200000 {
+		compatible = "rockchip,rk3228-dmc", "syscon";
+		reg = <0x11200000 0x3fc
+		       0x12000000 0x400>;
+		rockchip,cru = <&cru>;
+		rockchip,grf = <&grf>;
+		rockchip,msch = <&service_msch>;
+		rockchip,sram = <&ddr_sram>;
+		u-boot,dm-pre-reloc;
+	};
+
+	service_msch: syscon@31090000 {
+		compatible = "rockchip,rk3228-msch", "syscon";
+		reg = <0x31090000 0x2000>;
+		u-boot,dm-pre-reloc;
+	};
+};
+
+&cru {
+	u-boot,dm-pre-reloc;
+};
+
+&emmc {
+	max-frequency = <150000000>;
+};
+
+&grf {
+	u-boot,dm-pre-reloc;
+};
+
+&sdmmc {
+	max-frequency = <150000000>;
+};
arch/arm/dts/rk322x.dtsi +0 -37
index 4a8be5da..3245da3c 100644
@@ -107,22 +107,6 @@
  		#clock-cells = <0>;
  	};
 
-	bus_intmem@10080000 {
-		compatible = "mmio-sram";
-		reg = <0x10080000 0x9000>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges = <0 0x10080000 0x9000>;
-		smp-sram@0 {
-			compatible = "rockchip,rk322x-smp-sram";
-			reg = <0x00 0x10>;
-		};
-		ddr_sram: ddr-sram@1000 {
-			compatible = "rockchip,rk322x-ddr-sram";
-			reg = <0x1000 0x8000>;
-		};
-	};
-
  	i2s1: i2s1@100b0000 {
  		compatible = "rockchip,rk3228-i2s", "rockchip,rk3066-i2s";
  		reg = <0x100b0000 0x4000>;
@@ -165,7 +149,6 @@
  	};
 
  	grf: syscon@11000000 {
-		u-boot,dm-pre-reloc;
  		compatible = "rockchip,rk3228-grf", "syscon";
  		reg = <0x11000000 0x1000>;
  	};
@@ -317,7 +300,6 @@
  	};
 
  	cru: clock-controller@110e0000 {
-		u-boot,dm-pre-reloc;
  		compatible = "rockchip,rk3228-cru";
  		reg = <0x110e0000 0x1000>;
  		rockchip,grf = <&grf>;
@@ -387,7 +369,6 @@
  	sdmmc: dwmmc@30000000 {
  		compatible = "rockchip,rk3228-dw-mshc", "rockchip,rk3288-dw-mshc";
  		reg = <0x30000000 0x4000>;
-		max-frequency = <150000000>;
  		interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
  			 <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
@@ -414,7 +395,6 @@
  	emmc: dwmmc@30020000 {
  		compatible = "rockchip,rk3288-dw-mshc";
  		reg = <0x30020000 0x4000>;
-		max-frequency = <150000000>;
  		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
  			 <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
@@ -768,21 +748,4 @@
  			};
  		};
  	};
-
-	dmc: dmc@11200000 {
-		u-boot,dm-pre-reloc;
-		compatible = "rockchip,rk3228-dmc", "syscon";
-		rockchip,cru = <&cru>;
-		rockchip,grf = <&grf>;
-		rockchip,msch = <&service_msch>;
-		reg = <0x11200000 0x3fc
-		       0x12000000 0x400>;
-		rockchip,sram = <&ddr_sram>;
-	};
-
-	service_msch: syscon@31090000 {
-		u-boot,dm-pre-reloc;
-		compatible = "rockchip,rk3228-msch", "syscon";
-		reg = <0x31090000 0x2000>;
-	};
  };
#5 lore raw

PATCH v3 4/12 arm: dts: rockchip: sync rk322x.dtsi from Linux

In reply to Johan Jonker

Sync rk322x.dtsi from Linux version 5.17.

---

Changed V2:
update
rename usb20_otg label

---
 arch/arm/dts/rk3229-evb.dts |   2 +-
 arch/arm/dts/rk322x.dtsi    | 846 +++++++++++++++++++++++++++++-------
 2 files changed, 695 insertions(+), 153 deletions(-)
arch/arm/dts/rk3229-evb.dts +1 -1
index 66a3ba23..d2681d1a 100644
@@ -69,6 +69,6 @@
 	status = "okay";
 };
 
-&usb20_otg {
+&usb_otg {
        status = "okay";
 };
arch/arm/dts/rk322x.dtsi +694 -152

1,207 lines not on this page · raw message

Signature · 1 line
2.20.1
#6 lore raw

Re: [PATCH v3 04/12] arm: dts: rockchip: sync rk322x.dtsi from Linux

Hi Johan,

Quoted 47 lines · Johan Jonker

Sync rk322x.dtsi from Linux version 5.17.

---

Changed V2:
update
rename usb20_otg label

---
  arch/arm/dts/rk3229-evb.dts |   2 +-
  arch/arm/dts/rk322x.dtsi    | 846 +++++++++++++++++++++++++++++-------
  2 files changed, 695 insertions(+), 153 deletions(-)
arch/arm/dts/rk3229-evb.dts +1 -1
index 66a3ba23..d2681d1a 100644
@@ -69,6 +69,6 @@
  	status = "okay";
  };
 
-&usb20_otg {
+&usb_otg {
         status = "okay";
  };
arch/arm/dts/rk322x.dtsi +2 -4
index 3245da3c..8eed9e3a 100644
@@ -1,7 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd.
- */
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 
  #include <dt-bindings/gpio/gpio.h>
  #include <dt-bindings/interrupt-controller/irq.h>
@@ -9,6 +6,7 @@
  #include <dt-bindings/pinctrl/rockchip.h>
  #include <dt-bindings/clock/rk3228-cru.h>
  #include <dt-bindings/thermal/thermal.h>
+#include <dt-bindings/power/rk3228-power.h>
 
  / {
  	#address-cells = <1>;

arch/arm/dts/rk322x.dtsi line 24

Quoted 5 lines
arch/arm/dts/rk322x.dtsi +0 -2
@@ -20,8 +18,7 @@
  		serial0 = &uart0;
  		serial1 = &uart1;
  		serial2 = &uart2;
-		mmc0 = &emmc;
-		mmc1 = &sdmmc;

I think this part will need to move to -u-boot.dtsi for U-Boot will use this to decide the boot order,

and U-Boot use emmc as mmc0 and sdmmc as mmc1 before kernel decide to add alias for mmc module.

Thanks,

- Kever

Quoted 1,211 lines
arch/arm/dts/rk322x.dtsi +692 -146
+		spi0 = &spi0;
  	};
 
  	cpus {
@@ -33,13 +30,11 @@
  			compatible = "arm,cortex-a7";
  			reg = <0xf00>;
  			resets = <&cru SRST_CORE0>;
-			operating-points = <
-				/* KHz    uV */
-				 816000 1000000
-			>;
+			operating-points-v2 = <&cpu0_opp_table>;
  			#cooling-cells = <2>; /* min followed by max */
  			clock-latency = <40000>;
  			clocks = <&cru ARMCLK>;
+			enable-method = "psci";
  		};
 
  		cpu1: cpu@f01 {
@@ -47,6 +42,9 @@
  			compatible = "arm,cortex-a7";
  			reg = <0xf01>;
  			resets = <&cru SRST_CORE1>;
+			operating-points-v2 = <&cpu0_opp_table>;
+			#cooling-cells = <2>; /* min followed by max */
+			enable-method = "psci";
  		};
 
  		cpu2: cpu@f02 {
@@ -54,6 +52,9 @@
  			compatible = "arm,cortex-a7";
  			reg = <0xf02>;
  			resets = <&cru SRST_CORE2>;
+			operating-points-v2 = <&cpu0_opp_table>;
+			#cooling-cells = <2>; /* min followed by max */
+			enable-method = "psci";
  		};
 
  		cpu3: cpu@f03 {
@@ -61,23 +62,37 @@
  			compatible = "arm,cortex-a7";
  			reg = <0xf03>;
  			resets = <&cru SRST_CORE3>;
+			operating-points-v2 = <&cpu0_opp_table>;
+			#cooling-cells = <2>; /* min followed by max */
+			enable-method = "psci";
  		};
  	};
 
-	amba {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
+	cpu0_opp_table: opp-table-0 {
+		compatible = "operating-points-v2";
+		opp-shared;
 
-		pdma: pdma@110f0000 {
-			compatible = "arm,pl330", "arm,primecell";
-			reg = <0x110f0000 0x4000>;
-			interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
-			#dma-cells = <1>;
-			clocks = <&cru ACLK_DMAC>;
-			clock-names = "apb_pclk";
+		opp-408000000 {
+			opp-hz = /bits/ 64 <408000000>;
+			opp-microvolt = <950000>;
+			clock-latency-ns = <40000>;
+			opp-suspend;
+		};
+		opp-600000000 {
+			opp-hz = /bits/ 64 <600000000>;
+			opp-microvolt = <975000>;
+		};
+		opp-816000000 {
+			opp-hz = /bits/ 64 <816000000>;
+			opp-microvolt = <1000000>;
+		};
+		opp-1008000000 {
+			opp-hz = /bits/ 64 <1008000000>;
+			opp-microvolt = <1175000>;
+		};
+		opp-1200000000 {
+			opp-hz = /bits/ 64 <1200000000>;
+			opp-microvolt = <1275000>;
  		};
  	};
 
@@ -90,6 +105,11 @@
  		interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
  	};
 
+	psci {
+		compatible = "arm,psci-1.0", "arm,psci-0.2";
+		method = "smc";
+	};
+
  	timer {
  		compatible = "arm,armv7-timer";
  		arm,cpu-registers-not-fw-configured;
@@ -107,12 +127,15 @@
  		#clock-cells = <0>;
  	};
 
+	display_subsystem: display-subsystem {
+		compatible = "rockchip,display-subsystem";
+		ports = <&vop_out>;
+	};
+
  	i2s1: i2s1@100b0000 {
  		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>;
@@ -126,8 +149,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>;
@@ -135,12 +156,23 @@
  		status = "disabled";
  	};
 
+	spdif: spdif@100d0000 {
+		compatible = "rockchip,rk3228-spdif";
+		reg = <0x100d0000 0x1000>;
+		interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru SCLK_SPDIF>, <&cru HCLK_SPDIF_8CH>;
+		clock-names = "mclk", "hclk";
+		dmas = <&pdma 10>;
+		dma-names = "tx";
+		pinctrl-names = "default";
+		pinctrl-0 = <&spdif_tx>;
+		status = "disabled";
+	};
+
  	i2s2: i2s2@100e0000 {
  		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>;
@@ -149,8 +181,124 @@
  	};
 
  	grf: syscon@11000000 {
-		compatible = "rockchip,rk3228-grf", "syscon";
+		compatible = "rockchip,rk3228-grf", "syscon", "simple-mfd";
  		reg = <0x11000000 0x1000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		io_domains: io-domains {
+			compatible = "rockchip,rk3228-io-voltage-domain";
+			status = "disabled";
+		};
+
+		power: power-controller {
+			compatible = "rockchip,rk3228-power-controller";
+			#power-domain-cells = <1>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			power-domain@RK3228_PD_VIO {
+				reg = <RK3228_PD_VIO>;
+				clocks = <&cru ACLK_HDCP>,
+					 <&cru SCLK_HDCP>,
+					 <&cru ACLK_IEP>,
+					 <&cru HCLK_IEP>,
+					 <&cru ACLK_RGA>,
+					 <&cru HCLK_RGA>,
+					 <&cru SCLK_RGA>;
+				pm_qos = <&qos_hdcp>,
+					 <&qos_iep>,
+					 <&qos_rga_r>,
+					 <&qos_rga_w>;
+				#power-domain-cells = <0>;
+			};
+
+			power-domain@RK3228_PD_VOP {
+				reg = <RK3228_PD_VOP>;
+				clocks =<&cru ACLK_VOP>,
+					<&cru DCLK_VOP>,
+					<&cru HCLK_VOP>;
+				pm_qos = <&qos_vop>;
+				#power-domain-cells = <0>;
+			};
+
+			power-domain@RK3228_PD_VPU {
+				reg = <RK3228_PD_VPU>;
+				clocks = <&cru ACLK_VPU>,
+					 <&cru HCLK_VPU>;
+				pm_qos = <&qos_vpu>;
+				#power-domain-cells = <0>;
+			};
+
+			power-domain@RK3228_PD_RKVDEC {
+				reg = <RK3228_PD_RKVDEC>;
+				clocks = <&cru ACLK_RKVDEC>,
+					 <&cru HCLK_RKVDEC>,
+					 <&cru SCLK_VDEC_CABAC>,
+					 <&cru SCLK_VDEC_CORE>;
+				pm_qos = <&qos_rkvdec_r>,
+					 <&qos_rkvdec_w>;
+				#power-domain-cells = <0>;
+			};
+
+			power-domain@RK3228_PD_GPU {
+				reg = <RK3228_PD_GPU>;
+				clocks = <&cru ACLK_GPU>;
+				pm_qos = <&qos_gpu>;
+				#power-domain-cells = <0>;
+			};
+		};
+
+		u2phy0: usb2phy@760 {
+			compatible = "rockchip,rk3228-usb2phy";
+			reg = <0x0760 0x0c>;
+			clocks = <&cru SCLK_OTGPHY0>;
+			clock-names = "phyclk";
+			clock-output-names = "usb480m_phy0";
+			#clock-cells = <0>;
+			status = "disabled";
+
+			u2phy0_otg: otg-port {
+				interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>,
+					     <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>,
+					     <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
+				interrupt-names = "otg-bvalid", "otg-id",
+						  "linestate";
+				#phy-cells = <0>;
+				status = "disabled";
+			};
+
+			u2phy0_host: host-port {
+				interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
+				interrupt-names = "linestate";
+				#phy-cells = <0>;
+				status = "disabled";
+			};
+		};
+
+		u2phy1: usb2phy@800 {
+			compatible = "rockchip,rk3228-usb2phy";
+			reg = <0x0800 0x0c>;
+			clocks = <&cru SCLK_OTGPHY1>;
+			clock-names = "phyclk";
+			clock-output-names = "usb480m_phy1";
+			#clock-cells = <0>;
+			status = "disabled";
+
+			u2phy1_otg: otg-port {
+				interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;
+				interrupt-names = "linestate";
+				#phy-cells = <0>;
+				status = "disabled";
+			};
+
+			u2phy1_host: host-port {
+				interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
+				interrupt-names = "linestate";
+				#phy-cells = <0>;
+				status = "disabled";
+			};
+		};
  	};
 
  	uart0: serial@11010000 {
@@ -189,12 +337,29 @@
  		clocks = <&cru SCLK_UART2>, <&cru PCLK_UART2>;
  		clock-names = "baudclk", "apb_pclk";
  		pinctrl-names = "default";
-		pinctrl-0 = <&uart21_xfer>;
+		pinctrl-0 = <&uart2_xfer>;
  		reg-shift = <2>;
  		reg-io-width = <4>;
  		status = "disabled";
  	};
 
+	efuse: efuse@11040000 {
+		compatible = "rockchip,rk3228-efuse";
+		reg = <0x11040000 0x20>;
+		clocks = <&cru PCLK_EFUSE_256>;
+		clock-names = "pclk_efuse";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/* Data cells */
+		efuse_id: id@7 {
+			reg = <0x7 0x10>;
+		};
+		cpu_leakage: cpu_leakage@17 {
+			reg = <0x17 0x1>;
+		};
+	};
+
  	i2c0: i2c@11050000 {
  		compatible = "rockchip,rk3228-i2c";
  		reg = <0x11050000 0x1000>;
@@ -247,12 +412,32 @@
  		status = "disabled";
  	};
 
+	spi0: spi@11090000 {
+		compatible = "rockchip,rk3228-spi";
+		reg = <0x11090000 0x1000>;
+		interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		clocks = <&cru SCLK_SPI0>, <&cru PCLK_SPI0>;
+		clock-names = "spiclk", "apb_pclk";
+		pinctrl-names = "default";
+		pinctrl-0 = <&spi0_clk &spi0_tx &spi0_rx &spi0_cs0 &spi0_cs1>;
+		status = "disabled";
+	};
+
+	wdt: watchdog@110a0000 {
+		compatible = "rockchip,rk3228-wdt", "snps,dw-wdt";
+		reg = <0x110a0000 0x100>;
+		interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru PCLK_CPU>;
+		status = "disabled";
+	};
+
  	pwm0: pwm@110b0000 {
  		compatible = "rockchip,rk3288-pwm";
  		reg = <0x110b0000 0x10>;
  		#pwm-cells = <3>;
  		clocks = <&cru PCLK_PWM>;
-		clock-names = "pwm";
  		pinctrl-names = "default";
  		pinctrl-0 = <&pwm0_pin>;
  		status = "disabled";
@@ -263,7 +448,6 @@
  		reg = <0x110b0010 0x10>;
  		#pwm-cells = <3>;
  		clocks = <&cru PCLK_PWM>;
-		clock-names = "pwm";
  		pinctrl-names = "default";
  		pinctrl-0 = <&pwm1_pin>;
  		status = "disabled";
@@ -274,7 +458,6 @@
  		reg = <0x110b0020 0x10>;
  		#pwm-cells = <3>;
  		clocks = <&cru PCLK_PWM>;
-		clock-names = "pwm";
  		pinctrl-names = "default";
  		pinctrl-0 = <&pwm2_pin>;
  		status = "disabled";
@@ -285,18 +468,17 @@
  		reg = <0x110b0030 0x10>;
  		#pwm-cells = <2>;
  		clocks = <&cru PCLK_PWM>;
-		clock-names = "pwm";
  		pinctrl-names = "default";
  		pinctrl-0 = <&pwm3_pin>;
  		status = "disabled";
  	};
 
  	timer: timer@110c0000 {
-		compatible = "rockchip,rk3288-timer";
+		compatible = "rockchip,rk3228-timer", "rockchip,rk3288-timer";
  		reg = <0x110c0000 0x20>;
  		interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&xin24m>, <&cru PCLK_TIMER>;
-		clock-names = "timer", "pclk";
+		clocks = <&cru PCLK_TIMER>, <&xin24m>;
+		clock-names = "pclk", "timer";
  	};
 
  	cru: clock-controller@110e0000 {
@@ -305,8 +487,29 @@
  		rockchip,grf = <&grf>;
  		#clock-cells = <1>;
  		#reset-cells = <1>;
-		assigned-clocks = <&cru PLL_GPLL>;
-		assigned-clock-rates = <594000000>;
+		assigned-clocks =
+			<&cru PLL_GPLL>, <&cru ARMCLK>,
+			<&cru PLL_CPLL>, <&cru ACLK_PERI>,
+			<&cru HCLK_PERI>, <&cru PCLK_PERI>,
+			<&cru ACLK_CPU>, <&cru HCLK_CPU>,
+			<&cru PCLK_CPU>;
+		assigned-clock-rates =
+			<594000000>, <816000000>,
+			<500000000>, <150000000>,
+			<150000000>, <75000000>,
+			<150000000>, <150000000>,
+			<75000000>;
+	};
+
+	pdma: pdma@110f0000 {
+		compatible = "arm,pl330", "arm,primecell";
+		reg = <0x110f0000 0x4000>;
+		interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
+		#dma-cells = <1>;
+		arm,pl330-periph-burst;
+		clocks = <&cru ACLK_DMAC>;
+		clock-names = "apb_pclk";
  	};
 
  	thermal-zones {
@@ -338,12 +541,18 @@
  				map0 {
  					trip = <&cpu_alert0>;
  					cooling-device =
-						<&cpu0 THERMAL_NO_LIMIT 6>;
+						<&cpu0 THERMAL_NO_LIMIT 6>,
+						<&cpu1 THERMAL_NO_LIMIT 6>,
+						<&cpu2 THERMAL_NO_LIMIT 6>,
+						<&cpu3 THERMAL_NO_LIMIT 6>;
  				};
  				map1 {
  					trip = <&cpu_alert1>;
  					cooling-device =
-						<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+						<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+						<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+						<&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+						<&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
  				};
  			};
  		};
@@ -355,53 +564,220 @@
  		interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&cru SCLK_TSADC>, <&cru PCLK_TSADC>;
  		clock-names = "tsadc", "apb_pclk";
+		assigned-clocks = <&cru SCLK_TSADC>;
+		assigned-clock-rates = <32768>;
  		resets = <&cru SRST_TSADC>;
  		reset-names = "tsadc-apb";
  		pinctrl-names = "init", "default", "sleep";
-		pinctrl-0 = <&otp_gpio>;
+		pinctrl-0 = <&otp_pin>;
  		pinctrl-1 = <&otp_out>;
-		pinctrl-2 = <&otp_gpio>;
-		#thermal-sensor-cells = <0>;
+		pinctrl-2 = <&otp_pin>;
+		#thermal-sensor-cells = <1>;
  		rockchip,hw-tshut-temp = <95000>;
  		status = "disabled";
  	};
 
-	sdmmc: dwmmc@30000000 {
+	hdmi_phy: hdmi-phy@12030000 {
+		compatible = "rockchip,rk3228-hdmi-phy";
+		reg = <0x12030000 0x10000>;
+		clocks = <&cru PCLK_HDMI_PHY>, <&xin24m>, <&cru DCLK_HDMI_PHY>;
+		clock-names = "sysclk", "refoclk", "refpclk";
+		#clock-cells = <0>;
+		clock-output-names = "hdmiphy_phy";
+		#phy-cells = <0>;
+		status = "disabled";
+	};
+
+	gpu: gpu@20000000 {
+		compatible = "rockchip,rk3228-mali", "arm,mali-400";
+		reg = <0x20000000 0x10000>;
+		interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "gp",
+				  "gpmmu",
+				  "pp0",
+				  "ppmmu0",
+				  "pp1",
+				  "ppmmu1";
+		clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>;
+		clock-names = "bus", "core";
+		power-domains = <&power RK3228_PD_GPU>;
+		resets = <&cru SRST_GPU_A>;
+		status = "disabled";
+	};
+
+	vpu: video-codec@20020000 {
+		compatible = "rockchip,rk3228-vpu", "rockchip,rk3399-vpu";
+		reg = <0x20020000 0x800>;
+		interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI  9 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "vepu", "vdpu";
+		clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
+		clock-names = "aclk", "hclk";
+		iommus = <&vpu_mmu>;
+		power-domains = <&power RK3228_PD_VPU>;
+	};
+
+	vpu_mmu: iommu@20020800 {
+		compatible = "rockchip,iommu";
+		reg = <0x20020800 0x100>;
+		interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
+		clock-names = "aclk", "iface";
+		power-domains = <&power RK3228_PD_VPU>;
+		#iommu-cells = <0>;
+	};
+
+	vdec: video-codec@20030000 {
+		compatible = "rockchip,rk3228-vdec", "rockchip,rk3399-vdec";
+		reg = <0x20030000 0x480>;
+		interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>,
+			 <&cru SCLK_VDEC_CABAC>, <&cru SCLK_VDEC_CORE>;
+		clock-names = "axi", "ahb", "cabac", "core";
+		assigned-clocks = <&cru SCLK_VDEC_CABAC>, <&cru SCLK_VDEC_CORE>;
+		assigned-clock-rates = <300000000>, <300000000>;
+		iommus = <&vdec_mmu>;
+		power-domains = <&power RK3228_PD_RKVDEC>;
+	};
+
+	vdec_mmu: iommu@20030480 {
+		compatible = "rockchip,iommu";
+		reg = <0x20030480 0x40>, <0x200304c0 0x40>;
+		interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>;
+		clock-names = "aclk", "iface";
+		power-domains = <&power RK3228_PD_RKVDEC>;
+		#iommu-cells = <0>;
+	};
+
+	vop: vop@20050000 {
+		compatible = "rockchip,rk3228-vop";
+		reg = <0x20050000 0x1ffc>;
+		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru ACLK_VOP>, <&cru DCLK_VOP>, <&cru HCLK_VOP>;
+		clock-names = "aclk_vop", "dclk_vop", "hclk_vop";
+		resets = <&cru SRST_VOP_A>, <&cru SRST_VOP_H>, <&cru SRST_VOP_D>;
+		reset-names = "axi", "ahb", "dclk";
+		iommus = <&vop_mmu>;
+		power-domains = <&power RK3228_PD_VOP>;
+		status = "disabled";
+
+		vop_out: port {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			vop_out_hdmi: endpoint@0 {
+				reg = <0>;
+				remote-endpoint = <&hdmi_in_vop>;
+			};
+		};
+	};
+
+	vop_mmu: iommu@20053f00 {
+		compatible = "rockchip,iommu";
+		reg = <0x20053f00 0x100>;
+		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru ACLK_VOP>, <&cru HCLK_VOP>;
+		clock-names = "aclk", "iface";
+		power-domains = <&power RK3228_PD_VOP>;
+		#iommu-cells = <0>;
+		status = "disabled";
+	};
+
+	rga: rga@20060000 {
+		compatible = "rockchip,rk3228-rga", "rockchip,rk3288-rga";
+		reg = <0x20060000 0x1000>;
+		interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru SCLK_RGA>;
+		clock-names = "aclk", "hclk", "sclk";
+		power-domains = <&power RK3228_PD_VIO>;
+		resets = <&cru SRST_RGA>, <&cru SRST_RGA_A>, <&cru SRST_RGA_H>;
+		reset-names = "core", "axi", "ahb";
+	};
+
+	iep_mmu: iommu@20070800 {
+		compatible = "rockchip,iommu";
+		reg = <0x20070800 0x100>;
+		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>;
+		clock-names = "aclk", "iface";
+		power-domains = <&power RK3228_PD_VIO>;
+		#iommu-cells = <0>;
+		status = "disabled";
+	};
+
+	hdmi: hdmi@200a0000 {
+		compatible = "rockchip,rk3228-dw-hdmi";
+		reg = <0x200a0000 0x20000>;
+		reg-io-width = <4>;
+		interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
+		assigned-clocks = <&cru SCLK_HDMI_PHY>;
+		assigned-clock-parents = <&hdmi_phy>;
+		clocks = <&cru SCLK_HDMI_HDCP>, <&cru PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_CEC>;
+		clock-names = "isfr", "iahb", "cec";
+		pinctrl-names = "default";
+		pinctrl-0 = <&hdmii2c_xfer &hdmi_hpd &hdmi_cec>;
+		resets = <&cru SRST_HDMI_P>;
+		reset-names = "hdmi";
+		phys = <&hdmi_phy>;
+		phy-names = "hdmi";
+		rockchip,grf = <&grf>;
+		status = "disabled";
+
+		ports {
+			hdmi_in: port {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				hdmi_in_vop: endpoint@0 {
+					reg = <0>;
+					remote-endpoint = <&vop_out_hdmi>;
+				};
+			};
+		};
+	};
+
+	sdmmc: mmc@30000000 {
  		compatible = "rockchip,rk3228-dw-mshc", "rockchip,rk3288-dw-mshc";
  		reg = <0x30000000 0x4000>;
  		interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
  			 <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
-		clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
  		fifo-depth = <0x100>;
  		pinctrl-names = "default";
  		pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
  		status = "disabled";
  	};
 
-	sdio: dwmmc@30010000 {
+	sdio: mmc@30010000 {
  		compatible = "rockchip,rk3228-dw-mshc", "rockchip,rk3288-dw-mshc";
  		reg = <0x30010000 0x4000>;
  		interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,
  			 <&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;
-		clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
  		fifo-depth = <0x100>;
  		pinctrl-names = "default";
  		pinctrl-0 = <&sdio_clk &sdio_cmd &sdio_bus4>;
  		status = "disabled";
  	};
 
-	emmc: dwmmc@30020000 {
-		compatible = "rockchip,rk3288-dw-mshc";
+	emmc: mmc@30020000 {
+		compatible = "rockchip,rk3228-dw-mshc", "rockchip,rk3288-dw-mshc";
  		reg = <0x30020000 0x4000>;
  		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
+		clock-frequency = <37500000>;
+		max-frequency = <37500000>;
  		clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
  			 <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
-		clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
  		bus-width = <8>;
-		default-sample-phase = <158>;
-		num-slots = <1>;
+		rockchip,default-sample-phase = <158>;
  		fifo-depth = <0x100>;
  		pinctrl-names = "default";
  		pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
@@ -410,13 +786,79 @@
  		status = "disabled";
  	};
 
-	usb20_otg: usb@30040000 {
-		compatible = "rockchip,rk3229-usb", "rockchip,rk3288-usb",
+	usb_otg: usb@30040000 {
+		compatible = "rockchip,rk3228-usb", "rockchip,rk3066-usb",
  			     "snps,dwc2";
  		reg = <0x30040000 0x40000>;
  		interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
-		hnp-srp-disable;
+		clocks = <&cru HCLK_OTG>;
+		clock-names = "otg";
  		dr_mode = "otg";
+		g-np-tx-fifo-size = <16>;
+		g-rx-fifo-size = <280>;
+		g-tx-fifo-size = <256 128 128 64 32 16>;
+		phys = <&u2phy0_otg>;
+		phy-names = "usb2-phy";
+		status = "disabled";
+	};
+
+	usb_host0_ehci: usb@30080000 {
+		compatible = "generic-ehci";
+		reg = <0x30080000 0x20000>;
+		interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru HCLK_HOST0>, <&u2phy0>;
+		phys = <&u2phy0_host>;
+		phy-names = "usb";
+		status = "disabled";
+	};
+
+	usb_host0_ohci: usb@300a0000 {
+		compatible = "generic-ohci";
+		reg = <0x300a0000 0x20000>;
+		interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru HCLK_HOST0>, <&u2phy0>;
+		phys = <&u2phy0_host>;
+		phy-names = "usb";
+		status = "disabled";
+	};
+
+	usb_host1_ehci: usb@300c0000 {
+		compatible = "generic-ehci";
+		reg = <0x300c0000 0x20000>;
+		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru HCLK_HOST1>, <&u2phy1>;
+		phys = <&u2phy1_otg>;
+		phy-names = "usb";
+		status = "disabled";
+	};
+
+	usb_host1_ohci: usb@300e0000 {
+		compatible = "generic-ohci";
+		reg = <0x300e0000 0x20000>;
+		interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru HCLK_HOST1>, <&u2phy1>;
+		phys = <&u2phy1_otg>;
+		phy-names = "usb";
+		status = "disabled";
+	};
+
+	usb_host2_ehci: usb@30100000 {
+		compatible = "generic-ehci";
+		reg = <0x30100000 0x20000>;
+		interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru HCLK_HOST2>, <&u2phy1>;
+		phys = <&u2phy1_host>;
+		phy-names = "usb";
+		status = "disabled";
+	};
+
+	usb_host2_ohci: usb@30120000 {
+		compatible = "generic-ohci";
+		reg = <0x30120000 0x20000>;
+		interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru HCLK_HOST2>, <&u2phy1>;
+		phys = <&u2phy1_host>;
+		phy-names = "usb";
  		status = "disabled";
  	};
 
@@ -439,6 +881,51 @@
  		status = "disabled";
  	};
 
+	qos_iep: qos@31030080 {
+		compatible = "rockchip,rk3228-qos", "syscon";
+		reg = <0x31030080 0x20>;
+	};
+
+	qos_rga_w: qos@31030100 {
+		compatible = "rockchip,rk3228-qos", "syscon";
+		reg = <0x31030100 0x20>;
+	};
+
+	qos_hdcp: qos@31030180 {
+		compatible = "rockchip,rk3228-qos", "syscon";
+		reg = <0x31030180 0x20>;
+	};
+
+	qos_rga_r: qos@31030200 {
+		compatible = "rockchip,rk3228-qos", "syscon";
+		reg = <0x31030200 0x20>;
+	};
+
+	qos_vpu: qos@31040000 {
+		compatible = "rockchip,rk3228-qos", "syscon";
+		reg = <0x31040000 0x20>;
+	};
+
+	qos_gpu: qos@31050000 {
+		compatible = "rockchip,rk3228-qos", "syscon";
+		reg = <0x31050000 0x20>;
+	};
+
+	qos_vop: qos@31060000 {
+		compatible = "rockchip,rk3228-qos", "syscon";
+		reg = <0x31060000 0x20>;
+	};
+
+	qos_rkvdec_r: qos@31070000 {
+		compatible = "rockchip,rk3228-qos", "syscon";
+		reg = <0x31070000 0x20>;
+	};
+
+	qos_rkvdec_w: qos@31070080 {
+		compatible = "rockchip,rk3228-qos", "syscon";
+		reg = <0x31070080 0x20>;
+	};
+
  	gic: interrupt-controller@32010000 {
  		compatible = "arm,gic-400";
  		interrupt-controller;
@@ -459,7 +946,7 @@
  		#size-cells = <1>;
  		ranges;
 
-		gpio0: gpio0@11110000 {
+		gpio0: gpio@11110000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0x11110000 0x100>;
  			interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
@@ -472,7 +959,7 @@
  			#interrupt-cells = <2>;
  		};
 
-		gpio1: gpio1@11120000 {
+		gpio1: gpio@11120000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0x11120000 0x100>;
  			interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
@@ -485,7 +972,7 @@
  			#interrupt-cells = <2>;
  		};
 
-		gpio2: gpio2@11130000 {
+		gpio2: gpio@11130000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0x11130000 0x100>;
  			interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
@@ -498,7 +985,7 @@
  			#interrupt-cells = <2>;
  		};
 
-		gpio3: gpio3@11140000 {
+		gpio3: gpio@11140000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0x11140000 0x100>;
  			interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
@@ -529,222 +1016,277 @@
 
  		sdmmc {
  			sdmmc_clk: sdmmc-clk {
-				rockchip,pins = <1 16 RK_FUNC_1 &pcfg_pull_none_drv_12ma>;
+				rockchip,pins = <1 RK_PC0 1 &pcfg_pull_none_drv_12ma>;
  			};
 
  			sdmmc_cmd: sdmmc-cmd {
-				rockchip,pins = <1 15 RK_FUNC_1 &pcfg_pull_none_drv_12ma>;
+				rockchip,pins = <1 RK_PB7 1 &pcfg_pull_none_drv_12ma>;
  			};
 
  			sdmmc_bus4: sdmmc-bus4 {
-				rockchip,pins = <1 18 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
-						<1 19 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
-						<1 20 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
-						<1 21 RK_FUNC_1 &pcfg_pull_none_drv_12ma>;
+				rockchip,pins = <1 RK_PC2 1 &pcfg_pull_none_drv_12ma>,
+						<1 RK_PC3 1 &pcfg_pull_none_drv_12ma>,
+						<1 RK_PC4 1 &pcfg_pull_none_drv_12ma>,
+						<1 RK_PC5 1 &pcfg_pull_none_drv_12ma>;
  			};
  		};
 
  		sdio {
  			sdio_clk: sdio-clk {
-				rockchip,pins = <3 0 RK_FUNC_1 &pcfg_pull_none_drv_12ma>;
+				rockchip,pins = <3 RK_PA0 1 &pcfg_pull_none_drv_12ma>;
  			};
 
  			sdio_cmd: sdio-cmd {
-				rockchip,pins = <3 1 RK_FUNC_1 &pcfg_pull_none_drv_12ma>;
+				rockchip,pins = <3 RK_PA1 1 &pcfg_pull_none_drv_12ma>;
  			};
 
  			sdio_bus4: sdio-bus4 {
-				rockchip,pins = <3 2 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
-						<3 3 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
-						<3 4 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
-						<3 5 RK_FUNC_1 &pcfg_pull_none_drv_12ma>;
+				rockchip,pins = <3 RK_PA2 1 &pcfg_pull_none_drv_12ma>,
+						<3 RK_PA3 1 &pcfg_pull_none_drv_12ma>,
+						<3 RK_PA4 1 &pcfg_pull_none_drv_12ma>,
+						<3 RK_PA5 1 &pcfg_pull_none_drv_12ma>;
  			};
  		};
 
  		emmc {
  			emmc_clk: emmc-clk {
-				rockchip,pins = <2 RK_PA7 RK_FUNC_2 &pcfg_pull_none>;
+				rockchip,pins = <2 RK_PA7 2 &pcfg_pull_none>;
  			};
 
  			emmc_cmd: emmc-cmd {
-				rockchip,pins = <1 RK_PC6 RK_FUNC_2 &pcfg_pull_none>;
+				rockchip,pins = <1 RK_PC6 2 &pcfg_pull_none>;
  			};
 
  			emmc_bus8: emmc-bus8 {
-				rockchip,pins = <1 RK_PD0 RK_FUNC_2 &pcfg_pull_none>,
-						<1 RK_PD1 RK_FUNC_2 &pcfg_pull_none>,
-						<1 RK_PD2 RK_FUNC_2 &pcfg_pull_none>,
-						<1 RK_PD3 RK_FUNC_2 &pcfg_pull_none>,
-						<1 RK_PD4 RK_FUNC_2 &pcfg_pull_none>,
-						<1 RK_PD5 RK_FUNC_2 &pcfg_pull_none>,
-						<1 RK_PD6 RK_FUNC_2 &pcfg_pull_none>,
-						<1 RK_PD7 RK_FUNC_2 &pcfg_pull_none>;
+				rockchip,pins = <1 RK_PD0 2 &pcfg_pull_none>,
+						<1 RK_PD1 2 &pcfg_pull_none>,
+						<1 RK_PD2 2 &pcfg_pull_none>,
+						<1 RK_PD3 2 &pcfg_pull_none>,
+						<1 RK_PD4 2 &pcfg_pull_none>,
+						<1 RK_PD5 2 &pcfg_pull_none>,
+						<1 RK_PD6 2 &pcfg_pull_none>,
+						<1 RK_PD7 2 &pcfg_pull_none>;
  			};
  		};
 
  		gmac {
  			rgmii_pins: rgmii-pins {
-				rockchip,pins = <2 RK_PB6 RK_FUNC_1 &pcfg_pull_none>,
-						<2 RK_PB4 RK_FUNC_1 &pcfg_pull_none>,
-						<2 RK_PD1 RK_FUNC_1 &pcfg_pull_none>,
-						<2 RK_PC3 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
-						<2 RK_PC2 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
-						<2 RK_PC6 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
-						<2 RK_PC7 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
-						<2 RK_PB1 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
-						<2 RK_PB5 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
-						<2 RK_PC1 RK_FUNC_1 &pcfg_pull_none>,
-						<2 RK_PC0 RK_FUNC_1 &pcfg_pull_none>,
-						<2 RK_PC5 RK_FUNC_2 &pcfg_pull_none>,
-						<2 RK_PC4 RK_FUNC_2 &pcfg_pull_none>,
-						<2 RK_PB3 RK_FUNC_1 &pcfg_pull_none>,
-						<2 RK_PB0 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <2 RK_PB6 1 &pcfg_pull_none>,
+						<2 RK_PB4 1 &pcfg_pull_none>,
+						<2 RK_PD1 1 &pcfg_pull_none>,
+						<2 RK_PC3 1 &pcfg_pull_none_drv_12ma>,
+						<2 RK_PC2 1 &pcfg_pull_none_drv_12ma>,
+						<2 RK_PC6 1 &pcfg_pull_none_drv_12ma>,
+						<2 RK_PC7 1 &pcfg_pull_none_drv_12ma>,
+						<2 RK_PB1 1 &pcfg_pull_none_drv_12ma>,
+						<2 RK_PB5 1 &pcfg_pull_none_drv_12ma>,
+						<2 RK_PC1 1 &pcfg_pull_none>,
+						<2 RK_PC0 1 &pcfg_pull_none>,
+						<2 RK_PC5 2 &pcfg_pull_none>,
+						<2 RK_PC4 2 &pcfg_pull_none>,
+						<2 RK_PB3 1 &pcfg_pull_none>,
+						<2 RK_PB0 1 &pcfg_pull_none>;
  			};
 
  			rmii_pins: rmii-pins {
-				rockchip,pins = <2 RK_PB6 RK_FUNC_1 &pcfg_pull_none>,
-						<2 RK_PB4 RK_FUNC_1 &pcfg_pull_none>,
-						<2 RK_PD1 RK_FUNC_1 &pcfg_pull_none>,
-						<2 RK_PC3 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
-						<2 RK_PC2 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
-						<2 RK_PB5 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
-						<2 RK_PC1 RK_FUNC_1 &pcfg_pull_none>,
-						<2 RK_PC0 RK_FUNC_1 &pcfg_pull_none>,
-						<2 RK_PB0 RK_FUNC_1 &pcfg_pull_none>,
-						<2 RK_PB7 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <2 RK_PB6 1 &pcfg_pull_none>,
+						<2 RK_PB4 1 &pcfg_pull_none>,
+						<2 RK_PD1 1 &pcfg_pull_none>,
+						<2 RK_PC3 1 &pcfg_pull_none_drv_12ma>,
+						<2 RK_PC2 1 &pcfg_pull_none_drv_12ma>,
+						<2 RK_PB5 1 &pcfg_pull_none_drv_12ma>,
+						<2 RK_PC1 1 &pcfg_pull_none>,
+						<2 RK_PC0 1 &pcfg_pull_none>,
+						<2 RK_PB0 1 &pcfg_pull_none>,
+						<2 RK_PB7 1 &pcfg_pull_none>;
  			};
 
  			phy_pins: phy-pins {
-				rockchip,pins = <2 RK_PB6 RK_FUNC_2 &pcfg_pull_none>,
-						<2 RK_PB0 RK_FUNC_2 &pcfg_pull_none>;
+				rockchip,pins = <2 RK_PB6 2 &pcfg_pull_none>,
+						<2 RK_PB0 2 &pcfg_pull_none>;
+			};
+		};
+
+		hdmi {
+			hdmi_hpd: hdmi-hpd {
+				rockchip,pins = <0 RK_PB7 1 &pcfg_pull_down>;
+			};
+
+			hdmii2c_xfer: hdmii2c-xfer {
+				rockchip,pins = <0 RK_PA6 2 &pcfg_pull_none>,
+						<0 RK_PA7 2 &pcfg_pull_none>;
+			};
+
+			hdmi_cec: hdmi-cec {
+				rockchip,pins = <0 RK_PC4 1 &pcfg_pull_none>;
  			};
  		};
 
  		i2c0 {
  			i2c0_xfer: i2c0-xfer {
-				rockchip,pins = <0 RK_PA0 RK_FUNC_1 &pcfg_pull_none>,
-						<0 RK_PA1 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PA0 1 &pcfg_pull_none>,
+						<0 RK_PA1 1 &pcfg_pull_none>;
  			};
  		};
 
  		i2c1 {
  			i2c1_xfer: i2c1-xfer {
-				rockchip,pins = <0 RK_PA2 RK_FUNC_1 &pcfg_pull_none>,
-						<0 RK_PA3 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PA2 1 &pcfg_pull_none>,
+						<0 RK_PA3 1 &pcfg_pull_none>;
  			};
  		};
 
  		i2c2 {
  			i2c2_xfer: i2c2-xfer {
-				rockchip,pins = <2 RK_PC4 RK_FUNC_1 &pcfg_pull_none>,
-						<2 RK_PC5 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <2 RK_PC4 1 &pcfg_pull_none>,
+						<2 RK_PC5 1 &pcfg_pull_none>;
  			};
  		};
 
  		i2c3 {
  			i2c3_xfer: i2c3-xfer {
-				rockchip,pins = <0 RK_PA6 RK_FUNC_1 &pcfg_pull_none>,
-						<0 RK_PA7 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PA6 1 &pcfg_pull_none>,
+						<0 RK_PA7 1 &pcfg_pull_none>;
+			};
+		};
+
+		spi0 {
+			spi0_clk: spi0-clk {
+				rockchip,pins = <0 RK_PB1 2 &pcfg_pull_up>;
+			};
+			spi0_cs0: spi0-cs0 {
+				rockchip,pins = <0 RK_PB6 2 &pcfg_pull_up>;
+			};
+			spi0_tx: spi0-tx {
+				rockchip,pins = <0 RK_PB3 2 &pcfg_pull_up>;
+			};
+			spi0_rx: spi0-rx {
+				rockchip,pins = <0 RK_PB5 2 &pcfg_pull_up>;
+			};
+			spi0_cs1: spi0-cs1 {
+				rockchip,pins = <1 RK_PB4 1 &pcfg_pull_up>;
+			};
+		};
+
+		spi1 {
+			spi1_clk: spi1-clk {
+				rockchip,pins = <0 RK_PC7 2 &pcfg_pull_up>;
+			};
+			spi1_cs0: spi1-cs0 {
+				rockchip,pins = <2 RK_PA2 2 &pcfg_pull_up>;
+			};
+			spi1_rx: spi1-rx {
+				rockchip,pins = <2 RK_PA0 2 &pcfg_pull_up>;
+			};
+			spi1_tx: spi1-tx {
+				rockchip,pins = <2 RK_PA1 2 &pcfg_pull_up>;
+			};
+			spi1_cs1: spi1-cs1 {
+				rockchip,pins = <2 RK_PA3 2 &pcfg_pull_up>;
  			};
  		};
 
  		i2s1 {
  			i2s1_bus: i2s1-bus {
-				rockchip,pins = <0 RK_PB0 RK_FUNC_1 &pcfg_pull_none>,
-						<0 RK_PB1 RK_FUNC_1 &pcfg_pull_none>,
-						<0 RK_PB3 RK_FUNC_1 &pcfg_pull_none>,
-						<0 RK_PB4 RK_FUNC_1 &pcfg_pull_none>,
-						<0 RK_PB5 RK_FUNC_1 &pcfg_pull_none>,
-						<0 RK_PB6 RK_FUNC_1 &pcfg_pull_none>,
-						<1 RK_PA2 RK_FUNC_1 &pcfg_pull_none>,
-						<1 RK_PA4 RK_FUNC_1 &pcfg_pull_none>,
-						<1 RK_PA5 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PB0 1 &pcfg_pull_none>,
+						<0 RK_PB1 1 &pcfg_pull_none>,
+						<0 RK_PB3 1 &pcfg_pull_none>,
+						<0 RK_PB4 1 &pcfg_pull_none>,
+						<0 RK_PB5 1 &pcfg_pull_none>,
+						<0 RK_PB6 1 &pcfg_pull_none>,
+						<1 RK_PA2 2 &pcfg_pull_none>,
+						<1 RK_PA4 2 &pcfg_pull_none>,
+						<1 RK_PA5 2 &pcfg_pull_none>;
  			};
  		};
 
  		pwm0 {
  			pwm0_pin: pwm0-pin {
-				rockchip,pins = <3 RK_PC5 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PC5 1 &pcfg_pull_none>;
  			};
  		};
 
  		pwm1 {
  			pwm1_pin: pwm1-pin {
-				rockchip,pins = <0 RK_PD6 RK_FUNC_2 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PD6 2 &pcfg_pull_none>;
  			};
  		};
 
  		pwm2 {
  			pwm2_pin: pwm2-pin {
-				rockchip,pins = <1 RK_PB4 RK_FUNC_2 &pcfg_pull_none>;
+				rockchip,pins = <1 RK_PB4 2 &pcfg_pull_none>;
  			};
  		};
 
  		pwm3 {
  			pwm3_pin: pwm3-pin {
-				rockchip,pins = <1 RK_PB3 RK_FUNC_2 &pcfg_pull_none>;
+				rockchip,pins = <1 RK_PB3 2 &pcfg_pull_none>;
+			};
+		};
+
+		spdif {
+			spdif_tx: spdif-tx {
+				rockchip,pins = <3 RK_PD7 2 &pcfg_pull_none>;
  			};
  		};
 
  		tsadc {
-			otp_gpio: otp-gpio {
+			otp_pin: otp-pin {
  				rockchip,pins = <0 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
  			};
 
  			otp_out: otp-out {
-				rockchip,pins = <0 RK_PD0 RK_FUNC_2 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PD0 2 &pcfg_pull_none>;
  			};
  		};
 
  		uart0 {
  			uart0_xfer: uart0-xfer {
-				rockchip,pins = <2 RK_PD2 RK_FUNC_1 &pcfg_pull_none>,
-						<2 RK_PD3 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <2 RK_PD2 1 &pcfg_pull_none>,
+						<2 RK_PD3 1 &pcfg_pull_none>;
  			};
 
  			uart0_cts: uart0-cts {
-				rockchip,pins = <2 RK_PD5 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <2 RK_PD5 1 &pcfg_pull_none>;
  			};
 
  			uart0_rts: uart0-rts {
-				rockchip,pins = <0 RK_PC1 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PC1 1 &pcfg_pull_none>;
  			};
  		};
 
  		uart1 {
  			uart1_xfer: uart1-xfer {
-				rockchip,pins = <1 RK_PB1 RK_FUNC_1 &pcfg_pull_none>,
-						<1 RK_PB2 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <1 RK_PB1 1 &pcfg_pull_none>,
+						<1 RK_PB2 1 &pcfg_pull_none>;
  			};
 
  			uart1_cts: uart1-cts {
-				rockchip,pins = <1 RK_PB0 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <1 RK_PB0 1 &pcfg_pull_none>;
  			};
 
  			uart1_rts: uart1-rts {
-				rockchip,pins = <1 RK_PB3 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <1 RK_PB3 1 &pcfg_pull_none>;
  			};
  		};
 
  		uart2 {
  			uart2_xfer: uart2-xfer {
-				rockchip,pins = <1 RK_PC2 RK_FUNC_2 &pcfg_pull_up>,
-						<1 RK_PC3 RK_FUNC_2 &pcfg_pull_none>;
+				rockchip,pins = <1 RK_PC2 2 &pcfg_pull_up>,
+						<1 RK_PC3 2 &pcfg_pull_none>;
  			};
 
-			uart2_cts: uart2-cts {
-				rockchip,pins = <0 RK_PD1 RK_FUNC_1 &pcfg_pull_none>;
+			uart21_xfer: uart21-xfer {
+				rockchip,pins = <1 RK_PB2 2 &pcfg_pull_up>,
+						<1 RK_PB1 2 &pcfg_pull_none>;
  			};
 
-			uart2_rts: uart2-rts {
-				rockchip,pins = <0 RK_PD0 RK_FUNC_1 &pcfg_pull_none>;
+			uart2_cts: uart2-cts {
+				rockchip,pins = <0 RK_PD1 1 &pcfg_pull_none>;
  			};
-		};
 
-		uart2-1 {
-			uart21_xfer: uart21-xfer {
-				rockchip,pins = <1 10 RK_FUNC_2 &pcfg_pull_up>,
-						<1 9 RK_FUNC_2 &pcfg_pull_none>;
+			uart2_rts: uart2-rts {
+				rockchip,pins = <0 RK_PD0 1 &pcfg_pull_none>;
  			};
  		};
  	};
#7 lore raw

PATCH v3 5/12 arm: dts: rockchip: sync rk3229-evb.dts from Linux

In reply to Johan Jonker

Sync rk3229-evb.dts from Linux version 5.17.

---
 arch/arm/dts/rk3229-evb.dts | 212 +++++++++++++++++++++++++++++++++---
 arch/arm/dts/rk3229.dtsi    |  52 +++++++++
 2 files changed, 249 insertions(+), 15 deletions(-)
 create mode 100644 arch/arm/dts/rk3229.dtsi
arch/arm/dts/rk3229-evb.dts +197 -15
index d2681d1a..797476e8 100644
@@ -1,21 +1,32 @@
-// SPDX-License-Identifier: GPL-2.0+ OR X11
-/*
- * (C) Copyright 2017 Rockchip Electronics Co., Ltd.
- */
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 
 /dts-v1/;
 
-#include "rk322x.dtsi"
+#include <dt-bindings/input/input.h>
+#include "rk3229.dtsi"
 
 / {
 	model = "Rockchip RK3229 Evaluation board";
 	compatible = "rockchip,rk3229-evb", "rockchip,rk3229";
 
+	aliases {
+		mmc0 = &emmc;
+	};
+
 	memory@60000000 {
 		device_type = "memory";
 		reg = <0x60000000 0x40000000>;
 	};
 
+	dc_12v: dc-12v-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "dc_12v";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <12000000>;
+		regulator-max-microvolt = <12000000>;
+	};
+
 	ext_gmac: ext_gmac {
 		compatible = "fixed-clock";
 		clock-frequency = <125000000>;
@@ -23,6 +34,18 @@
 		#clock-cells = <0>;
 	};
 
+	vcc_host: vcc-host-regulator {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio3 RK_PC4 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&host_vbus_drv>;
+		regulator-name = "vcc_host";
+		regulator-always-on;
+		regulator-boot-on;
+		vin-supply = <&vcc_sys>;
+	};
+
 	vcc_phy: vcc-phy-regulator {
 		compatible = "regulator-fixed";
 		enable-active-high;
@@ -31,7 +54,95 @@
 		regulator-max-microvolt = <1800000>;
 		regulator-always-on;
 		regulator-boot-on;
+		vin-supply = <&vccio_1v8>;
+	};
+
+	vcc_sys: vcc-sys-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc_sys";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&dc_12v>;
+	};
+
+	vccio_1v8: vccio-1v8-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vccio_1v8";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-always-on;
+		vin-supply = <&vcc_sys>;
+	};
+
+	vccio_3v3: vccio-3v3-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vccio_3v3";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-always-on;
+		vin-supply = <&vcc_sys>;
+	};
+
+	vdd_arm: vdd-arm-regulator {
+		compatible = "pwm-regulator";
+		pwms = <&pwm1 0 25000 1>;
+		pwm-supply = <&vcc_sys>;
+		regulator-name = "vdd_arm";
+		regulator-min-microvolt = <950000>;
+		regulator-max-microvolt = <1400000>;
+		regulator-always-on;
+		regulator-boot-on;
 	};
+
+	vdd_log: vdd-log-regulator {
+		compatible = "pwm-regulator";
+		pwms = <&pwm2 0 25000 1>;
+		pwm-supply = <&vcc_sys>;
+		regulator-name = "vdd_log";
+		regulator-min-microvolt = <1000000>;
+		regulator-max-microvolt = <1300000>;
+		regulator-always-on;
+		regulator-boot-on;
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+		autorepeat;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pwr_key>;
+
+		power_key: power-key {
+			label = "GPIO Key Power";
+			gpios = <&gpio3 23 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_POWER>;
+			debounce-interval = <100>;
+			wakeup-source;
+		};
+	};
+};
+
+&cpu0 {
+	cpu-supply = <&vdd_arm>;
+};
+
+&cpu1 {
+	cpu-supply = <&vdd_arm>;
+};
+
+&cpu2 {
+	cpu-supply = <&vdd_arm>;
+};
+
+&cpu3 {
+	cpu-supply = <&vdd_arm>;
+};
+
+&emmc {
+	cap-mmc-highspeed;
+	non-removable;
+	status = "okay";
 };
 
 &gmac {
@@ -50,25 +161,96 @@
 	status = "okay";
 };
 
-&emmc {
+&io_domains {
 	status = "okay";
+
+	vccio1-supply = <&vccio_3v3>;
+	vccio2-supply = <&vccio_1v8>;
+	vccio4-supply = <&vccio_3v3>;
 };
 
-&sdmmc {
+&pinctrl {
+	keys {
+		pwr_key: pwr-key {
+			rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
+	usb {
+		host_vbus_drv: host-vbus-drv {
+			rockchip,pins = <3 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+};
+
+&pwm1 {
+	status = "okay";
+};
+
+&pwm2 {
+	status = "okay";
+};
+
+&tsadc {
+	rockchip,hw-tshut-mode = <0>; /* tshut mode 0:CRU 1:GPIO */
 	status = "okay";
-	bus-width = <4>;
-	cap-mmc-highspeed;
-	cap-sd-highspeed;
-	card-detect-delay = <200>;
-	disable-wp;
-	num-slots = <1>;
-	supports-sd;
 };
 
 &uart2 {
 	status = "okay";
 };
 
+&u2phy0 {
+	status = "okay";
+
+	u2phy0_otg: otg-port {
+		status = "okay";
+	};
+
+	u2phy0_host: host-port {
+		phy-supply = <&vcc_host>;
+		status = "okay";
+	};
+};
+
+&u2phy1 {
+	status = "okay";
+
+	u2phy1_otg: otg-port {
+		phy-supply = <&vcc_host>;
+		status = "okay";
+	};
+
+	u2phy1_host: host-port {
+		phy-supply = <&vcc_host>;
+		status = "okay";
+	};
+};
+
+&usb_host0_ehci {
+	status = "okay";
+};
+
+&usb_host0_ohci {
+	status = "okay";
+};
+
+&usb_host1_ehci {
+	status = "okay";
+};
+
+&usb_host1_ohci {
+	status = "okay";
+};
+
+&usb_host2_ehci {
+	status = "okay";
+};
+
+&usb_host2_ohci {
+	status = "okay";
+};
+
 &usb_otg {
-       status = "okay";
+	status = "okay";
 };
arch/arm/dts/rk3229.dtsi new file +52 -0

52 lines not on this page · raw message

Signature · 1 line
2.20.1
Reviewed-by on v3 5/12
#8 lore raw

Re: [PATCH v3 05/12] arm: dts: rockchip: sync rk3229-evb.dts from Linux

Quoted 3 lines · Johan Jonker

Sync rk3229-evb.dts from Linux version 5.17.

Thanks,
- Kever

Quoted 328 lines
---
  arch/arm/dts/rk3229-evb.dts | 212 +++++++++++++++++++++++++++++++++---
  arch/arm/dts/rk3229.dtsi    |  52 +++++++++
  2 files changed, 249 insertions(+), 15 deletions(-)

create mode 100644 arch/arm/dts/rk3229.dtsi

arch/arm/dts/rk3229-evb.dts +197 -15
index d2681d1a..797476e8 100644
@@ -1,21 +1,32 @@
-// SPDX-License-Identifier: GPL-2.0+ OR X11
-/*
- * (C) Copyright 2017 Rockchip Electronics Co., Ltd.
- */
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 
  /dts-v1/;
 
-#include "rk322x.dtsi"
+#include <dt-bindings/input/input.h>
+#include "rk3229.dtsi"
 
  / {
  	model = "Rockchip RK3229 Evaluation board";
  	compatible = "rockchip,rk3229-evb", "rockchip,rk3229";
 
+	aliases {
+		mmc0 = &emmc;
+	};
+
  	memory@60000000 {
  		device_type = "memory";
  		reg = <0x60000000 0x40000000>;
  	};
 
+	dc_12v: dc-12v-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "dc_12v";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <12000000>;
+		regulator-max-microvolt = <12000000>;
+	};
+
  	ext_gmac: ext_gmac {
  		compatible = "fixed-clock";
  		clock-frequency = <125000000>;
@@ -23,6 +34,18 @@
  		#clock-cells = <0>;
  	};
 
+	vcc_host: vcc-host-regulator {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio3 RK_PC4 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&host_vbus_drv>;
+		regulator-name = "vcc_host";
+		regulator-always-on;
+		regulator-boot-on;
+		vin-supply = <&vcc_sys>;
+	};
+
  	vcc_phy: vcc-phy-regulator {
  		compatible = "regulator-fixed";
  		enable-active-high;
@@ -31,7 +54,95 @@
  		regulator-max-microvolt = <1800000>;
  		regulator-always-on;
  		regulator-boot-on;
+		vin-supply = <&vccio_1v8>;
+	};
+
+	vcc_sys: vcc-sys-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc_sys";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&dc_12v>;
+	};
+
+	vccio_1v8: vccio-1v8-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vccio_1v8";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-always-on;
+		vin-supply = <&vcc_sys>;
+	};
+
+	vccio_3v3: vccio-3v3-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vccio_3v3";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-always-on;
+		vin-supply = <&vcc_sys>;
+	};
+
+	vdd_arm: vdd-arm-regulator {
+		compatible = "pwm-regulator";
+		pwms = <&pwm1 0 25000 1>;
+		pwm-supply = <&vcc_sys>;
+		regulator-name = "vdd_arm";
+		regulator-min-microvolt = <950000>;
+		regulator-max-microvolt = <1400000>;
+		regulator-always-on;
+		regulator-boot-on;
  	};
+
+	vdd_log: vdd-log-regulator {
+		compatible = "pwm-regulator";
+		pwms = <&pwm2 0 25000 1>;
+		pwm-supply = <&vcc_sys>;
+		regulator-name = "vdd_log";
+		regulator-min-microvolt = <1000000>;
+		regulator-max-microvolt = <1300000>;
+		regulator-always-on;
+		regulator-boot-on;
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+		autorepeat;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pwr_key>;
+
+		power_key: power-key {
+			label = "GPIO Key Power";
+			gpios = <&gpio3 23 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_POWER>;
+			debounce-interval = <100>;
+			wakeup-source;
+		};
+	};
+};
+
+&cpu0 {
+	cpu-supply = <&vdd_arm>;
+};
+
+&cpu1 {
+	cpu-supply = <&vdd_arm>;
+};
+
+&cpu2 {
+	cpu-supply = <&vdd_arm>;
+};
+
+&cpu3 {
+	cpu-supply = <&vdd_arm>;
+};
+
+&emmc {
+	cap-mmc-highspeed;
+	non-removable;
+	status = "okay";
  };
 
  &gmac {
@@ -50,25 +161,96 @@
  	status = "okay";
  };
 
-&emmc {
+&io_domains {
  	status = "okay";
+
+	vccio1-supply = <&vccio_3v3>;
+	vccio2-supply = <&vccio_1v8>;
+	vccio4-supply = <&vccio_3v3>;
  };
 
-&sdmmc {
+&pinctrl {
+	keys {
+		pwr_key: pwr-key {
+			rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
+	usb {
+		host_vbus_drv: host-vbus-drv {
+			rockchip,pins = <3 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+};
+
+&pwm1 {
+	status = "okay";
+};
+
+&pwm2 {
+	status = "okay";
+};
+
+&tsadc {
+	rockchip,hw-tshut-mode = <0>; /* tshut mode 0:CRU 1:GPIO */
  	status = "okay";
-	bus-width = <4>;
-	cap-mmc-highspeed;
-	cap-sd-highspeed;
-	card-detect-delay = <200>;
-	disable-wp;
-	num-slots = <1>;
-	supports-sd;
  };
 
  &uart2 {
  	status = "okay";
  };
 
+&u2phy0 {
+	status = "okay";
+
+	u2phy0_otg: otg-port {
+		status = "okay";
+	};
+
+	u2phy0_host: host-port {
+		phy-supply = <&vcc_host>;
+		status = "okay";
+	};
+};
+
+&u2phy1 {
+	status = "okay";
+
+	u2phy1_otg: otg-port {
+		phy-supply = <&vcc_host>;
+		status = "okay";
+	};
+
+	u2phy1_host: host-port {
+		phy-supply = <&vcc_host>;
+		status = "okay";
+	};
+};
+
+&usb_host0_ehci {
+	status = "okay";
+};
+
+&usb_host0_ohci {
+	status = "okay";
+};
+
+&usb_host1_ehci {
+	status = "okay";
+};
+
+&usb_host1_ohci {
+	status = "okay";
+};
+
+&usb_host2_ehci {
+	status = "okay";
+};
+
+&usb_host2_ohci {
+	status = "okay";
+};
+
  &usb_otg {
-       status = "okay";
+	status = "okay";
  };
arch/arm/dts/rk3229.dtsi new file +52 -0
new file mode 100644
index 00000000..c340fb30
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd
+ */
+
+#include "rk322x.dtsi"
+
+/ {
+	compatible = "rockchip,rk3229";
+
+	/delete-node/ opp-table0;
+
+	cpu0_opp_table: opp-table-0 {
+		compatible = "operating-points-v2";
+		opp-shared;
+
+		opp-408000000 {
+			opp-hz = /bits/ 64 <408000000>;
+			opp-microvolt = <950000>;
+			clock-latency-ns = <40000>;
+			opp-suspend;
+		};
+		opp-600000000 {
+			opp-hz = /bits/ 64 <600000000>;
+			opp-microvolt = <975000>;
+		};
+		opp-816000000 {
+			opp-hz = /bits/ 64 <816000000>;
+			opp-microvolt = <1000000>;
+		};
+		opp-1008000000 {
+			opp-hz = /bits/ 64 <1008000000>;
+			opp-microvolt = <1175000>;
+		};
+		opp-1200000000 {
+			opp-hz = /bits/ 64 <1200000000>;
+			opp-microvolt = <1275000>;
+		};
+		opp-1296000000 {
+			opp-hz = /bits/ 64 <1296000000>;
+			opp-microvolt = <1325000>;
+		};
+		opp-1392000000 {
+			opp-hz = /bits/ 64 <1392000000>;
+			opp-microvolt = <1375000>;
+		};
+		opp-1464000000 {
+			opp-hz = /bits/ 64 <1464000000>;
+			opp-microvolt = <1400000>;
+		};
+	};
+};
#9 lore raw

PATCH v3 6/12 rockchip: rk3288-power: sync power domain dt-binding header from Linux

In reply to Johan Jonker

In order to update the DT for rk3288
sync the power domain dt-binding header. This is the state as of v5.17 in Linux. Change location to be more in line with other SoCs.

---

Changed V2:
changed include rk3288.dtsi

---
 arch/arm/dts/rk3288.dtsi                  |  2 +-
 include/dt-bindings/power-domain/rk3288.h | 11 --------
 include/dt-bindings/power/rk3288-power.h  | 32 +++++++++++++++++++++++
 3 files changed, 33 insertions(+), 12 deletions(-)
 delete mode 100644 include/dt-bindings/power-domain/rk3288.h
 create mode 100644 include/dt-bindings/power/rk3288-power.h
arch/arm/dts/rk3288.dtsi +1 -1
index 22bb06ce..2086dbfd 100644
@@ -5,7 +5,7 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/pinctrl/rockchip.h>
 #include <dt-bindings/clock/rk3288-cru.h>
-#include <dt-bindings/power-domain/rk3288.h>
+#include <dt-bindings/power/rk3288-power.h>
 #include <dt-bindings/thermal/thermal.h>
 #include <dt-bindings/video/rk3288.h>
 #include "skeleton.dtsi"
include/dt-bindings/power-domain/rk3288.h deleted +0 -11
deleted file mode 100644
index ca68c114..00000000
@@ -1,11 +0,0 @@
-#ifndef __DT_BINDINGS_POWER_DOMAIN_RK3288_H__
-#define __DT_BINDINGS_POWER_DOMAIN_RK3288_H__
-
-/* RK3288 power domain index */
-#define RK3288_PD_GPU          0
-#define RK3288_PD_VIO          1
-#define RK3288_PD_VIDEO        2
-#define RK3288_PD_HEVC         3
-#define RK3288_PD_PERI         4
-
-#endif
include/dt-bindings/power/rk3288-power.h new file +32 -0
new file mode 100644
index 00000000..f710b56c
@@ -0,0 +1,32 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __DT_BINDINGS_POWER_RK3288_POWER_H__
+#define __DT_BINDINGS_POWER_RK3288_POWER_H__
+
+/**
+ * RK3288 Power Domain and Voltage Domain Summary.
+ */
+
+/* VD_CORE */
+#define RK3288_PD_A17_0		0
+#define RK3288_PD_A17_1		1
+#define RK3288_PD_A17_2		2
+#define RK3288_PD_A17_3		3
+#define RK3288_PD_SCU		4
+#define RK3288_PD_DEBUG		5
+#define RK3288_PD_MEM		6
+
+/* VD_LOGIC */
+#define RK3288_PD_BUS		7
+#define RK3288_PD_PERI		8
+#define RK3288_PD_VIO		9
+#define RK3288_PD_ALIVE		10
+#define RK3288_PD_HEVC		11
+#define RK3288_PD_VIDEO		12
+
+/* VD_GPU */
+#define RK3288_PD_GPU		13
+
+/* VD_PMU */
+#define RK3288_PD_PMU		14
+
+#endif
Signature · 1 line
2.20.1
Reviewed-by on v3 6/12
#10 lore raw

Re: [PATCH v3 06/12] rockchip: rk3288-power: sync power domain dt-binding header from Linux

Quoted 6 lines · Johan Jonker

In order to update the DT for rk3288
sync the power domain dt-binding header. This is the state as of v5.17 in Linux. Change location to be more in line with other SoCs.

Thanks,
- Kever

Quoted 80 lines

---

Changed V2:
changed include rk3288.dtsi

---
  arch/arm/dts/rk3288.dtsi                  |  2 +-
  include/dt-bindings/power-domain/rk3288.h | 11 --------
  include/dt-bindings/power/rk3288-power.h  | 32 +++++++++++++++++++++++
  3 files changed, 33 insertions(+), 12 deletions(-)

delete mode 100644 include/dt-bindings/power-domain/rk3288.h create mode 100644 include/dt-bindings/power/rk3288-power.h

arch/arm/dts/rk3288.dtsi +1 -1
index 22bb06ce..2086dbfd 100644
@@ -5,7 +5,7 @@
  #include <dt-bindings/interrupt-controller/arm-gic.h>
  #include <dt-bindings/pinctrl/rockchip.h>
  #include <dt-bindings/clock/rk3288-cru.h>
-#include <dt-bindings/power-domain/rk3288.h>
+#include <dt-bindings/power/rk3288-power.h>
  #include <dt-bindings/thermal/thermal.h>
  #include <dt-bindings/video/rk3288.h>
  #include "skeleton.dtsi"
include/dt-bindings/power-domain/rk3288.h deleted +0 -11
deleted file mode 100644
index ca68c114..00000000
@@ -1,11 +0,0 @@
-#ifndef __DT_BINDINGS_POWER_DOMAIN_RK3288_H__
-#define __DT_BINDINGS_POWER_DOMAIN_RK3288_H__
-
-/* RK3288 power domain index */
-#define RK3288_PD_GPU          0
-#define RK3288_PD_VIO          1
-#define RK3288_PD_VIDEO        2
-#define RK3288_PD_HEVC         3
-#define RK3288_PD_PERI         4
-
-#endif
include/dt-bindings/power/rk3288-power.h new file +32 -0
new file mode 100644
index 00000000..f710b56c
@@ -0,0 +1,32 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __DT_BINDINGS_POWER_RK3288_POWER_H__
+#define __DT_BINDINGS_POWER_RK3288_POWER_H__
+
+/**
+ * RK3288 Power Domain and Voltage Domain Summary.
+ */
+
+/* VD_CORE */
+#define RK3288_PD_A17_0		0
+#define RK3288_PD_A17_1		1
+#define RK3288_PD_A17_2		2
+#define RK3288_PD_A17_3		3
+#define RK3288_PD_SCU		4
+#define RK3288_PD_DEBUG		5
+#define RK3288_PD_MEM		6
+
+/* VD_LOGIC */
+#define RK3288_PD_BUS		7
+#define RK3288_PD_PERI		8
+#define RK3288_PD_VIO		9
+#define RK3288_PD_ALIVE		10
+#define RK3288_PD_HEVC		11
+#define RK3288_PD_VIDEO		12
+
+/* VD_GPU */
+#define RK3288_PD_GPU		13
+
+/* VD_PMU */
+#define RK3288_PD_PMU		14
+
+#endif
#11 lore raw

PATCH v3 7/12 rockchip: rk3288-cru: sync the clock dt-binding header from Linux

In reply to Johan Jonker

In order to update the DT for rk3288
sync the clock dt-binding header.
This is the state as of v5.17 in Linux. Keep SCLK_MAC_PLL in use for rk3288 clock driver.

---
 include/dt-bindings/clock/rk3288-cru.h | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
include/dt-bindings/clock/rk3288-cru.h +12 -1
index e368d767..453f6671 100644
@@ -1,9 +1,12 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (c) 2014 MundoReader S.L.
  * Author: Heiko Stuebner <[email protected]>
  */
 
+#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3288_H
+#define _DT_BINDINGS_CLK_ROCKCHIP_RK3288_H
+
 /* core clocks */
 #define PLL_APLL		1
 #define PLL_DPLL		2
@@ -74,6 +77,9 @@
 #define SCLK_USBPHY480M_SRC	122
 #define SCLK_PVTM_CORE		123
 #define SCLK_PVTM_GPU		124
+#define SCLK_CRYPTO		125
+#define SCLK_MIPIDSI_24M	126
+#define SCLK_VIP_OUT		127
 
 #define SCLK_MAC_PLL		150
 #define SCLK_MAC		151
@@ -153,6 +159,9 @@
 #define PCLK_DDRUPCTL1		366
 #define PCLK_PUBL1		367
 #define PCLK_WDT		368
+#define PCLK_EFUSE256		369
+#define PCLK_EFUSE1024		370
+#define PCLK_ISP_IN		371
 
 /* hclk gates */
 #define HCLK_GPS		448
@@ -368,3 +377,5 @@
 #define SRST_TSP_CLKIN0		189
 #define SRST_TSP_CLKIN1		190
 #define SRST_TSP_27M		191
+
+#endif
Signature · 1 line
2.20.1
Reviewed-by on v3 7/12
#12 lore raw

Re: [PATCH v3 07/12] rockchip: rk3288-cru: sync the clock dt-binding header from Linux

Quoted 7 lines · Johan Jonker

In order to update the DT for rk3288
sync the clock dt-binding header.
This is the state as of v5.17 in Linux. Keep SCLK_MAC_PLL in use for rk3288 clock driver.

Thanks,
- Kever

Quoted 48 lines
---
  include/dt-bindings/clock/rk3288-cru.h | 13 ++++++++++++-
  1 file changed, 12 insertions(+), 1 deletion(-)
include/dt-bindings/clock/rk3288-cru.h +12 -1
index e368d767..453f6671 100644
@@ -1,9 +1,12 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
  /*
   * Copyright (c) 2014 MundoReader S.L.
   * Author: Heiko Stuebner <[email protected]>
   */
 
+#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3288_H
+#define _DT_BINDINGS_CLK_ROCKCHIP_RK3288_H
+
  /* core clocks */
  #define PLL_APLL		1
  #define PLL_DPLL		2
@@ -74,6 +77,9 @@
  #define SCLK_USBPHY480M_SRC	122
  #define SCLK_PVTM_CORE		123
  #define SCLK_PVTM_GPU		124
+#define SCLK_CRYPTO		125
+#define SCLK_MIPIDSI_24M	126
+#define SCLK_VIP_OUT		127
 
  #define SCLK_MAC_PLL		150
  #define SCLK_MAC		151
@@ -153,6 +159,9 @@
  #define PCLK_DDRUPCTL1		366
  #define PCLK_PUBL1		367
  #define PCLK_WDT		368
+#define PCLK_EFUSE256		369
+#define PCLK_EFUSE1024		370
+#define PCLK_ISP_IN		371
 
  /* hclk gates */
  #define HCLK_GPS		448
@@ -368,3 +377,5 @@
  #define SRST_TSP_CLKIN0		189
  #define SRST_TSP_CLKIN1		190
  #define SRST_TSP_27M		191
+
+#endif
#13 lore raw

PATCH v3 8/12 arm: dts: rockchip: move all rk3288 u-boot specific properties in separate dtsi files

In reply to Johan Jonker

In order to sync rk3288.dtsi from Linux it needed to move all u-boot specific properties in separate dtsi files.

---

Changed V3:
add u-boot,dm-pre-reloc to noc node
change reg size rk3288-u-boot.dtsi

Changed V2:
combine U-boot specific changes
add bus_intmem label
use current led node name

---
 arch/arm/dts/rk3288-evb-u-boot.dtsi           | 11 +++
 arch/arm/dts/rk3288-evb.dts                   | 11 ---
 arch/arm/dts/rk3288-firefly-u-boot.dtsi       | 31 +++++++
 arch/arm/dts/rk3288-firefly.dts               | 17 ----
 arch/arm/dts/rk3288-firefly.dtsi              |  3 -
 arch/arm/dts/rk3288-miqi-u-boot.dtsi          | 20 +++++
 arch/arm/dts/rk3288-miqi.dts                  | 11 ---
 arch/arm/dts/rk3288-miqi.dtsi                 |  2 -
 arch/arm/dts/rk3288-phycore-rdk-u-boot.dtsi   | 44 ++++++++++
 arch/arm/dts/rk3288-phycore-rdk.dts           | 18 -----
 arch/arm/dts/rk3288-phycore-som.dtsi          |  6 --
 arch/arm/dts/rk3288-popmetal-u-boot.dtsi      | 11 +++
 arch/arm/dts/rk3288-popmetal.dts              | 11 ---
 arch/arm/dts/rk3288-rock2-square-u-boot.dtsi  | 30 +++++++
 arch/arm/dts/rk3288-rock2-square.dts          | 18 -----
 arch/arm/dts/rk3288-u-boot.dtsi               | 80 ++++++++++++++++---
 arch/arm/dts/rk3288-veyron-jerry-u-boot.dtsi  | 14 ++++
 arch/arm/dts/rk3288-veyron-jerry.dts          | 11 ---
 arch/arm/dts/rk3288-veyron-mickey-u-boot.dtsi | 14 ++++
 arch/arm/dts/rk3288-veyron-mickey.dts         | 11 ---
 arch/arm/dts/rk3288-veyron-minnie-u-boot.dtsi | 14 ++++
 arch/arm/dts/rk3288-veyron-minnie.dts         | 11 ---
 arch/arm/dts/rk3288-veyron-u-boot.dtsi        | 62 ++++++++++++++
 arch/arm/dts/rk3288-veyron.dtsi               | 39 ---------
 arch/arm/dts/rk3288.dtsi                      | 49 +-----------
 25 files changed, 321 insertions(+), 228 deletions(-)
 create mode 100644 arch/arm/dts/rk3288-phycore-rdk-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3288-rock2-square-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3288-veyron-jerry-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3288-veyron-mickey-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3288-veyron-minnie-u-boot.dtsi
arch/arm/dts/rk3288-evb-u-boot.dtsi +11 -0
index 8ac7840f..c8f51207 100644
@@ -5,6 +5,17 @@
 
 #include "rk3288-u-boot.dtsi"
 
+&dmc {
+	rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
+		0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
+		0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0
+		0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4
+		0x8 0x1f4>;
+	rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076
+		0x0 0xc3 0x6 0x2>;
+	rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>;
+};
+
 &pinctrl {
 	u-boot,dm-pre-reloc;
 };
arch/arm/dts/rk3288-evb.dts +0 -11
index eac91a87..bb24a96c 100644
@@ -15,17 +15,6 @@
 	};
 };
 
-&dmc {
-	rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
-		0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
-		0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0
-		0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4
-		0x8 0x1f4>;
-	rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076
-		0x0 0xc3 0x6 0x2>;
-	rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>;
-};
-
 &pwm1 {
 	status = "okay";
 };
arch/arm/dts/rk3288-firefly-u-boot.dtsi +31 -0
index 8b9c3831..cc84d7c4 100644
@@ -5,6 +5,37 @@
 
 #include "rk3288-u-boot.dtsi"
 
+/ {
+	config {
+		u-boot,dm-pre-reloc;
+		u-boot,boot-led = "firefly:green:power";
+	};
+
+	leds {
+		u-boot,dm-pre-reloc;
+
+		work {
+			u-boot,dm-pre-reloc;
+		};
+
+		power {
+			u-boot,dm-pre-reloc;
+		};
+	};
+};
+
+&dmc {
+	rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
+		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
+		0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
+		0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
+		0x5 0x0>;
+	rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
+		0xa60 0x40 0x10 0x0>;
+	/* Add a dummy value to cause of-platdata think this is bytes */
+	rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
+};
+
 &pinctrl {
 	u-boot,dm-pre-reloc;
 };
arch/arm/dts/rk3288-firefly.dts +0 -17
index 1cff04e7..72982efd 100644
@@ -13,23 +13,6 @@
 	chosen {
 		stdout-path = &uart2;
 	};
-
-	config {
-		u-boot,dm-pre-reloc;
-		u-boot,boot-led = "firefly:green:power";
-	};
-};
-
-&dmc {
-	rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
-		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
-		0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
-		0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
-		0x5 0x0>;
-	rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
-		0xa60 0x40 0x10 0x0>;
-	/* Add a dummy value to cause of-platdata think this is bytes */
-	rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
 };
 
 &ir {
arch/arm/dts/rk3288-firefly.dtsi +0 -3
index b7f279f7..1117d391 100644
@@ -37,11 +37,9 @@
 	};
 
 	leds {
-		u-boot,dm-pre-reloc;
 		compatible = "gpio-leds";
 
 		work {
-			u-boot,dm-pre-reloc;
 			gpios = <&gpio8 1 GPIO_ACTIVE_LOW>;
 			label = "firefly:blue:user";
 			linux,default-trigger = "rc-feedback";
@@ -50,7 +48,6 @@
 		};
 
 		power {
-			u-boot,dm-pre-reloc;
 			gpios = <&gpio8 2 GPIO_ACTIVE_LOW>;
 			label = "firefly:green:power";
 			linux,default-trigger = "default-on";
arch/arm/dts/rk3288-miqi-u-boot.dtsi +20 -0
index 4f63fc9f..2a74fdd1 100644
@@ -4,6 +4,26 @@
  */
 
 #include "rk3288-u-boot.dtsi"
+/ {
+	leds {
+		u-boot,dm-pre-reloc;
+
+		work {
+			u-boot,dm-pre-reloc;
+		};
+	};
+};
+
+&dmc {
+	rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
+		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
+		0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
+		0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
+		0x5 0x0>;
+	rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
+		0xa60 0x40 0x10 0x0>;
+	rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
+};
 
 &pinctrl {
 	u-boot,dm-pre-reloc;
arch/arm/dts/rk3288-miqi.dts +0 -11
index e47170c6..4a2f249e 100644
@@ -14,14 +14,3 @@
 		stdout-path = "serial2:115200n8";
 	};
 };
-
-&dmc {
-	rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
-		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
-		0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
-		0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
-		0x5 0x0>;
-	rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
-		0xa60 0x40 0x10 0x0>;
-	rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
-};
arch/arm/dts/rk3288-miqi.dtsi +0 -2
index 432f744b..cb80cbf2 100644
@@ -34,11 +34,9 @@
 
 
 	leds {
-		u-boot,dm-pre-reloc;
 		compatible = "gpio-leds";
 
 		work {
-			u-boot,dm-pre-reloc;
 			gpios = <&gpio7 4 GPIO_ACTIVE_LOW>;
 			label = "miqi:green:user";
 			linux,default-trigger = "default-on";
arch/arm/dts/rk3288-phycore-rdk-u-boot.dtsi new file +44 -0

44 lines not on this page · raw message

arch/arm/dts/rk3288-phycore-rdk.dts +0 -18
index cc392109..ebea8e67 100644
@@ -112,19 +112,6 @@
 	};
 };
 
-&dmc {
-	rockchip,num-channels = <2>;
-	rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
-		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
-		0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
-		0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
-		0x5 0x0>;
-	rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
-		0xa60 0x40 0x10 0x0>;
-	rockchip,sdram-channel = /bits/ 8 <0x1 0xa 0x3 0x2 0x1 0x0 0xe 0xe>;
-	rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 5 1>;
-};
-
 &gmac {
 	status = "okay";
 };
@@ -175,8 +162,6 @@
 };
 
 &pinctrl {
-	u-boot,dm-pre-reloc;
-
 	pcfg_pull_up_drv_12ma: pcfg-pull-up-drv-12ma {
 		bias-pull-up;
 		drive-strength = <12>;
@@ -246,8 +231,6 @@
 };
 
 &sdmmc {
-	u-boot,dm-pre-reloc;
-
 	bus-width = <4>;
 	cap-mmc-highspeed;
 	cap-sd-highspeed;
@@ -268,7 +251,6 @@
 };
 
 &uart2 {
-	u-boot,dm-pre-reloc;
 	status = "okay";
 };
 
arch/arm/dts/rk3288-phycore-som.dtsi +0 -6
index 02d11968..821525f7 100644
@@ -149,8 +149,6 @@
 
 &emmc {
 	status = "okay";
-	u-boot,dm-pre-reloc;
-
 	bus-width = <8>;
 	cap-mmc-highspeed;
 	disable-wp;
@@ -201,8 +199,6 @@
 
 &i2c0 {
 	status = "okay";
-	u-boot,dm-pre-reloc;
-
 	clock-frequency = <400000>;
 
 	rk818: pmic@1c {
@@ -216,7 +212,6 @@
 		rockchip,system-power-controller;
 		wakeup-source;
 		#clock-cells = <1>;
-		u-boot,dm-pre-reloc;
 
 		vcc1-supply = <&vdd_sys>;
 		vcc2-supply = <&vdd_sys>;
@@ -230,7 +225,6 @@
 		vddio-supply = <&vdd_3v3_io>;
 
 		regulators {
-			u-boot,dm-pre-reloc;
 			vdd_log: DCDC_REG1 {
 				regulator-name = "vdd_log";
 				regulator-always-on;
arch/arm/dts/rk3288-popmetal-u-boot.dtsi +11 -0
index 8ac7840f..3782253c 100644
@@ -5,6 +5,17 @@
 
 #include "rk3288-u-boot.dtsi"
 
+&dmc {
+	rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
+		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
+		0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
+		0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
+		0x5 0x0>;
+	rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
+		0xa60 0x40 0x10 0x0>;
+	rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
+};
+
 &pinctrl {
 	u-boot,dm-pre-reloc;
 };
arch/arm/dts/rk3288-popmetal.dts +0 -11
index 5c6d06f2..736dc51e 100644
@@ -15,17 +15,6 @@
 	};
 };
 
-&dmc {
-	rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
-		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
-		0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
-		0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
-		0x5 0x0>;
-	rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
-		0xa60 0x40 0x10 0x0>;
-	rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
-};
-
 &pwm1 {
 	status = "okay";
 };
arch/arm/dts/rk3288-rock2-square-u-boot.dtsi new file +30 -0
new file mode 100644
index 00000000..509f789b
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include "rk3288-u-boot.dtsi"
+
+&dmc {
+	rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
+		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
+		0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
+		0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
+		0x5 0x0>;
+	rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
+		0xa60 0x40 0x10 0x0>;
+	rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
+};
+
+&gpio7 {
+	u-boot,dm-pre-reloc;
+};
+
+&pinctrl {
+	u-boot,dm-pre-reloc;
+};
+
+&sdmmc {
+	u-boot,dm-pre-reloc;
+};
+
+&uart2 {
+	u-boot,dm-pre-reloc;
+};
arch/arm/dts/rk3288-rock2-square.dts +0 -18
index 11c580a0..41676696 100644
@@ -96,7 +96,6 @@
 };
 
 &sdmmc {
-	u-boot,dm-pre-reloc;
 	bus-width = <4>;
 	cap-mmc-highspeed;
 	cap-sd-highspeed;
@@ -139,7 +138,6 @@
 };
 
 &pinctrl {
-	u-boot,dm-pre-reloc;
 	ir {
 		ir_int: ir-int {
 			rockchip,pins = <8 1 RK_FUNC_GPIO &pcfg_pull_up>;
@@ -171,7 +169,6 @@
 
 &uart2 {
 	status = "okay";
-	u-boot,dm-pre-reloc;
 	reg-shift = <2>;
 };
 
@@ -182,18 +179,3 @@
 &usb_host0_ehci {
 	status = "okay";
 };
-
-&dmc {
-	rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
-		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
-		0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
-		0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
-		0x5 0x0>;
-	rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
-		0xa60 0x40 0x10 0x0>;
-	rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
-};
-
-&gpio7 {
-	u-boot,dm-pre-reloc;
-};
arch/arm/dts/rk3288-u-boot.dtsi +69 -11

117 lines not on this page · raw message

arch/arm/dts/rk3288-veyron-jerry-u-boot.dtsi new file +14 -0
new file mode 100644
index 00000000..2cc6b090
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include "rk3288-veyron-u-boot.dtsi"
+
+&dmc {
+	rockchip,pctl-timing = <0x29a 0xc8 0x1f4 0x42 0x4e 0x4 0xea 0xa
+		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
+		0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
+		0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
+		0x5 0x0>;
+	rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
+		0xa60 0x40 0x10 0x0>;
+	rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
+};
arch/arm/dts/rk3288-veyron-jerry.dts +0 -11
index c251d9d5..ff7669eb 100644
@@ -66,17 +66,6 @@
 	};
 };
 
-&dmc {
-	rockchip,pctl-timing = <0x29a 0xc8 0x1f4 0x42 0x4e 0x4 0xea 0xa
-		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
-		0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
-		0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
-		0x5 0x0>;
-	rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
-		0xa60 0x40 0x10 0x0>;
-	rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
-};
-
 &gpio_keys {
 	power {
 		gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
arch/arm/dts/rk3288-veyron-mickey-u-boot.dtsi new file +14 -0
new file mode 100644
index 00000000..213a46ba
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include "rk3288-veyron-u-boot.dtsi"
+
+&dmc {
+	rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
+		0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
+		0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0
+		0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4
+		0x8 0x1f4>;
+	rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076
+		0x0 0xc3 0x6 0x2>;
+	rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 1>;
+};
arch/arm/dts/rk3288-veyron-mickey.dts +0 -11
index e0dc3620..0521d9e0 100644
@@ -161,17 +161,6 @@
 	};
 };
 
-&dmc {
-	rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
-		0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
-		0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0
-		0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4
-		0x8 0x1f4>;
-	rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076
-		0x0 0xc3 0x6 0x2>;
-	rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 1>;
-};
-
 &emmc {
 	/delete-property/mmc-hs200-1_8v;
 };
arch/arm/dts/rk3288-veyron-minnie-u-boot.dtsi new file +14 -0
new file mode 100644
index 00000000..8211da41
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include "rk3288-veyron-u-boot.dtsi"
+
+&dmc {
+	rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
+		0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
+		0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0
+		0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4
+		0x8 0x1f4>;
+	rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076
+		0x0 0xc3 0x6 0x1>;
+	rockchip,sdram-params = <0x20d266a4 0x5b6 6 533000000 6 13 0>;
+};
arch/arm/dts/rk3288-veyron-minnie.dts +0 -11
index 646f6ae7..b56a3f4f 100644
@@ -137,17 +137,6 @@
 	power-supply = <&backlight_regulator>;
 };
 
-&dmc {
-	rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
-		0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
-		0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0
-		0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4
-		0x8 0x1f4>;
-	rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076
-		0x0 0xc3 0x6 0x1>;
-	rockchip,sdram-params = <0x20d266a4 0x5b6 6 533000000 6 13 0>;
-};
-
 &emmc {
 	/delete-property/mmc-hs200-1_8v;
 };
arch/arm/dts/rk3288-veyron-u-boot.dtsi +62 -0

69 lines not on this page · raw message

arch/arm/dts/rk3288-veyron.dtsi +0 -39
index 8754043b..4a9c27a4 100644
@@ -16,7 +16,6 @@
 
 	chosen {
 		stdout-path = &uart2;
-		u-boot,spl-boot-order = &spi_flash;
 	};
 
 	firmware {
@@ -220,26 +219,6 @@
 	cpu0-supply = <&vdd_cpu>;
 };
 
-&dmc {
-	logic-supply = <&vdd_logic>;
-	rockchip,odt-disable-freq = <333000000>;
-	rockchip,dll-disable-freq = <333000000>;
-	rockchip,sr-enable-freq = <333000000>;
-	rockchip,pd-enable-freq = <666000000>;
-	rockchip,auto-self-refresh-cnt = <0>;
-	rockchip,auto-power-down-cnt = <64>;
-	rockchip,ddr-speed-bin = <21>;
-	rockchip,trcd = <10>;
-	rockchip,trp = <10>;
-	operating-points = <
-		/* KHz    uV */
-		200000 1050000
-		333000 1100000
-		533000 1150000
-		666000 1200000
-	>;
-};
-
 &efuse {
 	status = "okay";
 };
@@ -299,10 +278,8 @@
 
 &spi2 {
 	status = "okay";
-	u-boot,dm-pre-reloc;
 
 	spi_flash: spiflash@0 {
-		u-boot,dm-pre-reloc;
 		compatible = "spidev", "jedec,spi-nor";
 		spi-max-frequency = <20000000>; /* Reduce for Dediprog em100 pro */
 		reg = <0>;
@@ -315,7 +292,6 @@
 	clock-frequency = <400000>;
 	i2c-scl-falling-time-ns = <50>;		/* 2.5ns measured */
 	i2c-scl-rising-time-ns = <100>;		/* 45ns measured */
-	u-boot,dm-pre-reloc;
 
 	rk808: pmic@1b {
 		compatible = "rockchip,rk808";
@@ -328,7 +304,6 @@
 		rockchip,system-power-controller;
 		wakeup-source;
 		#clock-cells = <1>;
-		u-boot,dm-pre-reloc;
 
 		vcc1-supply = <&vcc33_sys>;
 		vcc2-supply = <&vcc33_sys>;
@@ -557,7 +532,6 @@
 
 &uart2 {
 	status = "okay";
-	u-boot,dm-pre-reloc;
 	reg-shift = <2>;
 };
 
@@ -601,7 +575,6 @@
 };
 
 &pinctrl {
-	u-boot,dm-pre-reloc;
 	pinctrl-names = "default", "sleep";
 	pinctrl-0 = <
 		/* Common for sleep and wake, but no owners */
@@ -826,15 +799,3 @@
 	assigned-clocks = <&cru SCLK_USBPHY480M_SRC>;
 	assigned-clock-parents = <&cru SCLK_OTGPHY0>;
 };
-
-&sdmmc {
-	u-boot,dm-pre-reloc;
-};
-
-&gpio3 {
-	u-boot,dm-pre-reloc;
-};
-
-&gpio8 {
-	u-boot,dm-pre-reloc;
-};
arch/arm/dts/rk3288.dtsi +1 -48

115 lines not on this page · raw message

Signature · 1 line
2.20.1
Reviewed-by on v3 8/12
#14 lore raw

Re: [PATCH v3 08/12] arm: dts: rockchip: move all rk3288 u-boot specific properties in separate dtsi files

Quoted 4 lines · Johan Jonker

In order to sync rk3288.dtsi from Linux it needed to move all u-boot specific properties in separate dtsi files.

Thanks,
- Kever

Quoted 1,062 lines

---

Changed V3:
add u-boot,dm-pre-reloc to noc node
change reg size rk3288-u-boot.dtsi

Changed V2:
combine U-boot specific changes
add bus_intmem label
use current led node name

---
  arch/arm/dts/rk3288-evb-u-boot.dtsi           | 11 +++
  arch/arm/dts/rk3288-evb.dts                   | 11 ---
  arch/arm/dts/rk3288-firefly-u-boot.dtsi       | 31 +++++++
  arch/arm/dts/rk3288-firefly.dts               | 17 ----
  arch/arm/dts/rk3288-firefly.dtsi              |  3 -
  arch/arm/dts/rk3288-miqi-u-boot.dtsi          | 20 +++++
  arch/arm/dts/rk3288-miqi.dts                  | 11 ---
  arch/arm/dts/rk3288-miqi.dtsi                 |  2 -
  arch/arm/dts/rk3288-phycore-rdk-u-boot.dtsi   | 44 ++++++++++
  arch/arm/dts/rk3288-phycore-rdk.dts           | 18 -----
  arch/arm/dts/rk3288-phycore-som.dtsi          |  6 --
  arch/arm/dts/rk3288-popmetal-u-boot.dtsi      | 11 +++
  arch/arm/dts/rk3288-popmetal.dts              | 11 ---
  arch/arm/dts/rk3288-rock2-square-u-boot.dtsi  | 30 +++++++
  arch/arm/dts/rk3288-rock2-square.dts          | 18 -----
  arch/arm/dts/rk3288-u-boot.dtsi               | 80 ++++++++++++++++---
  arch/arm/dts/rk3288-veyron-jerry-u-boot.dtsi  | 14 ++++
  arch/arm/dts/rk3288-veyron-jerry.dts          | 11 ---
  arch/arm/dts/rk3288-veyron-mickey-u-boot.dtsi | 14 ++++
  arch/arm/dts/rk3288-veyron-mickey.dts         | 11 ---
  arch/arm/dts/rk3288-veyron-minnie-u-boot.dtsi | 14 ++++
  arch/arm/dts/rk3288-veyron-minnie.dts         | 11 ---
  arch/arm/dts/rk3288-veyron-u-boot.dtsi        | 62 ++++++++++++++
  arch/arm/dts/rk3288-veyron.dtsi               | 39 ---------
  arch/arm/dts/rk3288.dtsi                      | 49 +-----------
  25 files changed, 321 insertions(+), 228 deletions(-)

create mode 100644 arch/arm/dts/rk3288-phycore-rdk-u-boot.dtsi create mode 100644 arch/arm/dts/rk3288-rock2-square-u-boot.dtsi create mode 100644 arch/arm/dts/rk3288-veyron-jerry-u-boot.dtsi create mode 100644 arch/arm/dts/rk3288-veyron-mickey-u-boot.dtsi create mode 100644 arch/arm/dts/rk3288-veyron-minnie-u-boot.dtsi

arch/arm/dts/rk3288-evb-u-boot.dtsi +11 -0
index 8ac7840f..c8f51207 100644
@@ -5,6 +5,17 @@
 
  #include "rk3288-u-boot.dtsi"
 
+&dmc {
+	rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
+		0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
+		0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0
+		0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4
+		0x8 0x1f4>;
+	rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076
+		0x0 0xc3 0x6 0x2>;
+	rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>;
+};
+
  &pinctrl {
  	u-boot,dm-pre-reloc;
  };
arch/arm/dts/rk3288-evb.dts +0 -11
index eac91a87..bb24a96c 100644
@@ -15,17 +15,6 @@
  	};
  };
 
-&dmc {
-	rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
-		0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
-		0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0
-		0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4
-		0x8 0x1f4>;
-	rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076
-		0x0 0xc3 0x6 0x2>;
-	rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>;
-};
-
  &pwm1 {
  	status = "okay";
  };
arch/arm/dts/rk3288-firefly-u-boot.dtsi +31 -0
index 8b9c3831..cc84d7c4 100644
@@ -5,6 +5,37 @@
 
  #include "rk3288-u-boot.dtsi"
 
+/ {
+	config {
+		u-boot,dm-pre-reloc;
+		u-boot,boot-led = "firefly:green:power";
+	};
+
+	leds {
+		u-boot,dm-pre-reloc;
+
+		work {
+			u-boot,dm-pre-reloc;
+		};
+
+		power {
+			u-boot,dm-pre-reloc;
+		};
+	};
+};
+
+&dmc {
+	rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
+		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
+		0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
+		0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
+		0x5 0x0>;
+	rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
+		0xa60 0x40 0x10 0x0>;
+	/* Add a dummy value to cause of-platdata think this is bytes */
+	rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
+};
+
  &pinctrl {
  	u-boot,dm-pre-reloc;
  };
arch/arm/dts/rk3288-firefly.dts +0 -17
index 1cff04e7..72982efd 100644
@@ -13,23 +13,6 @@
  	chosen {
  		stdout-path = &uart2;
  	};
-
-	config {
-		u-boot,dm-pre-reloc;
-		u-boot,boot-led = "firefly:green:power";
-	};
-};
-
-&dmc {
-	rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
-		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
-		0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
-		0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
-		0x5 0x0>;
-	rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
-		0xa60 0x40 0x10 0x0>;
-	/* Add a dummy value to cause of-platdata think this is bytes */
-	rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
  };
 
  &ir {
arch/arm/dts/rk3288-firefly.dtsi +0 -3
index b7f279f7..1117d391 100644
@@ -37,11 +37,9 @@
  	};
 
  	leds {
-		u-boot,dm-pre-reloc;
  		compatible = "gpio-leds";
 
  		work {
-			u-boot,dm-pre-reloc;
  			gpios = <&gpio8 1 GPIO_ACTIVE_LOW>;
  			label = "firefly:blue:user";
  			linux,default-trigger = "rc-feedback";
@@ -50,7 +48,6 @@
  		};
 
  		power {
-			u-boot,dm-pre-reloc;
  			gpios = <&gpio8 2 GPIO_ACTIVE_LOW>;
  			label = "firefly:green:power";
  			linux,default-trigger = "default-on";
arch/arm/dts/rk3288-miqi-u-boot.dtsi +20 -0
index 4f63fc9f..2a74fdd1 100644
@@ -4,6 +4,26 @@
   */
 
  #include "rk3288-u-boot.dtsi"
+/ {
+	leds {
+		u-boot,dm-pre-reloc;
+
+		work {
+			u-boot,dm-pre-reloc;
+		};
+	};
+};
+
+&dmc {
+	rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
+		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
+		0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
+		0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
+		0x5 0x0>;
+	rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
+		0xa60 0x40 0x10 0x0>;
+	rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
+};
 
  &pinctrl {
  	u-boot,dm-pre-reloc;
arch/arm/dts/rk3288-miqi.dts +0 -11
index e47170c6..4a2f249e 100644
@@ -14,14 +14,3 @@
  		stdout-path = "serial2:115200n8";
  	};
  };
-
-&dmc {
-	rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
-		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
-		0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
-		0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
-		0x5 0x0>;
-	rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
-		0xa60 0x40 0x10 0x0>;
-	rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
-};
arch/arm/dts/rk3288-miqi.dtsi +0 -2
index 432f744b..cb80cbf2 100644
@@ -34,11 +34,9 @@
 
 
  	leds {
-		u-boot,dm-pre-reloc;
  		compatible = "gpio-leds";
 
  		work {
-			u-boot,dm-pre-reloc;
  			gpios = <&gpio7 4 GPIO_ACTIVE_LOW>;
  			label = "miqi:green:user";
  			linux,default-trigger = "default-on";
arch/arm/dts/rk3288-phycore-rdk-u-boot.dtsi new file +44 -0
new file mode 100644
index 00000000..30f4cb10
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include "rk3288-u-boot.dtsi"
+
+&dmc {
+	rockchip,num-channels = <2>;
+	rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
+		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
+		0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
+		0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
+		0x5 0x0>;
+	rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
+		0xa60 0x40 0x10 0x0>;
+	rockchip,sdram-channel = /bits/ 8 <0x1 0xa 0x3 0x2 0x1 0x0 0xe 0xe>;
+	rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 5 1>;
+};
+
+&emmc {
+	u-boot,dm-pre-reloc;
+};
+
+&i2c0 {
+	u-boot,dm-pre-reloc;
+
+	rk818: pmic@1c {
+		u-boot,dm-pre-reloc;
+
+		regulators {
+			u-boot,dm-pre-reloc;
+		};
+	};
+};
+
+&pinctrl {
+	u-boot,dm-pre-reloc;
+};
+
+&sdmmc {
+	u-boot,dm-pre-reloc;
+};
+
+&uart2 {
+	u-boot,dm-pre-reloc;
+};
arch/arm/dts/rk3288-phycore-rdk.dts +0 -18
index cc392109..ebea8e67 100644
@@ -112,19 +112,6 @@
  	};
  };
 
-&dmc {
-	rockchip,num-channels = <2>;
-	rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
-		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
-		0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
-		0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
-		0x5 0x0>;
-	rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
-		0xa60 0x40 0x10 0x0>;
-	rockchip,sdram-channel = /bits/ 8 <0x1 0xa 0x3 0x2 0x1 0x0 0xe 0xe>;
-	rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 5 1>;
-};
-
  &gmac {
  	status = "okay";
  };
@@ -175,8 +162,6 @@
  };
 
  &pinctrl {
-	u-boot,dm-pre-reloc;
-
  	pcfg_pull_up_drv_12ma: pcfg-pull-up-drv-12ma {
  		bias-pull-up;
  		drive-strength = <12>;
@@ -246,8 +231,6 @@
  };
 
  &sdmmc {
-	u-boot,dm-pre-reloc;
-
  	bus-width = <4>;
  	cap-mmc-highspeed;
  	cap-sd-highspeed;
@@ -268,7 +251,6 @@
  };
 
  &uart2 {
-	u-boot,dm-pre-reloc;
  	status = "okay";
  };
 
arch/arm/dts/rk3288-phycore-som.dtsi +0 -6
index 02d11968..821525f7 100644
@@ -149,8 +149,6 @@
 
  &emmc {
  	status = "okay";
-	u-boot,dm-pre-reloc;
-
  	bus-width = <8>;
  	cap-mmc-highspeed;
  	disable-wp;
@@ -201,8 +199,6 @@
 
  &i2c0 {
  	status = "okay";
-	u-boot,dm-pre-reloc;
-
  	clock-frequency = <400000>;
 
  	rk818: pmic@1c {
@@ -216,7 +212,6 @@
  		rockchip,system-power-controller;
  		wakeup-source;
  		#clock-cells = <1>;
-		u-boot,dm-pre-reloc;
 
  		vcc1-supply = <&vdd_sys>;
  		vcc2-supply = <&vdd_sys>;
@@ -230,7 +225,6 @@
  		vddio-supply = <&vdd_3v3_io>;
 
  		regulators {
-			u-boot,dm-pre-reloc;
  			vdd_log: DCDC_REG1 {
  				regulator-name = "vdd_log";
  				regulator-always-on;
arch/arm/dts/rk3288-popmetal-u-boot.dtsi +11 -0
index 8ac7840f..3782253c 100644
@@ -5,6 +5,17 @@
 
  #include "rk3288-u-boot.dtsi"
 
+&dmc {
+	rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
+		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
+		0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
+		0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
+		0x5 0x0>;
+	rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
+		0xa60 0x40 0x10 0x0>;
+	rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
+};
+
  &pinctrl {
  	u-boot,dm-pre-reloc;
  };
arch/arm/dts/rk3288-popmetal.dts +0 -11
index 5c6d06f2..736dc51e 100644
@@ -15,17 +15,6 @@
  	};
  };
 
-&dmc {
-	rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
-		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
-		0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
-		0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
-		0x5 0x0>;
-	rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
-		0xa60 0x40 0x10 0x0>;
-	rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
-};
-
  &pwm1 {
  	status = "okay";
  };
arch/arm/dts/rk3288-rock2-square-u-boot.dtsi new file +30 -0
new file mode 100644
index 00000000..509f789b
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include "rk3288-u-boot.dtsi"
+
+&dmc {
+	rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
+		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
+		0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
+		0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
+		0x5 0x0>;
+	rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
+		0xa60 0x40 0x10 0x0>;
+	rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
+};
+
+&gpio7 {
+	u-boot,dm-pre-reloc;
+};
+
+&pinctrl {
+	u-boot,dm-pre-reloc;
+};
+
+&sdmmc {
+	u-boot,dm-pre-reloc;
+};
+
+&uart2 {
+	u-boot,dm-pre-reloc;
+};
arch/arm/dts/rk3288-rock2-square.dts +0 -18
index 11c580a0..41676696 100644
@@ -96,7 +96,6 @@
  };
 
  &sdmmc {
-	u-boot,dm-pre-reloc;
  	bus-width = <4>;
  	cap-mmc-highspeed;
  	cap-sd-highspeed;
@@ -139,7 +138,6 @@
  };
 
  &pinctrl {
-	u-boot,dm-pre-reloc;
  	ir {
  		ir_int: ir-int {
  			rockchip,pins = <8 1 RK_FUNC_GPIO &pcfg_pull_up>;
@@ -171,7 +169,6 @@
 
  &uart2 {
  	status = "okay";
-	u-boot,dm-pre-reloc;
  	reg-shift = <2>;
  };
 
@@ -182,18 +179,3 @@
  &usb_host0_ehci {
  	status = "okay";
  };
-
-&dmc {
-	rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
-		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
-		0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
-		0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
-		0x5 0x0>;
-	rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
-		0xa60 0x40 0x10 0x0>;
-	rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
-};
-
-&gpio7 {
-	u-boot,dm-pre-reloc;
-};
arch/arm/dts/rk3288-u-boot.dtsi +69 -11
index e3c6c10f..9eb696b1 100644
@@ -7,10 +7,53 @@
  #include "rockchip-optee.dtsi"
 
  / {
+	aliases {
+		gpio0 = &gpio0;
+		gpio1 = &gpio1;
+		gpio2 = &gpio2;
+		gpio3 = &gpio3;
+		gpio4 = &gpio4;
+		gpio5 = &gpio5;
+		gpio6 = &gpio6;
+		gpio7 = &gpio7;
+		gpio8 = &gpio8;
+		mmc0 = &emmc;
+		mmc1 = &sdmmc;
+		mmc2 = &sdio0;
+		mmc3 = &sdio1;
+	};
+
  	chosen {
  		u-boot,spl-boot-order = \
  			"same-as-spl", &emmc, &sdmmc;
  	};
+
+	dmc: dmc@ff610000 {
+		compatible = "rockchip,rk3288-dmc", "syscon";
+		reg = <0xff610000 0x3fc
+		       0xff620000 0x294
+		       0xff630000 0x3fc
+		       0xff640000 0x294>;
+		clocks = <&cru PCLK_DDRUPCTL0>, <&cru PCLK_PUBL0>,
+			 <&cru PCLK_DDRUPCTL1>, <&cru PCLK_PUBL1>,
+			 <&cru ARMCLK>;
+		clock-names = "pclk_ddrupctl0", "pclk_publ0",
+			      "pclk_ddrupctl1", "pclk_publ1",
+			      "arm_clk";
+		rockchip,cru = <&cru>;
+		rockchip,grf = <&grf>;
+		rockchip,noc = <&noc>;
+		rockchip,pmu = <&pmu>;
+		rockchip,sgrf = <&sgrf>;
+		rockchip,sram = <&ddr_sram>;
+		u-boot,dm-pre-reloc;
+	};
+
+	noc: syscon@ffac0000 {
+		compatible = "rockchip,rk3288-noc", "syscon";
+		reg = <0xffac0000 0x2000>;
+		u-boot,dm-pre-reloc;
+	};
  };
 
  #ifdef CONFIG_ROCKCHIP_SPI_IMAGE
@@ -37,38 +80,53 @@
  };
  #endif
 
-&dmc {
-	u-boot,dm-pre-reloc;
+&bus_intmem {
+	ddr_sram: ddr-sram@1000 {
+		compatible = "rockchip,rk3288-ddr-sram";
+		reg = <0x1000 0x4000>;
+	};
  };
 
-&pmu {
+&cru {
  	u-boot,dm-pre-reloc;
  };
 
-&sgrf {
+&gpio7 {
  	u-boot,dm-pre-reloc;
  };
 
-&cru {
+&grf {
  	u-boot,dm-pre-reloc;
  };
 
-&grf {
+&pmu {
  	u-boot,dm-pre-reloc;
  };
 
-&vopb {
+&sgrf {
  	u-boot,dm-pre-reloc;
  };
 
-&vopl {
-	u-boot,dm-pre-reloc;
+&uart0 {
+	clock-frequency = <24000000>;
+};
+
+&uart1 {
+	clock-frequency = <24000000>;
  };
 
-&noc {
+&uart2 {
+	clock-frequency = <24000000>;
+};
+
+&uart3 {
+	clock-frequency = <24000000>;
+};
+
+&vopb {
  	u-boot,dm-pre-reloc;
  };
 
-&gpio7 {
+&vopl {
  	u-boot,dm-pre-reloc;
  };
arch/arm/dts/rk3288-veyron-jerry-u-boot.dtsi new file +14 -0
new file mode 100644
index 00000000..2cc6b090
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include "rk3288-veyron-u-boot.dtsi"
+
+&dmc {
+	rockchip,pctl-timing = <0x29a 0xc8 0x1f4 0x42 0x4e 0x4 0xea 0xa
+		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
+		0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
+		0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
+		0x5 0x0>;
+	rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
+		0xa60 0x40 0x10 0x0>;
+	rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
+};
arch/arm/dts/rk3288-veyron-jerry.dts +0 -11
index c251d9d5..ff7669eb 100644
@@ -66,17 +66,6 @@
  	};
  };
 
-&dmc {
-	rockchip,pctl-timing = <0x29a 0xc8 0x1f4 0x42 0x4e 0x4 0xea 0xa
-		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
-		0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
-		0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
-		0x5 0x0>;
-	rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
-		0xa60 0x40 0x10 0x0>;
-	rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
-};
-
  &gpio_keys {
  	power {
  		gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
arch/arm/dts/rk3288-veyron-mickey-u-boot.dtsi new file +14 -0
new file mode 100644
index 00000000..213a46ba
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include "rk3288-veyron-u-boot.dtsi"
+
+&dmc {
+	rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
+		0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
+		0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0
+		0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4
+		0x8 0x1f4>;
+	rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076
+		0x0 0xc3 0x6 0x2>;
+	rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 1>;
+};
arch/arm/dts/rk3288-veyron-mickey.dts +0 -11
index e0dc3620..0521d9e0 100644
@@ -161,17 +161,6 @@
  	};
  };
 
-&dmc {
-	rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
-		0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
-		0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0
-		0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4
-		0x8 0x1f4>;
-	rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076
-		0x0 0xc3 0x6 0x2>;
-	rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 1>;
-};
-
  &emmc {
  	/delete-property/mmc-hs200-1_8v;
  };
arch/arm/dts/rk3288-veyron-minnie-u-boot.dtsi new file +14 -0
new file mode 100644
index 00000000..8211da41
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include "rk3288-veyron-u-boot.dtsi"
+
+&dmc {
+	rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
+		0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
+		0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0
+		0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4
+		0x8 0x1f4>;
+	rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076
+		0x0 0xc3 0x6 0x1>;
+	rockchip,sdram-params = <0x20d266a4 0x5b6 6 533000000 6 13 0>;
+};
arch/arm/dts/rk3288-veyron-minnie.dts +0 -11
index 646f6ae7..b56a3f4f 100644
@@ -137,17 +137,6 @@
  	power-supply = <&backlight_regulator>;
  };
 
-&dmc {
-	rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
-		0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
-		0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0
-		0x1 0x2 0x2 0x4 0x0 0x0 0xc0 0x4
-		0x8 0x1f4>;
-	rockchip,phy-timing = <0x48d7dd93 0x187008d8 0x121076
-		0x0 0xc3 0x6 0x1>;
-	rockchip,sdram-params = <0x20d266a4 0x5b6 6 533000000 6 13 0>;
-};
-
  &emmc {
  	/delete-property/mmc-hs200-1_8v;
  };
arch/arm/dts/rk3288-veyron-u-boot.dtsi +62 -0
index 899fe6e7..c8b33fea 100644
@@ -5,7 +5,69 @@
 
  #include "rk3288-u-boot.dtsi"
 
+/ {
+	chosen {
+		u-boot,spl-boot-order = &spi_flash;
+	};
+};
+
+&dmc {
+	logic-supply = <&vdd_logic>;
+	rockchip,odt-disable-freq = <333000000>;
+	rockchip,dll-disable-freq = <333000000>;
+	rockchip,sr-enable-freq = <333000000>;
+	rockchip,pd-enable-freq = <666000000>;
+	rockchip,auto-self-refresh-cnt = <0>;
+	rockchip,auto-power-down-cnt = <64>;
+	rockchip,ddr-speed-bin = <21>;
+	rockchip,trcd = <10>;
+	rockchip,trp = <10>;
+	operating-points = <
+		/* KHz    uV */
+		200000 1050000
+		333000 1100000
+		533000 1150000
+		666000 1200000
+	>;
+};
+
+&gpio3 {
+	u-boot,dm-pre-reloc;
+};
+
  &gpio7 {
  	u-boot,dm-pre-reloc;
  };
 
+&gpio8 {
+	u-boot,dm-pre-reloc;
+};
+
+&i2c0 {
+	u-boot,dm-pre-reloc;
+};
+
+&pinctrl {
+	u-boot,dm-pre-reloc;
+};
+
+&rk808 {
+	u-boot,dm-pre-reloc;
+};
+
+&sdmmc {
+	u-boot,dm-pre-reloc;
+};
+
+&spi2 {
+	u-boot,dm-pre-reloc;
+};
+
+&spi_flash {
+	u-boot,dm-pre-reloc;
+};
+
+&uart2 {
+	u-boot,dm-pre-reloc;
+};
+
arch/arm/dts/rk3288-veyron.dtsi +0 -39
index 8754043b..4a9c27a4 100644
@@ -16,7 +16,6 @@
 
  	chosen {
  		stdout-path = &uart2;
-		u-boot,spl-boot-order = &spi_flash;
  	};
 
  	firmware {
@@ -220,26 +219,6 @@
  	cpu0-supply = <&vdd_cpu>;
  };
 
-&dmc {
-	logic-supply = <&vdd_logic>;
-	rockchip,odt-disable-freq = <333000000>;
-	rockchip,dll-disable-freq = <333000000>;
-	rockchip,sr-enable-freq = <333000000>;
-	rockchip,pd-enable-freq = <666000000>;
-	rockchip,auto-self-refresh-cnt = <0>;
-	rockchip,auto-power-down-cnt = <64>;
-	rockchip,ddr-speed-bin = <21>;
-	rockchip,trcd = <10>;
-	rockchip,trp = <10>;
-	operating-points = <
-		/* KHz    uV */
-		200000 1050000
-		333000 1100000
-		533000 1150000
-		666000 1200000
-	>;
-};
-
  &efuse {
  	status = "okay";
  };
@@ -299,10 +278,8 @@
 
  &spi2 {
  	status = "okay";
-	u-boot,dm-pre-reloc;
 
  	spi_flash: spiflash@0 {
-		u-boot,dm-pre-reloc;
  		compatible = "spidev", "jedec,spi-nor";
  		spi-max-frequency = <20000000>; /* Reduce for Dediprog em100 pro */
  		reg = <0>;
@@ -315,7 +292,6 @@
  	clock-frequency = <400000>;
  	i2c-scl-falling-time-ns = <50>;		/* 2.5ns measured */
  	i2c-scl-rising-time-ns = <100>;		/* 45ns measured */
-	u-boot,dm-pre-reloc;
 
  	rk808: pmic@1b {
  		compatible = "rockchip,rk808";
@@ -328,7 +304,6 @@
  		rockchip,system-power-controller;
  		wakeup-source;
  		#clock-cells = <1>;
-		u-boot,dm-pre-reloc;
 
  		vcc1-supply = <&vcc33_sys>;
  		vcc2-supply = <&vcc33_sys>;
@@ -557,7 +532,6 @@
 
  &uart2 {
  	status = "okay";
-	u-boot,dm-pre-reloc;
  	reg-shift = <2>;
  };
 
@@ -601,7 +575,6 @@
  };
 
  &pinctrl {
-	u-boot,dm-pre-reloc;
  	pinctrl-names = "default", "sleep";
  	pinctrl-0 = <
  		/* Common for sleep and wake, but no owners */
@@ -826,15 +799,3 @@
  	assigned-clocks = <&cru SCLK_USBPHY480M_SRC>;
  	assigned-clock-parents = <&cru SCLK_OTGPHY0>;
  };
-
-&sdmmc {
-	u-boot,dm-pre-reloc;
-};
-
-&gpio3 {
-	u-boot,dm-pre-reloc;
-};
-
-&gpio8 {
-	u-boot,dm-pre-reloc;
-};
arch/arm/dts/rk3288.dtsi +1 -48
index 2086dbfd..c4abfa37 100644
@@ -15,25 +15,12 @@
 
  	interrupt-parent = <&gic>;
  	aliases {
-		gpio0 = &gpio0;
-		gpio1 = &gpio1;
-		gpio2 = &gpio2;
-		gpio3 = &gpio3;
-		gpio4 = &gpio4;
-		gpio5 = &gpio5;
-		gpio6 = &gpio6;
-		gpio7 = &gpio7;
-		gpio8 = &gpio8;
  		i2c0 = &i2c0;
  		i2c1 = &i2c1;
  		i2c2 = &i2c2;
  		i2c3 = &i2c3;
  		i2c4 = &i2c4;
  		i2c5 = &i2c5;
-		mmc0 = &emmc;
-		mmc1 = &sdmmc;
-		mmc2 = &sdio0;
-		mmc3 = &sdio1;
  		mshc0 = &emmc;
  		mshc1 = &sdmmc;
  		mshc2 = &sdio0;
@@ -323,7 +310,6 @@
  		interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
  		reg-shift = <2>;
  		reg-io-width = <4>;
-		clock-frequency = <24000000>;
  		clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>;
  		clock-names = "baudclk", "apb_pclk";
  		pinctrl-names = "default";
@@ -337,7 +323,6 @@
  		interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
  		reg-shift = <2>;
  		reg-io-width = <4>;
-		clock-frequency = <24000000>;
  		clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>;
  		clock-names = "baudclk", "apb_pclk";
  		pinctrl-names = "default";
@@ -351,7 +336,6 @@
  		interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
  		reg-shift = <2>;
  		reg-io-width = <4>;
-		clock-frequency = <24000000>;
  		clocks = <&cru SCLK_UART2>, <&cru PCLK_UART2>;
  		clock-names = "baudclk", "apb_pclk";
  		pinctrl-names = "default";
@@ -364,7 +348,6 @@
  		interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
  		reg-shift = <2>;
  		reg-io-width = <4>;
-		clock-frequency = <24000000>;
  		clocks = <&cru SCLK_UART3>, <&cru PCLK_UART3>;
  		clock-names = "baudclk", "apb_pclk";
  		pinctrl-names = "default";
@@ -378,7 +361,6 @@
  		interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
  		reg-shift = <2>;
  		reg-io-width = <4>;
-		clock-frequency = <24000000>;
  		clocks = <&cru SCLK_UART4>, <&cru PCLK_UART4>;
  		clock-names = "baudclk", "apb_pclk";
  		pinctrl-names = "default";
@@ -476,26 +458,6 @@
  		status = "disabled";
  	};
 
-	dmc: dmc@ff610000 {
-		compatible = "rockchip,rk3288-dmc", "syscon";
-		rockchip,cru = <&cru>;
-		rockchip,grf = <&grf>;
-		rockchip,pmu = <&pmu>;
-		rockchip,sgrf = <&sgrf>;
-		rockchip,noc = <&noc>;
-		reg = <0xff610000 0x3fc
-		       0xff620000 0x294
-		       0xff630000 0x3fc
-		       0xff640000 0x294>;
-		rockchip,sram = <&ddr_sram>;
-		clocks = <&cru PCLK_DDRUPCTL0>, <&cru PCLK_PUBL0>,
-			 <&cru PCLK_DDRUPCTL1>, <&cru PCLK_PUBL1>,
-			 <&cru ARMCLK>;
-		clock-names = "pclk_ddrupctl0", "pclk_publ0",
-			      "pclk_ddrupctl1", "pclk_publ1",
-			      "arm_clk";
-	};
-
  	i2c0: i2c@ff650000 {
  		compatible = "rockchip,rk3288-i2c";
  		reg = <0xff650000 0x1000>;
@@ -570,7 +532,7 @@
  		status = "disabled";
  	};
 
-	bus_intmem@ff700000 {
+	bus_intmem: bus_intmem@ff700000 {
  		compatible = "mmio-sram";
  		reg = <0xff700000 0x18000>;
  		#address-cells = <1>;
@@ -580,10 +542,6 @@
  			compatible = "rockchip,rk3066-smp-sram";
  			reg = <0x00 0x10>;
  		};
-		ddr_sram: ddr-sram@1000 {
-			compatible = "rockchip,rk3288-ddr-sram";
-			reg = <0x1000 0x4000>;
-		};
  	};
 
  	sram@ff720000 {
@@ -912,11 +870,6 @@
  		status = "disabled";
  	};
 
-	noc: syscon@ffac0000 {
-		compatible = "rockchip,rk3288-noc", "syscon";
-		reg = <0xffac0000 0x2000>;
-	};
-
  	efuse: efuse@ffb40000 {
  		compatible = "rockchip,rk3288-efuse";
  		reg = <0xffb40000 0x10000>;
#15 lore raw

PATCH v3 9/12 arm: dts: rockchip: sync rk3288.dtsi from Linux

In reply to Johan Jonker

Sync rk3288.dtsi from Linux version 5.17.

---

Changed V3:
change reg size

Changed V2:
rename mipi_dsi0 label
move io_domains
remove hdmi_audio veyron node
change memory@0 reg size

---
 arch/arm/dts/rk3288-evb.dtsi         |    2 +-
 arch/arm/dts/rk3288-miqi.dtsi        |   28 +-
 arch/arm/dts/rk3288-phycore-som.dtsi |   30 +-
 arch/arm/dts/rk3288-popmetal.dtsi    |   30 +-
 arch/arm/dts/rk3288-thermal.dtsi     |   87 --
 arch/arm/dts/rk3288-veyron-jerry.dts |    6 -
 arch/arm/dts/rk3288-veyron.dtsi      |   33 +-
 arch/arm/dts/rk3288.dtsi             | 1367 +++++++++++++++++---------
 8 files changed, 970 insertions(+), 613 deletions(-)
 delete mode 100644 arch/arm/dts/rk3288-thermal.dtsi
arch/arm/dts/rk3288-evb.dtsi +1 -1
index 04902c0b..72da8847 100644
@@ -448,7 +448,7 @@
 	status = "okay";
 };
 
-&mipi_dsi0 {
+&mipi_dsi {
 	status = "disabled";
 	rockchip,panel = <&panel>;
 	display-timings {
arch/arm/dts/rk3288-miqi.dtsi +13 -15
index cb80cbf2..b1c286c9 100644
@@ -18,21 +18,6 @@
 		clock-output-names = "ext_gmac";
 	};
 
-	io_domains: io-domains {
-		compatible = "rockchip,rk3288-io-voltage-domain";
-		rockchip,grf = <&grf>;
-
-		audio-supply = <&vcca_33>;
-		flash0-supply = <&vcc_flash>;
-		flash1-supply = <&vcc_lan>;
-		gpio30-supply = <&vcc_io>;
-		gpio1830-supply = <&vcc_io>;
-		lcdc-supply = <&vcc_io>;
-		sdcard-supply = <&vccio_sd>;
-		wifi-supply = <&vcc_18>;
-	};
-
-
 	leds {
 		compatible = "gpio-leds";
 
@@ -277,6 +262,19 @@
 	status = "okay";
 };
 
+&io_domains {
+	status = "okay";
+
+	audio-supply = <&vcca_33>;
+	flash0-supply = <&vcc_flash>;
+	flash1-supply = <&vcc_lan>;
+	gpio30-supply = <&vcc_io>;
+	gpio1830-supply = <&vcc_io>;
+	lcdc-supply = <&vcc_io>;
+	sdcard-supply = <&vccio_sd>;
+	wifi-supply = <&vcc_18>;
+};
+
 &pinctrl {
 	pcfg_output_high: pcfg-output-high {
 		output-high;
arch/arm/dts/rk3288-phycore-som.dtsi +14 -16
index 821525f7..8ac695c8 100644
@@ -71,22 +71,6 @@
 		clock-output-names = "ext_gmac";
 	};
 
-	io_domains: io_domains {
-		compatible = "rockchip,rk3288-io-voltage-domain";
-
-		status = "okay";
-		sdcard-supply = <&vdd_io_sd>;
-		flash0-supply = <&vdd_emmc_io>;
-		flash1-supply = <&vdd_misc_1v8>;
-		gpio1830-supply = <&vdd_3v3_io>;
-		gpio30-supply = <&vdd_3v3_io>;
-		bb-supply = <&vdd_3v3_io>;
-		dvp-supply = <&vdd_3v3_io>;
-		lcdc-supply = <&vdd_3v3_io>;
-		wifi-supply = <&vdd_3v3_io>;
-		audio-supply = <&vdd_3v3_io>;
-	};
-
 	leds: user-leds {
 		compatible = "gpio-leds";
 		pinctrl-names = "default";
@@ -197,6 +181,20 @@
 	ddc-i2c-bus = <&i2c5>;
 };
 
+&io_domains {
+	status = "okay";
+	sdcard-supply = <&vdd_io_sd>;
+	flash0-supply = <&vdd_emmc_io>;
+	flash1-supply = <&vdd_misc_1v8>;
+	gpio1830-supply = <&vdd_3v3_io>;
+	gpio30-supply = <&vdd_3v3_io>;
+	bb-supply = <&vdd_3v3_io>;
+	dvp-supply = <&vdd_3v3_io>;
+	lcdc-supply = <&vdd_3v3_io>;
+	wifi-supply = <&vdd_3v3_io>;
+	audio-supply = <&vdd_3v3_io>;
+};
+
 &i2c0 {
 	status = "okay";
 	clock-frequency = <400000>;
arch/arm/dts/rk3288-popmetal.dtsi +14 -16
index 63785eb5..bcd8fded 100644
@@ -69,22 +69,6 @@
 		};
 	};
 
-	io_domains: io-domains {
-		compatible = "rockchip,rk3288-io-voltage-domain";
-		rockchip,grf = <&grf>;
-
-		audio-supply = <&vcca_33>;
-		bb-supply = <&vcc_io>;
-		dvp-supply = <&vcc18_dvp>;
-		flash0-supply = <&vcc_flash>;
-		flash1-supply = <&vcc_lan>;
-		gpio30-supply = <&vcc_io>;
-		gpio1830-supply = <&vcc_io>;
-		lcdc-supply = <&vcc_io>;
-		sdcard-supply = <&vccio_sd>;
-		wifi-supply = <&vccio_wl>;
-	};
-
 	ir: ir-receiver {
 		compatible = "gpio-ir-receiver";
 		gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
@@ -441,6 +425,20 @@
 	status = "okay";
 };
 
+&io_domains {
+	status = "okay";
+	audio-supply = <&vcca_33>;
+	bb-supply = <&vcc_io>;
+	dvp-supply = <&vcc18_dvp>;
+	flash0-supply = <&vcc_flash>;
+	flash1-supply = <&vcc_lan>;
+	gpio30-supply = <&vcc_io>;
+	gpio1830-supply = <&vcc_io>;
+	lcdc-supply = <&vcc_io>;
+	sdcard-supply = <&vccio_sd>;
+	wifi-supply = <&vccio_wl>;
+};
+
 &pinctrl {
 	ak8963 {
 		comp_int: comp-int {
arch/arm/dts/rk3288-thermal.dtsi deleted +0 -87

87 lines not on this page · raw message

arch/arm/dts/rk3288-veyron-jerry.dts +0 -6
index ff7669eb..40fee55c 100644
@@ -137,12 +137,6 @@
 		};
 	};
 
-	edp {
-		edp_hpd: edp_hpd {
-			rockchip,pins = <7 11 RK_FUNC_2 &pcfg_pull_down>;
-		};
-	};
-
 	emmc {
 		/* Make sure eMMC is not in reset */
 		emmc_deassert_reset: emmc-deassert-reset {
arch/arm/dts/rk3288-veyron.dtsi +14 -19
index 4a9c27a4..ac9e815e 100644
@@ -198,21 +198,6 @@
 		/* Faux input supply.  See bt_regulator description. */
 		vin-supply = <&bt_regulator>;
 	};
-
-	io-domains {
-		compatible = "rockchip,rk3288-io-voltage-domain";
-		rockchip,grf = <&grf>;
-
-		audio-supply = <&vcc18_codec>;
-		bb-supply = <&vcc33_io>;
-		dvp-supply = <&vcc_18>;
-		flash0-supply = <&vcc18_flashio>;
-		gpio1830-supply = <&vcc33_io>;
-		gpio30-supply = <&vcc33_io>;
-		lcdc-supply = <&vcc33_lcd>;
-		sdcard-supply = <&vccio_sd>;
-		wifi-supply = <&vcc18_wl>;
-	};
 };
 
 &cpu0 {
@@ -503,6 +488,20 @@
 	clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>, <&cru SCLK_I2S0_OUT>;
 };
 
+&io_domains {
+	status = "okay";
+
+	audio-supply = <&vcc18_codec>;
+	bb-supply = <&vcc33_io>;
+	dvp-supply = <&vcc_18>;
+	flash0-supply = <&vcc18_flashio>;
+	gpio1830-supply = <&vcc33_io>;
+	gpio30-supply = <&vcc33_io>;
+	lcdc-supply = <&vcc33_lcd>;
+	sdcard-supply = <&vccio_sd>;
+	wifi-supply = <&vcc18_wl>;
+};
+
 &wdt {
 	status = "okay";
 };
@@ -560,10 +559,6 @@
 	status = "okay";
 };
 
-&hdmi_audio {
-	status = "okay";
-};
-
 &gpu {
 	status = "okay";
 };
arch/arm/dts/rk3288.dtsi +914 -453

2,127 lines not on this page · raw message

Signature · 1 line
2.20.1
Reviewed-by on v3 9/12
#16 lore raw

Re: [PATCH v3 09/12] arm: dts: rockchip: sync rk3288.dtsi from Linux

Quoted 3 lines · Johan Jonker

Sync rk3288.dtsi from Linux version 5.17.

Thanks,
- Kever

Quoted 2,519 lines

---

Changed V3:
change reg size

Changed V2:
rename mipi_dsi0 label
move io_domains
remove hdmi_audio veyron node
change memory@0 reg size

---
  arch/arm/dts/rk3288-evb.dtsi         |    2 +-
  arch/arm/dts/rk3288-miqi.dtsi        |   28 +-
  arch/arm/dts/rk3288-phycore-som.dtsi |   30 +-
  arch/arm/dts/rk3288-popmetal.dtsi    |   30 +-
  arch/arm/dts/rk3288-thermal.dtsi     |   87 --
  arch/arm/dts/rk3288-veyron-jerry.dts |    6 -
  arch/arm/dts/rk3288-veyron.dtsi      |   33 +-
  arch/arm/dts/rk3288.dtsi             | 1367 +++++++++++++++++---------
  8 files changed, 970 insertions(+), 613 deletions(-)

delete mode 100644 arch/arm/dts/rk3288-thermal.dtsi

arch/arm/dts/rk3288-evb.dtsi +1 -1
index 04902c0b..72da8847 100644
@@ -448,7 +448,7 @@
  	status = "okay";
  };
 
-&mipi_dsi0 {
+&mipi_dsi {
  	status = "disabled";
  	rockchip,panel = <&panel>;
  	display-timings {
arch/arm/dts/rk3288-miqi.dtsi +13 -15
index cb80cbf2..b1c286c9 100644
@@ -18,21 +18,6 @@
  		clock-output-names = "ext_gmac";
  	};
 
-	io_domains: io-domains {
-		compatible = "rockchip,rk3288-io-voltage-domain";
-		rockchip,grf = <&grf>;
-
-		audio-supply = <&vcca_33>;
-		flash0-supply = <&vcc_flash>;
-		flash1-supply = <&vcc_lan>;
-		gpio30-supply = <&vcc_io>;
-		gpio1830-supply = <&vcc_io>;
-		lcdc-supply = <&vcc_io>;
-		sdcard-supply = <&vccio_sd>;
-		wifi-supply = <&vcc_18>;
-	};
-
-
  	leds {
  		compatible = "gpio-leds";
 
@@ -277,6 +262,19 @@
  	status = "okay";
  };
 
+&io_domains {
+	status = "okay";
+
+	audio-supply = <&vcca_33>;
+	flash0-supply = <&vcc_flash>;
+	flash1-supply = <&vcc_lan>;
+	gpio30-supply = <&vcc_io>;
+	gpio1830-supply = <&vcc_io>;
+	lcdc-supply = <&vcc_io>;
+	sdcard-supply = <&vccio_sd>;
+	wifi-supply = <&vcc_18>;
+};
+
  &pinctrl {
  	pcfg_output_high: pcfg-output-high {
  		output-high;
arch/arm/dts/rk3288-phycore-som.dtsi +14 -16
index 821525f7..8ac695c8 100644
@@ -71,22 +71,6 @@
  		clock-output-names = "ext_gmac";
  	};
 
-	io_domains: io_domains {
-		compatible = "rockchip,rk3288-io-voltage-domain";
-
-		status = "okay";
-		sdcard-supply = <&vdd_io_sd>;
-		flash0-supply = <&vdd_emmc_io>;
-		flash1-supply = <&vdd_misc_1v8>;
-		gpio1830-supply = <&vdd_3v3_io>;
-		gpio30-supply = <&vdd_3v3_io>;
-		bb-supply = <&vdd_3v3_io>;
-		dvp-supply = <&vdd_3v3_io>;
-		lcdc-supply = <&vdd_3v3_io>;
-		wifi-supply = <&vdd_3v3_io>;
-		audio-supply = <&vdd_3v3_io>;
-	};
-
  	leds: user-leds {
  		compatible = "gpio-leds";
  		pinctrl-names = "default";
@@ -197,6 +181,20 @@
  	ddc-i2c-bus = <&i2c5>;
  };
 
+&io_domains {
+	status = "okay";
+	sdcard-supply = <&vdd_io_sd>;
+	flash0-supply = <&vdd_emmc_io>;
+	flash1-supply = <&vdd_misc_1v8>;
+	gpio1830-supply = <&vdd_3v3_io>;
+	gpio30-supply = <&vdd_3v3_io>;
+	bb-supply = <&vdd_3v3_io>;
+	dvp-supply = <&vdd_3v3_io>;
+	lcdc-supply = <&vdd_3v3_io>;
+	wifi-supply = <&vdd_3v3_io>;
+	audio-supply = <&vdd_3v3_io>;
+};
+
  &i2c0 {
  	status = "okay";
  	clock-frequency = <400000>;
arch/arm/dts/rk3288-popmetal.dtsi +14 -16
index 63785eb5..bcd8fded 100644
@@ -69,22 +69,6 @@
  		};
  	};
 
-	io_domains: io-domains {
-		compatible = "rockchip,rk3288-io-voltage-domain";
-		rockchip,grf = <&grf>;
-
-		audio-supply = <&vcca_33>;
-		bb-supply = <&vcc_io>;
-		dvp-supply = <&vcc18_dvp>;
-		flash0-supply = <&vcc_flash>;
-		flash1-supply = <&vcc_lan>;
-		gpio30-supply = <&vcc_io>;
-		gpio1830-supply = <&vcc_io>;
-		lcdc-supply = <&vcc_io>;
-		sdcard-supply = <&vccio_sd>;
-		wifi-supply = <&vccio_wl>;
-	};
-
  	ir: ir-receiver {
  		compatible = "gpio-ir-receiver";
  		gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
@@ -441,6 +425,20 @@
  	status = "okay";
  };
 
+&io_domains {
+	status = "okay";
+	audio-supply = <&vcca_33>;
+	bb-supply = <&vcc_io>;
+	dvp-supply = <&vcc18_dvp>;
+	flash0-supply = <&vcc_flash>;
+	flash1-supply = <&vcc_lan>;
+	gpio30-supply = <&vcc_io>;
+	gpio1830-supply = <&vcc_io>;
+	lcdc-supply = <&vcc_io>;
+	sdcard-supply = <&vccio_sd>;
+	wifi-supply = <&vccio_wl>;
+};
+
  &pinctrl {
  	ak8963 {
  		comp_int: comp-int {
arch/arm/dts/rk3288-thermal.dtsi deleted +0 -87
deleted file mode 100644
index 87dd8142..00000000
@@ -1,87 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source for RK3288 SoC thermal
- *
- * Copyright (c) 2014, Fuzhou Rockchip Electronics Co., Ltd
- */
-
-#include <dt-bindings/thermal/thermal.h>
-
-reserve_thermal: reserve_thermal {
-	polling-delay-passive = <1000>; /* milliseconds */
-	polling-delay = <5000>; /* milliseconds */
-
-			/* sensor	ID */
-	thermal-sensors = <&tsadc	0>;
-
-};
-
-cpu_thermal: cpu_thermal {
-	polling-delay-passive = <100>; /* milliseconds */
-	polling-delay = <5000>; /* milliseconds */
-
-			/* sensor	ID */
-	thermal-sensors = <&tsadc	1>;
-	linux,hwmon;
-
-	trips {
-		cpu_alert0: cpu_alert0 {
-			temperature = <70000>; /* millicelsius */
-			hysteresis = <2000>; /* millicelsius */
-			type = "passive";
-		};
-		cpu_alert1: cpu_alert1 {
-			temperature = <75000>; /* millicelsius */
-			hysteresis = <2000>; /* millicelsius */
-			type = "passive";
-		};
-		cpu_crit: cpu_crit {
-			temperature = <100000>; /* millicelsius */
-			hysteresis = <2000>; /* millicelsius */
-			type = "critical";
-		};
-	};
-
-	cooling-maps {
-		map0 {
-			trip = <&cpu_alert0>;
-			cooling-device =
-				<&cpu0 THERMAL_NO_LIMIT 6>;
-		};
-		map1 {
-			trip = <&cpu_alert1>;
-			cooling-device =
-				<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-		};
-	};
-};
-
-gpu_thermal: gpu_thermal {
-	polling-delay-passive = <100>; /* milliseconds */
-	polling-delay = <5000>; /* milliseconds */
-
-			/* sensor	ID */
-	thermal-sensors = <&tsadc	2>;
-	linux,hwmon;
-
-	trips {
-		gpu_alert0: gpu_alert0 {
-			temperature = <80000>; /* millicelsius */
-			hysteresis = <2000>; /* millicelsius */
-			type = "passive";
-		};
-		gpu_crit: gpu_crit {
-			temperature = <100000>; /* millicelsius */
-			hysteresis = <2000>; /* millicelsius */
-			type = "critical";
-		};
-	};
-
-	cooling-maps {
-		map0 {
-			trip = <&gpu_alert0>;
-			cooling-device =
-				<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-		};
-	};
-};
arch/arm/dts/rk3288-veyron-jerry.dts +0 -6
index ff7669eb..40fee55c 100644
@@ -137,12 +137,6 @@
  		};
  	};
 
-	edp {
-		edp_hpd: edp_hpd {
-			rockchip,pins = <7 11 RK_FUNC_2 &pcfg_pull_down>;
-		};
-	};
-
  	emmc {
  		/* Make sure eMMC is not in reset */
  		emmc_deassert_reset: emmc-deassert-reset {
arch/arm/dts/rk3288-veyron.dtsi +14 -19
index 4a9c27a4..ac9e815e 100644
@@ -198,21 +198,6 @@
  		/* Faux input supply.  See bt_regulator description. */
  		vin-supply = <&bt_regulator>;
  	};
-
-	io-domains {
-		compatible = "rockchip,rk3288-io-voltage-domain";
-		rockchip,grf = <&grf>;
-
-		audio-supply = <&vcc18_codec>;
-		bb-supply = <&vcc33_io>;
-		dvp-supply = <&vcc_18>;
-		flash0-supply = <&vcc18_flashio>;
-		gpio1830-supply = <&vcc33_io>;
-		gpio30-supply = <&vcc33_io>;
-		lcdc-supply = <&vcc33_lcd>;
-		sdcard-supply = <&vccio_sd>;
-		wifi-supply = <&vcc18_wl>;
-	};
  };
 
  &cpu0 {
@@ -503,6 +488,20 @@
  	clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>, <&cru SCLK_I2S0_OUT>;
  };
 
+&io_domains {
+	status = "okay";
+
+	audio-supply = <&vcc18_codec>;
+	bb-supply = <&vcc33_io>;
+	dvp-supply = <&vcc_18>;
+	flash0-supply = <&vcc18_flashio>;
+	gpio1830-supply = <&vcc33_io>;
+	gpio30-supply = <&vcc33_io>;
+	lcdc-supply = <&vcc33_lcd>;
+	sdcard-supply = <&vccio_sd>;
+	wifi-supply = <&vcc18_wl>;
+};
+
  &wdt {
  	status = "okay";
  };
@@ -560,10 +559,6 @@
  	status = "okay";
  };
 
-&hdmi_audio {
-	status = "okay";
-};
-
  &gpu {
  	status = "okay";
  };
arch/arm/dts/rk3288.dtsi +914 -453
index c4abfa37..14a3f8e8 100644
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 
  #include <dt-bindings/gpio/gpio.h>
  #include <dt-bindings/interrupt-controller/irq.h>
@@ -7,14 +7,18 @@
  #include <dt-bindings/clock/rk3288-cru.h>
  #include <dt-bindings/power/rk3288-power.h>
  #include <dt-bindings/thermal/thermal.h>
-#include <dt-bindings/video/rk3288.h>
-#include "skeleton.dtsi"
+#include <dt-bindings/soc/rockchip,boot-mode.h>
 
  / {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
  	compatible = "rockchip,rk3288";
 
  	interrupt-parent = <&gic>;
+
  	aliases {
+		ethernet0 = &gmac;
  		i2c0 = &i2c0;
  		i2c1 = &i2c1;
  		i2c2 = &i2c2;
@@ -35,6 +39,15 @@
  		spi2 = &spi2;
  	};
 
+	arm-pmu {
+		compatible = "arm,cortex-a12-pmu";
+		interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
+	};
+
  	cpus {
  		#address-cells = <1>;
  		#size-cells = <0>;
@@ -45,85 +58,119 @@
  			device_type = "cpu";
  			compatible = "arm,cortex-a12";
  			reg = <0x500>;
-			operating-points = <
-				/* KHz    uV */
-				1800000 1400000
-				1704000 1350000
-				1608000 1300000
-				1512000 1250000
-				1416000 1200000
-				1200000 1100000
-				1008000 1050000
-				 816000 1000000
-				 696000  950000
-				 600000  900000
-				 408000  900000
-				 216000  900000
-				 126000  900000
-			>;
+			resets = <&cru SRST_CORE0>;
+			operating-points-v2 = <&cpu_opp_table>;
  			#cooling-cells = <2>; /* min followed by max */
  			clock-latency = <40000>;
  			clocks = <&cru ARMCLK>;
-			resets = <&cru SRST_CORE0>;
+			dynamic-power-coefficient = <370>;
  		};
-		cpu@501 {
+		cpu1: cpu@501 {
  			device_type = "cpu";
  			compatible = "arm,cortex-a12";
  			reg = <0x501>;
  			resets = <&cru SRST_CORE1>;
+			operating-points-v2 = <&cpu_opp_table>;
+			#cooling-cells = <2>; /* min followed by max */
+			clock-latency = <40000>;
+			clocks = <&cru ARMCLK>;
+			dynamic-power-coefficient = <370>;
  		};
-		cpu@502 {
+		cpu2: cpu@502 {
  			device_type = "cpu";
  			compatible = "arm,cortex-a12";
  			reg = <0x502>;
  			resets = <&cru SRST_CORE2>;
+			operating-points-v2 = <&cpu_opp_table>;
+			#cooling-cells = <2>; /* min followed by max */
+			clock-latency = <40000>;
+			clocks = <&cru ARMCLK>;
+			dynamic-power-coefficient = <370>;
  		};
-		cpu@503 {
+		cpu3: cpu@503 {
  			device_type = "cpu";
  			compatible = "arm,cortex-a12";
  			reg = <0x503>;
  			resets = <&cru SRST_CORE3>;
+			operating-points-v2 = <&cpu_opp_table>;
+			#cooling-cells = <2>; /* min followed by max */
+			clock-latency = <40000>;
+			clocks = <&cru ARMCLK>;
+			dynamic-power-coefficient = <370>;
  		};
  	};
 
-	amba {
-		compatible = "arm,amba-bus";
+	cpu_opp_table: opp-table-0 {
+		compatible = "operating-points-v2";
+		opp-shared;
+
+		opp-126000000 {
+			opp-hz = /bits/ 64 <126000000>;
+			opp-microvolt = <900000>;
+		};
+		opp-216000000 {
+			opp-hz = /bits/ 64 <216000000>;
+			opp-microvolt = <900000>;
+		};
+		opp-312000000 {
+			opp-hz = /bits/ 64 <312000000>;
+			opp-microvolt = <900000>;
+		};
+		opp-408000000 {
+			opp-hz = /bits/ 64 <408000000>;
+			opp-microvolt = <900000>;
+		};
+		opp-600000000 {
+			opp-hz = /bits/ 64 <600000000>;
+			opp-microvolt = <900000>;
+		};
+		opp-696000000 {
+			opp-hz = /bits/ 64 <696000000>;
+			opp-microvolt = <950000>;
+		};
+		opp-816000000 {
+			opp-hz = /bits/ 64 <816000000>;
+			opp-microvolt = <1000000>;
+		};
+		opp-1008000000 {
+			opp-hz = /bits/ 64 <1008000000>;
+			opp-microvolt = <1050000>;
+		};
+		opp-1200000000 {
+			opp-hz = /bits/ 64 <1200000000>;
+			opp-microvolt = <1100000>;
+		};
+		opp-1416000000 {
+			opp-hz = /bits/ 64 <1416000000>;
+			opp-microvolt = <1200000>;
+		};
+		opp-1512000000 {
+			opp-hz = /bits/ 64 <1512000000>;
+			opp-microvolt = <1300000>;
+		};
+		opp-1608000000 {
+			opp-hz = /bits/ 64 <1608000000>;
+			opp-microvolt = <1350000>;
+		};
+	};
+
+	reserved-memory {
  		#address-cells = <1>;
  		#size-cells = <1>;
  		ranges;
 
-		dmac_peri: dma-controller@ff250000 {
-			compatible = "arm,pl330", "arm,primecell";
-			broken-no-flushp;
-			reg = <0xff250000 0x4000>;
-			interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
-			#dma-cells = <1>;
-			clocks = <&cru ACLK_DMAC2>;
-			clock-names = "apb_pclk";
-		};
-
-		dmac_bus_ns: dma-controller@ff600000 {
-			compatible = "arm,pl330", "arm,primecell";
-			broken-no-flushp;
-			reg = <0xff600000 0x4000>;
-			interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
-			#dma-cells = <1>;
-			clocks = <&cru ACLK_DMAC1>;
-			clock-names = "apb_pclk";
-			status = "disabled";
-		};
-
-		dmac_bus_s: dma-controller@ffb20000 {
-			compatible = "arm,pl330", "arm,primecell";
-			broken-no-flushp;
-			reg = <0xffb20000 0x4000>;
-			interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
-			#dma-cells = <1>;
-			clocks = <&cru ACLK_DMAC1>;
-			clock-names = "apb_pclk";
+		/*
+		 * The rk3288 cannot use the memory area above 0xfe000000
+		 * for dma operations for some reason. While there is
+		 * probably a better solution available somewhere, we
+		 * haven't found it yet and while devices with 2GB of ram
+		 * are not affected, this issue prevents 4GB from booting.
+		 * So to make these devices at least bootable, block
+		 * this area for the time being until the real solution
+		 * is found.
+		 */
+		dma-unusable@fe000000 {
+			reg = <0xfe000000 0x1000000>;
  		};
  	};
 
@@ -135,14 +182,22 @@
  	};
 
  	timer {
-	        arm,use-physical-timer;
  		compatible = "arm,armv7-timer";
+		arm,cpu-registers-not-fw-configured;
  		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
  			     <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
  			     <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
  			     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
  		clock-frequency = <24000000>;
-		always-on;
+		arm,no-tick-in-suspend;
+	};
+
+	timer: timer@ff810000 {
+		compatible = "rockchip,rk3288-timer";
+		reg = <0xff810000 0x20>;
+		interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru PCLK_TIMER>, <&xin24m>;
+		clock-names = "pclk", "timer";
  	};
 
  	display-subsystem {
@@ -150,51 +205,59 @@
  		ports = <&vopl_out>, <&vopb_out>;
  	};
 
-	sdmmc: dwmmc@ff0c0000 {
+	sdmmc: mmc@ff0c0000 {
  		compatible = "rockchip,rk3288-dw-mshc";
  		max-frequency = <150000000>;
  		clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
  			 <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
-		clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
  		fifo-depth = <0x100>;
  		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
  		reg = <0xff0c0000 0x4000>;
+		resets = <&cru SRST_MMC0>;
+		reset-names = "reset";
  		status = "disabled";
  	};
 
-	sdio0: dwmmc@ff0d0000 {
+	sdio0: mmc@ff0d0000 {
  		compatible = "rockchip,rk3288-dw-mshc";
  		max-frequency = <150000000>;
  		clocks = <&cru HCLK_SDIO0>, <&cru SCLK_SDIO0>,
  			 <&cru SCLK_SDIO0_DRV>, <&cru SCLK_SDIO0_SAMPLE>;
-		clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
  		fifo-depth = <0x100>;
  		interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
  		reg = <0xff0d0000 0x4000>;
+		resets = <&cru SRST_SDIO0>;
+		reset-names = "reset";
  		status = "disabled";
  	};
 
-	sdio1: dwmmc@ff0e0000 {
+	sdio1: mmc@ff0e0000 {
  		compatible = "rockchip,rk3288-dw-mshc";
  		max-frequency = <150000000>;
  		clocks = <&cru HCLK_SDIO1>, <&cru SCLK_SDIO1>,
  			 <&cru SCLK_SDIO1_DRV>, <&cru SCLK_SDIO1_SAMPLE>;
-		clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
  		fifo-depth = <0x100>;
  		interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
  		reg = <0xff0e0000 0x4000>;
+		resets = <&cru SRST_SDIO1>;
+		reset-names = "reset";
  		status = "disabled";
  	};
 
-	emmc: dwmmc@ff0f0000 {
+	emmc: mmc@ff0f0000 {
  		compatible = "rockchip,rk3288-dw-mshc";
  		max-frequency = <150000000>;
  		clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
  			 <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
-		clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
  		fifo-depth = <0x100>;
  		interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
  		reg = <0xff0f0000 0x4000>;
+		resets = <&cru SRST_EMMC>;
+		reset-names = "reset";
  		status = "disabled";
  	};
 
@@ -205,6 +268,8 @@
  		#io-channel-cells = <1>;
  		clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>;
  		clock-names = "saradc", "apb_pclk";
+		resets = <&cru SRST_SARADC>;
+		reset-names = "saradc-apb";
  		status = "disabled";
  	};
 
@@ -304,6 +369,7 @@
  		pinctrl-0 = <&i2c5_xfer>;
  		status = "disabled";
  	};
+
  	uart0: serial@ff180000 {
  		compatible = "rockchip,rk3288-uart", "snps,dw-apb-uart";
  		reg = <0xff180000 0x100>;
@@ -312,6 +378,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";
@@ -325,6 +393,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";
@@ -342,6 +412,7 @@
  		pinctrl-0 = <&uart2_xfer>;
  		status = "disabled";
  	};
+
  	uart3: serial@ff1b0000 {
  		compatible = "rockchip,rk3288-uart", "snps,dw-apb-uart";
  		reg = <0xff1b0000 0x100>;
@@ -350,6 +421,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";
@@ -363,12 +436,104 @@
  		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";
  	};
-	thermal: thermal-zones {
-		#include "rk3288-thermal.dtsi"
+
+	dmac_peri: dma-controller@ff250000 {
+		compatible = "arm,pl330", "arm,primecell";
+		reg = <0xff250000 0x4000>;
+		interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
+		#dma-cells = <1>;
+		arm,pl330-broken-no-flushp;
+		arm,pl330-periph-burst;
+		clocks = <&cru ACLK_DMAC2>;
+		clock-names = "apb_pclk";
+	};
+
+	thermal-zones {
+		reserve_thermal: reserve-thermal {
+			polling-delay-passive = <1000>; /* milliseconds */
+			polling-delay = <5000>; /* milliseconds */
+
+			thermal-sensors = <&tsadc 0>;
+		};
+
+		cpu_thermal: cpu-thermal {
+			polling-delay-passive = <100>; /* milliseconds */
+			polling-delay = <5000>; /* milliseconds */
+
+			thermal-sensors = <&tsadc 1>;
+
+			trips {
+				cpu_alert0: cpu_alert0 {
+					temperature = <70000>; /* millicelsius */
+					hysteresis = <2000>; /* millicelsius */
+					type = "passive";
+				};
+				cpu_alert1: cpu_alert1 {
+					temperature = <75000>; /* millicelsius */
+					hysteresis = <2000>; /* millicelsius */
+					type = "passive";
+				};
+				cpu_crit: cpu_crit {
+					temperature = <90000>; /* millicelsius */
+					hysteresis = <2000>; /* millicelsius */
+					type = "critical";
+				};
+			};
+
+			cooling-maps {
+				map0 {
+					trip = <&cpu_alert0>;
+					cooling-device =
+						<&cpu0 THERMAL_NO_LIMIT 6>,
+						<&cpu1 THERMAL_NO_LIMIT 6>,
+						<&cpu2 THERMAL_NO_LIMIT 6>,
+						<&cpu3 THERMAL_NO_LIMIT 6>;
+				};
+				map1 {
+					trip = <&cpu_alert1>;
+					cooling-device =
+						<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+						<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+						<&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+						<&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+				};
+			};
+		};
+
+		gpu_thermal: gpu-thermal {
+			polling-delay-passive = <100>; /* milliseconds */
+			polling-delay = <5000>; /* milliseconds */
+
+			thermal-sensors = <&tsadc 2>;
+
+			trips {
+				gpu_alert0: gpu_alert0 {
+					temperature = <70000>; /* millicelsius */
+					hysteresis = <2000>; /* millicelsius */
+					type = "passive";
+				};
+				gpu_crit: gpu_crit {
+					temperature = <90000>; /* millicelsius */
+					hysteresis = <2000>; /* millicelsius */
+					type = "critical";
+				};
+			};
+
+			cooling-maps {
+				map0 {
+					trip = <&gpu_alert0>;
+					cooling-device =
+						<&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+				};
+			};
+		};
  	};
 
  	tsadc: tsadc@ff280000 {
@@ -379,18 +544,22 @@
  		clock-names = "tsadc", "apb_pclk";
  		resets = <&cru SRST_TSADC>;
  		reset-names = "tsadc-apb";
-		pinctrl-names = "otp_out";
-		pinctrl-0 = <&otp_out>;
+		pinctrl-names = "init", "default", "sleep";
+		pinctrl-0 = <&otp_pin>;
+		pinctrl-1 = <&otp_out>;
+		pinctrl-2 = <&otp_pin>;
  		#thermal-sensor-cells = <1>;
-		hw-shut-temp = <125000>;
+		rockchip,grf = <&grf>;
+		rockchip,hw-tshut-temp = <95000>;
  		status = "disabled";
  	};
 
  	gmac: ethernet@ff290000 {
  		compatible = "rockchip,rk3288-gmac";
  		reg = <0xff290000 0x10000>;
-		interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
-		interrupt-names = "macirq";
+		interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>,
+				<GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "macirq", "eth_wake_irq";
  		rockchip,grf = <&grf>;
  		clocks = <&cru SCLK_MAC>,
  			<&cru SCLK_MAC_RX>, <&cru SCLK_MAC_TX>,
@@ -400,6 +569,9 @@
  			"mac_clk_rx", "mac_clk_tx",
  			"clk_mac_ref", "clk_mac_refout",
  			"aclk_mac", "pclk_mac";
+		resets = <&cru SRST_MAC>;
+		reset-names = "stmmaceth";
+		status = "disabled";
  	};
 
  	usb_host0_ehci: usb@ff500000 {
@@ -407,16 +579,15 @@
  		reg = <0xff500000 0x100>;
  		interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&cru HCLK_USBHOST0>;
-		clock-names = "usbhost";
  		phys = <&usbphy1>;
  		phy-names = "usb";
  		status = "disabled";
  	};
 
-	/* NOTE: doesn't work on RK3288, but fixed on RK3288W */
+	/* NOTE: doesn't work on RK3288, but was fixed on RK3288W */
  	usb_host0_ohci: usb@ff520000 {
  		compatible = "generic-ohci";
-		reg = <0x0 0xff520000 0x0 0x100>;
+		reg = <0xff520000 0x100>;
  		interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&cru HCLK_USBHOST0>;
  		phys = <&usbphy1>;
@@ -431,8 +602,10 @@
  		interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&cru HCLK_USBHOST1>;
  		clock-names = "otg";
+		dr_mode = "host";
  		phys = <&usbphy2>;
  		phy-names = "usb2-phy";
+		snps,reset-phy-on-wake;
  		status = "disabled";
  	};
 
@@ -444,6 +617,9 @@
  		clocks = <&cru HCLK_OTG0>;
  		clock-names = "otg";
  		dr_mode = "otg";
+		g-np-tx-fifo-size = <16>;
+		g-rx-fifo-size = <275>;
+		g-tx-fifo-size = <256 128 128 64 64 32>;
  		phys = <&usbphy0>;
  		phy-names = "usb2-phy";
  		status = "disabled";
@@ -454,7 +630,19 @@
  		reg = <0xff5c0000 0x100>;
  		interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&cru HCLK_HSIC>;
-		clock-names = "usbhost";
+		status = "disabled";
+	};
+
+	dmac_bus_ns: dma-controller@ff600000 {
+		compatible = "arm,pl330", "arm,primecell";
+		reg = <0xff600000 0x4000>;
+		interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
+		#dma-cells = <1>;
+		arm,pl330-broken-no-flushp;
+		arm,pl330-periph-burst;
+		clocks = <&cru ACLK_DMAC1>;
+		clock-names = "apb_pclk";
  		status = "disabled";
  	};
 
@@ -490,9 +678,7 @@
  		#pwm-cells = <3>;
  		pinctrl-names = "default";
  		pinctrl-0 = <&pwm0_pin>;
-		clocks = <&cru PCLK_PWM>;
-		clock-names = "pwm";
-		rockchip,grf = <&grf>;
+		clocks = <&cru PCLK_RKPWM>;
  		status = "disabled";
  	};
 
@@ -502,9 +688,7 @@
  		#pwm-cells = <3>;
  		pinctrl-names = "default";
  		pinctrl-0 = <&pwm1_pin>;
-		clocks = <&cru PCLK_PWM>;
-		clock-names = "pwm";
-		rockchip,grf = <&grf>;
+		clocks = <&cru PCLK_RKPWM>;
  		status = "disabled";
  	};
 
@@ -514,25 +698,21 @@
  		#pwm-cells = <3>;
  		pinctrl-names = "default";
  		pinctrl-0 = <&pwm2_pin>;
-		clocks = <&cru PCLK_PWM>;
-		clock-names = "pwm";
-		rockchip,grf = <&grf>;
+		clocks = <&cru PCLK_RKPWM>;
  		status = "disabled";
  	};
 
  	pwm3: pwm@ff680030 {
  		compatible = "rockchip,rk3288-pwm";
  		reg = <0xff680030 0x10>;
-		#pwm-cells = <2>;
+		#pwm-cells = <3>;
  		pinctrl-names = "default";
  		pinctrl-0 = <&pwm3_pin>;
-		clocks = <&cru PCLK_PWM>;
-		clock-names = "pwm";
-		rockchip,grf = <&grf>;
+		clocks = <&cru PCLK_RKPWM>;
  		status = "disabled";
  	};
 
-	bus_intmem: bus_intmem@ff700000 {
+	bus_intmem: sram@ff700000 {
  		compatible = "mmio-sram";
  		reg = <0xff700000 0x18000>;
  		#address-cells = <1>;
@@ -544,14 +724,134 @@
  		};
  	};
 
-	sram@ff720000 {
+	pmu_sram: sram@ff720000 {
  		compatible = "rockchip,rk3288-pmu-sram", "mmio-sram";
  		reg = <0xff720000 0x1000>;
  	};
 
  	pmu: power-management@ff730000 {
-		compatible = "rockchip,rk3288-pmu", "syscon";
+		compatible = "rockchip,rk3288-pmu", "syscon", "simple-mfd";
  		reg = <0xff730000 0x100>;
+
+		power: power-controller {
+			compatible = "rockchip,rk3288-power-controller";
+			#power-domain-cells = <1>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			assigned-clocks = <&cru SCLK_EDP_24M>;
+			assigned-clock-parents = <&xin24m>;
+
+			/*
+			 * Note: Although SCLK_* are the working clocks
+			 * of device without including on the NOC, needed for
+			 * synchronous reset.
+			 *
+			 * The clocks on the which NOC:
+			 * ACLK_IEP/ACLK_VIP/ACLK_VOP0 are on ACLK_VIO0_NIU.
+			 * ACLK_ISP/ACLK_VOP1 are on ACLK_VIO1_NIU.
+			 * ACLK_RGA is on ACLK_RGA_NIU.
+			 * The others (HCLK_*,PLCK_*) are on HCLK_VIO_NIU.
+			 *
+			 * Which clock are device clocks:
+			 *	clocks		devices
+			 *	*_IEP		IEP:Image Enhancement Processor
+			 *	*_ISP		ISP:Image Signal Processing
+			 *	*_VIP		VIP:Video Input Processor
+			 *	*_VOP*		VOP:Visual Output Processor
+			 *	*_RGA		RGA
+			 *	*_EDP*		EDP
+			 *	*_LVDS_*	LVDS
+			 *	*_HDMI		HDMI
+			 *	*_MIPI_*	MIPI
+			 */
+			power-domain@RK3288_PD_VIO {
+				reg = <RK3288_PD_VIO>;
+				clocks = <&cru ACLK_IEP>,
+					 <&cru ACLK_ISP>,
+					 <&cru ACLK_RGA>,
+					 <&cru ACLK_VIP>,
+					 <&cru ACLK_VOP0>,
+					 <&cru ACLK_VOP1>,
+					 <&cru DCLK_VOP0>,
+					 <&cru DCLK_VOP1>,
+					 <&cru HCLK_IEP>,
+					 <&cru HCLK_ISP>,
+					 <&cru HCLK_RGA>,
+					 <&cru HCLK_VIP>,
+					 <&cru HCLK_VOP0>,
+					 <&cru HCLK_VOP1>,
+					 <&cru PCLK_EDP_CTRL>,
+					 <&cru PCLK_HDMI_CTRL>,
+					 <&cru PCLK_LVDS_PHY>,
+					 <&cru PCLK_MIPI_CSI>,
+					 <&cru PCLK_MIPI_DSI0>,
+					 <&cru PCLK_MIPI_DSI1>,
+					 <&cru SCLK_EDP_24M>,
+					 <&cru SCLK_EDP>,
+					 <&cru SCLK_ISP_JPE>,
+					 <&cru SCLK_ISP>,
+					 <&cru SCLK_RGA>;
+				pm_qos = <&qos_vio0_iep>,
+					 <&qos_vio1_vop>,
+					 <&qos_vio1_isp_w0>,
+					 <&qos_vio1_isp_w1>,
+					 <&qos_vio0_vop>,
+					 <&qos_vio0_vip>,
+					 <&qos_vio2_rga_r>,
+					 <&qos_vio2_rga_w>,
+					 <&qos_vio1_isp_r>;
+				#power-domain-cells = <0>;
+			};
+
+			/*
+			 * Note: The following 3 are HEVC(H.265) clocks,
+			 * and on the ACLK_HEVC_NIU (NOC).
+			 */
+			power-domain@RK3288_PD_HEVC {
+				reg = <RK3288_PD_HEVC>;
+				clocks = <&cru ACLK_HEVC>,
+					 <&cru SCLK_HEVC_CABAC>,
+					 <&cru SCLK_HEVC_CORE>;
+				pm_qos = <&qos_hevc_r>,
+					 <&qos_hevc_w>;
+				#power-domain-cells = <0>;
+			};
+
+			/*
+			 * Note: ACLK_VCODEC/HCLK_VCODEC are VCODEC
+			 * (video endecoder & decoder) clocks that on the
+			 * ACLK_VCODEC_NIU and HCLK_VCODEC_NIU (NOC).
+			 */
+			power-domain@RK3288_PD_VIDEO {
+				reg = <RK3288_PD_VIDEO>;
+				clocks = <&cru ACLK_VCODEC>,
+					 <&cru HCLK_VCODEC>;
+				pm_qos = <&qos_video>;
+				#power-domain-cells = <0>;
+			};
+
+			/*
+			 * Note: ACLK_GPU is the GPU clock,
+			 * and on the ACLK_GPU_NIU (NOC).
+			 */
+			power-domain@RK3288_PD_GPU {
+				reg = <RK3288_PD_GPU>;
+				clocks = <&cru ACLK_GPU>;
+				pm_qos = <&qos_gpu_r>,
+					 <&qos_gpu_w>;
+				#power-domain-cells = <0>;
+			};
+		};
+
+		reboot-mode {
+			compatible = "syscon-reboot-mode";
+			offset = <0x94>;
+			mode-normal = <BOOT_NORMAL>;
+			mode-recovery = <BOOT_RECOVERY>;
+			mode-bootloader = <BOOT_FASTBOOT>;
+			mode-loader = <BOOT_BL_DOWNLOAD>;
+		};
  	};
 
  	sgrf: syscon@ff740000 {
@@ -578,15 +878,65 @@
  	};
 
  	grf: syscon@ff770000 {
-		compatible = "rockchip,rk3288-grf", "syscon";
+		compatible = "rockchip,rk3288-grf", "syscon", "simple-mfd";
  		reg = <0xff770000 0x1000>;
+
+		edp_phy: edp-phy {
+			compatible = "rockchip,rk3288-dp-phy";
+			clocks = <&cru SCLK_EDP_24M>;
+			clock-names = "24m";
+			#phy-cells = <0>;
+			status = "disabled";
+		};
+
+		io_domains: io-domains {
+			compatible = "rockchip,rk3288-io-voltage-domain";
+			status = "disabled";
+		};
+
+		usbphy: usbphy {
+			compatible = "rockchip,rk3288-usb-phy";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+
+			usbphy0: usb-phy@320 {
+				#phy-cells = <0>;
+				reg = <0x320>;
+				clocks = <&cru SCLK_OTGPHY0>;
+				clock-names = "phyclk";
+				#clock-cells = <0>;
+				resets = <&cru SRST_USBOTG_PHY>;
+				reset-names = "phy-reset";
+			};
+
+			usbphy1: usb-phy@334 {
+				#phy-cells = <0>;
+				reg = <0x334>;
+				clocks = <&cru SCLK_OTGPHY1>;
+				clock-names = "phyclk";
+				#clock-cells = <0>;
+				resets = <&cru SRST_USBHOST0_PHY>;
+				reset-names = "phy-reset";
+			};
+
+			usbphy2: usb-phy@348 {
+				#phy-cells = <0>;
+				reg = <0x348>;
+				clocks = <&cru SCLK_OTGPHY2>;
+				clock-names = "phyclk";
+				#clock-cells = <0>;
+				resets = <&cru SRST_USBHOST1_PHY>;
+				reset-names = "phy-reset";
+			};
+		};
  	};
 
  	wdt: watchdog@ff800000 {
  		compatible = "rockchip,rk3288-wdt", "snps,dw-wdt";
  		reg = <0xff800000 0x100>;
  		clocks = <&cru PCLK_WDT>;
-		interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
+		interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
  		status = "disabled";
  	};
 
@@ -594,11 +944,11 @@
  		compatible = "rockchip,rk3288-spdif", "rockchip,rk3066-spdif";
  		reg = <0xff8b0000 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 85 IRQ_TYPE_LEVEL_HIGH>;
+		interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
  		pinctrl-names = "default";
  		pinctrl-0 = <&spdif_tx>;
  		rockchip,grf = <&grf>;
@@ -608,50 +958,97 @@
  	i2s: i2s@ff890000 {
  		compatible = "rockchip,rk3288-i2s", "rockchip,rk3066-i2s";
  		reg = <0xff890000 0x10000>;
-		interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
-		#address-cells = <1>;
-		#size-cells = <0>;
-		#sound-dai-cells = <1>;
+		#sound-dai-cells = <0>;
+		interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
+		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>;
+		rockchip,capture-channels = <2>;
+		status = "disabled";
+	};
+
+	crypto: cypto-controller@ff8a0000 {
+		compatible = "rockchip,rk3288-crypto";
+		reg = <0xff8a0000 0x4000>;
+		interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru ACLK_CRYPTO>, <&cru HCLK_CRYPTO>,
+			 <&cru SCLK_CRYPTO>, <&cru ACLK_DMAC1>;
+		clock-names = "aclk", "hclk", "sclk", "apb_pclk";
+		resets = <&cru SRST_CRYPTO>;
+		reset-names = "crypto-rst";
+	};
+
+	iep_mmu: iommu@ff900800 {
+		compatible = "rockchip,iommu";
+		reg = <0xff900800 0x40>;
+		interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>;
+		clock-names = "aclk", "iface";
+		#iommu-cells = <0>;
+		status = "disabled";
+	};
+
+	isp_mmu: iommu@ff914000 {
+		compatible = "rockchip,iommu";
+		reg = <0xff914000 0x100>, <0xff915000 0x100>;
+		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru ACLK_ISP>, <&cru HCLK_ISP>;
+		clock-names = "aclk", "iface";
+		#iommu-cells = <0>;
+		rockchip,disable-mmu-reset;
  		status = "disabled";
  	};
 
+	rga: rga@ff920000 {
+		compatible = "rockchip,rk3288-rga";
+		reg = <0xff920000 0x180>;
+		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru SCLK_RGA>;
+		clock-names = "aclk", "hclk", "sclk";
+		power-domains = <&power RK3288_PD_VIO>;
+		resets = <&cru SRST_RGA_CORE>, <&cru SRST_RGA_AXI>, <&cru SRST_RGA_AHB>;
+		reset-names = "core", "axi", "ahb";
+	};
+
  	vopb: vop@ff930000 {
  		compatible = "rockchip,rk3288-vop";
-		reg = <0xff930000 0x19c>;
+		reg = <0xff930000 0x19c>, <0xff931000 0x1000>;
  		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&cru ACLK_VOP0>, <&cru DCLK_VOP0>, <&cru HCLK_VOP0>;
  		clock-names = "aclk_vop", "dclk_vop", "hclk_vop";
+		power-domains = <&power RK3288_PD_VIO>;
  		resets = <&cru SRST_LCDC0_AXI>, <&cru SRST_LCDC0_AHB>, <&cru SRST_LCDC0_DCLK>;
  		reset-names = "axi", "ahb", "dclk";
  		iommus = <&vopb_mmu>;
-		power-domains = <&power RK3288_PD_VIO>;
  		status = "disabled";
+
  		vopb_out: port {
  			#address-cells = <1>;
  			#size-cells = <0>;
-			vopb_out_edp: endpoint@0 {
+
+			vopb_out_hdmi: endpoint@0 {
  				reg = <0>;
-				remote-endpoint = <&edp_in_vopb>;
+				remote-endpoint = <&hdmi_in_vopb>;
  			};
-			vopb_out_hdmi: endpoint@1 {
+
+			vopb_out_edp: endpoint@1 {
  				reg = <1>;
-				remote-endpoint = <&hdmi_in_vopb>;
+				remote-endpoint = <&edp_in_vopb>;
  			};
-			vopb_out_lvds: endpoint@2 {
+
+			vopb_out_mipi: endpoint@2 {
  				reg = <2>;
-				remote-endpoint = <&lvds_in_vopb>;
-			};
-			vopb_out_mipi: endpoint@3 {
-				reg = <3>;
  				remote-endpoint = <&mipi_in_vopb>;
  			};
 
+			vopb_out_lvds: endpoint@3 {
+				reg = <3>;
+				remote-endpoint = <&lvds_in_vopb>;
+			};
  		};
  	};
 
@@ -659,7 +1056,8 @@
  		compatible = "rockchip,iommu";
  		reg = <0xff930300 0x100>;
  		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
-		interrupt-names = "vopb_mmu";
+		clocks = <&cru ACLK_VOP0>, <&cru HCLK_VOP0>;
+		clock-names = "aclk", "iface";
  		power-domains = <&power RK3288_PD_VIO>;
  		#iommu-cells = <0>;
  		status = "disabled";
@@ -667,35 +1065,39 @@
 
  	vopl: vop@ff940000 {
  		compatible = "rockchip,rk3288-vop";
-		reg = <0xff940000 0x19c>;
+		reg = <0xff940000 0x19c>, <0xff941000 0x1000>;
  		interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&cru ACLK_VOP1>, <&cru DCLK_VOP1>, <&cru HCLK_VOP1>;
  		clock-names = "aclk_vop", "dclk_vop", "hclk_vop";
+		power-domains = <&power RK3288_PD_VIO>;
  		resets = <&cru SRST_LCDC1_AXI>, <&cru SRST_LCDC1_AHB>, <&cru SRST_LCDC1_DCLK>;
  		reset-names = "axi", "ahb", "dclk";
  		iommus = <&vopl_mmu>;
-		power-domains = <&power RK3288_PD_VIO>;
  		status = "disabled";
+
  		vopl_out: port {
  			#address-cells = <1>;
  			#size-cells = <0>;
-			vopl_out_edp: endpoint@0 {
+
+			vopl_out_hdmi: endpoint@0 {
  				reg = <0>;
-				remote-endpoint = <&edp_in_vopl>;
+				remote-endpoint = <&hdmi_in_vopl>;
  			};
-			vopl_out_hdmi: endpoint@1 {
+
+			vopl_out_edp: endpoint@1 {
  				reg = <1>;
-				remote-endpoint = <&hdmi_in_vopl>;
+				remote-endpoint = <&edp_in_vopl>;
  			};
-			vopl_out_lvds: endpoint@2 {
+
+			vopl_out_mipi: endpoint@2 {
  				reg = <2>;
-				remote-endpoint = <&lvds_in_vopl>;
-			};
-			vopl_out_mipi: endpoint@3 {
-				reg = <3>;
  				remote-endpoint = <&mipi_in_vopl>;
  			};
 
+			vopl_out_lvds: endpoint@3 {
+				reg = <3>;
+				remote-endpoint = <&lvds_in_vopl>;
+			};
  		};
  	};
 
@@ -703,60 +1105,34 @@
  		compatible = "rockchip,iommu";
  		reg = <0xff940300 0x100>;
  		interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
-		interrupt-names = "vopl_mmu";
+		clocks = <&cru ACLK_VOP1>, <&cru HCLK_VOP1>;
+		clock-names = "aclk", "iface";
  		power-domains = <&power RK3288_PD_VIO>;
  		#iommu-cells = <0>;
  		status = "disabled";
  	};
 
-	edp: edp@ff970000 {
-		compatible = "rockchip,rk3288-edp";
-		reg = <0xff970000 0x4000>;
-		interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&cru SCLK_EDP>, <&cru SCLK_EDP_24M>, <&cru PCLK_EDP_CTRL>;
-		rockchip,grf = <&grf>;
-		clock-names = "clk_edp", "clk_edp_24m", "pclk_edp";
-		resets = <&cru 111>;
-		reset-names = "edp";
+	mipi_dsi: mipi@ff960000 {
+		compatible = "rockchip,rk3288-mipi-dsi", "snps,dw-mipi-dsi";
+		reg = <0xff960000 0x4000>;
+		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru SCLK_MIPIDSI_24M>, <&cru PCLK_MIPI_DSI0>;
+		clock-names = "ref", "pclk";
  		power-domains = <&power RK3288_PD_VIO>;
-		status = "disabled";
-		ports {
-			edp_in: port {
-				#address-cells = <1>;
-				#size-cells = <0>;
-				edp_in_vopb: endpoint@0 {
-					reg = <0>;
-					remote-endpoint = <&vopb_out_edp>;
-				};
-				edp_in_vopl: endpoint@1 {
-					reg = <1>;
-					remote-endpoint = <&vopl_out_edp>;
-				};
-			};
-		};
-	};
-
-	hdmi: hdmi@ff980000 {
-		compatible = "rockchip,rk3288-dw-hdmi";
-		reg = <0xff980000 0x20000>;
-		reg-io-width = <4>;
-		ddc-i2c-bus = <&i2c5>;
  		rockchip,grf = <&grf>;
-		interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&cru  PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>;
-		clock-names = "iahb", "isfr";
  		status = "disabled";
+
  		ports {
-			hdmi_in: port {
+			mipi_in: port {
  				#address-cells = <1>;
  				#size-cells = <0>;
-				hdmi_in_vopb: endpoint@0 {
+				mipi_in_vopb: endpoint@0 {
  					reg = <0>;
-					remote-endpoint = <&vopb_out_hdmi>;
+					remote-endpoint = <&vopb_out_mipi>;
  				};
-				hdmi_in_vopl: endpoint@1 {
+				mipi_in_vopl: endpoint@1 {
  					reg = <1>;
-					remote-endpoint = <&vopl_out_hdmi>;
+					remote-endpoint = <&vopl_out_mipi>;
  				};
  			};
  		};
@@ -767,17 +1143,22 @@
  		reg = <0xff96c000 0x4000>;
  		clocks = <&cru PCLK_LVDS_PHY>;
  		clock-names = "pclk_lvds";
-		pinctrl-names = "default";
-		pinctrl-0 = <&lcdc0_ctl>;
+		pinctrl-names = "lcdc";
+		pinctrl-0 = <&lcdc_ctl>;
+		power-domains = <&power RK3288_PD_VIO>;
  		rockchip,grf = <&grf>;
  		status = "disabled";
+
  		ports {
  			#address-cells = <1>;
  			#size-cells = <0>;
+
  			lvds_in: port@0 {
  				reg = <0>;
+
  				#address-cells = <1>;
  				#size-cells = <0>;
+
  				lvds_in_vopb: endpoint@0 {
  					reg = <0>;
  					remote-endpoint = <&vopb_out_lvds>;
@@ -790,90 +1171,233 @@
  		};
  	};
 
-	mipi_dsi0: mipi@ff960000 {
-		compatible = "rockchip,rk3288_mipi_dsi";
-		reg = <0xff960000 0x4000>;
-		clocks = <&cru PCLK_MIPI_DSI0>;
-		clock-names = "pclk_mipi";
-		/*pinctrl-names = "default";
-		pinctrl-0 = <&lcdc0_ctl>;*/
+	edp: dp@ff970000 {
+		compatible = "rockchip,rk3288-dp";
+		reg = <0xff970000 0x4000>;
+		interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru SCLK_EDP>, <&cru PCLK_EDP_CTRL>;
+		clock-names = "dp", "pclk";
+		phys = <&edp_phy>;
+		phy-names = "dp";
+		resets = <&cru SRST_EDP>;
+		reset-names = "dp";
  		rockchip,grf = <&grf>;
-		#address-cells = <1>;
-		#size-cells = <0>;
  		status = "disabled";
+
  		ports {
-			reg = <1>;
-			mipi_in: port {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			edp_in: port@0 {
+				reg = <0>;
  				#address-cells = <1>;
  				#size-cells = <0>;
-				mipi_in_vopb: endpoint@0 {
+				edp_in_vopb: endpoint@0 {
  					reg = <0>;
-					remote-endpoint = <&vopb_out_mipi>;
+					remote-endpoint = <&vopb_out_edp>;
  				};
-				mipi_in_vopl: endpoint@1 {
+				edp_in_vopl: endpoint@1 {
  					reg = <1>;
-					remote-endpoint = <&vopl_out_mipi>;
+					remote-endpoint = <&vopl_out_edp>;
  				};
  			};
  		};
  	};
 
-	hdmi_audio: hdmi_audio {
-		compatible = "rockchip,rk3288-hdmi-audio";
-		i2s-controller = <&i2s>;
-		status = "disable";
+	hdmi: hdmi@ff980000 {
+		compatible = "rockchip,rk3288-dw-hdmi";
+		reg = <0xff980000 0x20000>;
+		reg-io-width = <4>;
+		#sound-dai-cells = <0>;
+		rockchip,grf = <&grf>;
+		interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru  PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>, <&cru SCLK_HDMI_CEC>;
+		clock-names = "iahb", "isfr", "cec";
+		power-domains = <&power RK3288_PD_VIO>;
+		status = "disabled";
+
+		ports {
+			hdmi_in: port {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				hdmi_in_vopb: endpoint@0 {
+					reg = <0>;
+					remote-endpoint = <&vopb_out_hdmi>;
+				};
+				hdmi_in_vopl: endpoint@1 {
+					reg = <1>;
+					remote-endpoint = <&vopl_out_hdmi>;
+				};
+			};
+		};
  	};
 
  	vpu: video-codec@ff9a0000 {
  		compatible = "rockchip,rk3288-vpu";
  		reg = <0xff9a0000 0x800>;
  		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
-				<GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+			     <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
  		interrupt-names = "vepu", "vdpu";
  		clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
-		clock-names = "aclk_vcodec", "hclk_vcodec";
-		power-domains = <&power RK3288_PD_VIDEO>;
+		clock-names = "aclk", "hclk";
  		iommus = <&vpu_mmu>;
+		power-domains = <&power RK3288_PD_VIDEO>;
  	};
 
  	vpu_mmu: iommu@ff9a0800 {
  		compatible = "rockchip,iommu";
  		reg = <0xff9a0800 0x100>;
  		interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
-		interrupt-names = "vpu_mmu";
+		clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
+		clock-names = "aclk", "iface";
+		#iommu-cells = <0>;
  		power-domains = <&power RK3288_PD_VIDEO>;
+	};
+
+	hevc_mmu: iommu@ff9c0440 {
+		compatible = "rockchip,iommu";
+		reg = <0xff9c0440 0x40>, <0xff9c0480 0x40>;
+		interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru ACLK_HEVC>, <&cru HCLK_HEVC>;
+		clock-names = "aclk", "iface";
  		#iommu-cells = <0>;
+		status = "disabled";
  	};
 
  	gpu: gpu@ffa30000 {
-		compatible = "arm,malit764",
-			     "arm,malit76x",
-			     "arm,malit7xx",
-			     "arm,mali-midgard";
+		compatible = "rockchip,rk3288-mali", "arm,mali-t760";
  		reg = <0xffa30000 0x10000>;
  		interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
  			     <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
  			     <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
-		interrupt-names = "JOB", "MMU", "GPU";
+		interrupt-names = "job", "mmu", "gpu";
  		clocks = <&cru ACLK_GPU>;
-		clock-names = "aclk_gpu";
-		operating-points = <
-			/* KHz uV */
-			100000 950000
-			200000 950000
-			300000 1000000
-			400000 1100000
-			/* 500000 1200000 - See crosbug.com/p/33857 */
-			600000 1250000
-		>;
+		operating-points-v2 = <&gpu_opp_table>;
+		#cooling-cells = <2>; /* min followed by max */
  		power-domains = <&power RK3288_PD_GPU>;
  		status = "disabled";
  	};
 
+	gpu_opp_table: opp-table-1 {
+		compatible = "operating-points-v2";
+
+		opp-100000000 {
+			opp-hz = /bits/ 64 <100000000>;
+			opp-microvolt = <950000>;
+		};
+		opp-200000000 {
+			opp-hz = /bits/ 64 <200000000>;
+			opp-microvolt = <950000>;
+		};
+		opp-300000000 {
+			opp-hz = /bits/ 64 <300000000>;
+			opp-microvolt = <1000000>;
+		};
+		opp-400000000 {
+			opp-hz = /bits/ 64 <400000000>;
+			opp-microvolt = <1100000>;
+		};
+		opp-600000000 {
+			opp-hz = /bits/ 64 <600000000>;
+			opp-microvolt = <1250000>;
+		};
+	};
+
+	qos_gpu_r: qos@ffaa0000 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffaa0000 0x20>;
+	};
+
+	qos_gpu_w: qos@ffaa0080 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffaa0080 0x20>;
+	};
+
+	qos_vio1_vop: qos@ffad0000 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffad0000 0x20>;
+	};
+
+	qos_vio1_isp_w0: qos@ffad0100 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffad0100 0x20>;
+	};
+
+	qos_vio1_isp_w1: qos@ffad0180 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffad0180 0x20>;
+	};
+
+	qos_vio0_vop: qos@ffad0400 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffad0400 0x20>;
+	};
+
+	qos_vio0_vip: qos@ffad0480 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffad0480 0x20>;
+	};
+
+	qos_vio0_iep: qos@ffad0500 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffad0500 0x20>;
+	};
+
+	qos_vio2_rga_r: qos@ffad0800 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffad0800 0x20>;
+	};
+
+	qos_vio2_rga_w: qos@ffad0880 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0x0 0xffad0880 0x0 0x20>;
+	};
+
+	qos_vio1_isp_r: qos@ffad0900 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffad0900 0x20>;
+	};
+
+	qos_video: qos@ffae0000 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffae0000 0x20>;
+	};
+
+	qos_hevc_r: qos@ffaf0000 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffaf0000 0x20>;
+	};
+
+	qos_hevc_w: qos@ffaf0080 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffaf0080 0x20>;
+	};
+
+	dmac_bus_s: dma-controller@ffb20000 {
+		compatible = "arm,pl330", "arm,primecell";
+		reg = <0xffb20000 0x4000>;
+		interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
+		#dma-cells = <1>;
+		arm,pl330-broken-no-flushp;
+		arm,pl330-periph-burst;
+		clocks = <&cru ACLK_DMAC1>;
+		clock-names = "apb_pclk";
+	};
+
  	efuse: efuse@ffb40000 {
  		compatible = "rockchip,rk3288-efuse";
-		reg = <0xffb40000 0x10000>;
-		status = "disabled";
+		reg = <0xffb40000 0x20>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		clocks = <&cru PCLK_EFUSE256>;
+		clock-names = "pclk_efuse";
+
+		cpu_id: cpu-id@7 {
+			reg = <0x07 0x10>;
+		};
+		cpu_leakage: cpu_leakage@17 {
+			reg = <0x17 0x1>;
+		};
  	};
 
  	gic: interrupt-controller@ffc01000 {
@@ -883,45 +1407,12 @@
  		#address-cells = <0>;
 
  		reg = <0xffc01000 0x1000>,
-		      <0xffc02000 0x1000>,
+		      <0xffc02000 0x2000>,
  		      <0xffc04000 0x2000>,
  		      <0xffc06000 0x2000>;
  		interrupts = <GIC_PPI 9 0xf04>;
  	};
 
-	cpuidle: cpuidle {
-		compatible = "rockchip,rk3288-cpuidle";
-	};
-
-	usbphy: phy {
-		compatible = "rockchip,rk3288-usb-phy";
-		rockchip,grf = <&grf>;
-		#address-cells = <1>;
-		#size-cells = <0>;
-		status = "disabled";
-
-		usbphy0: usb-phy0 {
-			#phy-cells = <0>;
-			reg = <0x320>;
-			clocks = <&cru SCLK_OTGPHY0>;
-			clock-names = "phyclk";
-		};
-
-		usbphy1: usb-phy1 {
-			#phy-cells = <0>;
-			reg = <0x334>;
-			clocks = <&cru SCLK_OTGPHY1>;
-			clock-names = "phyclk";
-		};
-
-		usbphy2: usb-phy2 {
-			#phy-cells = <0>;
-			reg = <0x348>;
-			clocks = <&cru SCLK_OTGPHY2>;
-			clock-names = "phyclk";
-		};
-	};
-
  	pinctrl: pinctrl {
  		compatible = "rockchip,rk3288-pinctrl";
  		rockchip,grf = <&grf>;
@@ -930,9 +1421,9 @@
  		#size-cells = <1>;
  		ranges;
 
-		gpio0: gpio0@ff750000 {
+		gpio0: gpio@ff750000 {
  			compatible = "rockchip,gpio-bank";
-			reg =	<0xff750000 0x100>;
+			reg = <0xff750000 0x100>;
  			interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
  			clocks = <&cru PCLK_GPIO0>;
 
@@ -943,7 +1434,7 @@
  			#interrupt-cells = <2>;
  		};
 
-		gpio1: gpio1@ff780000 {
+		gpio1: gpio@ff780000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0xff780000 0x100>;
  			interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
@@ -956,7 +1447,7 @@
  			#interrupt-cells = <2>;
  		};
 
-		gpio2: gpio2@ff790000 {
+		gpio2: gpio@ff790000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0xff790000 0x100>;
  			interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
@@ -969,7 +1460,7 @@
  			#interrupt-cells = <2>;
  		};
 
-		gpio3: gpio3@ff7a0000 {
+		gpio3: gpio@ff7a0000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0xff7a0000 0x100>;
  			interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
@@ -982,7 +1473,7 @@
  			#interrupt-cells = <2>;
  		};
 
-		gpio4: gpio4@ff7b0000 {
+		gpio4: gpio@ff7b0000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0xff7b0000 0x100>;
  			interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
@@ -995,7 +1486,7 @@
  			#interrupt-cells = <2>;
  		};
 
-		gpio5: gpio5@ff7c0000 {
+		gpio5: gpio@ff7c0000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0xff7c0000 0x100>;
  			interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
@@ -1008,7 +1499,7 @@
  			#interrupt-cells = <2>;
  		};
 
-		gpio6: gpio6@ff7d0000 {
+		gpio6: gpio@ff7d0000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0xff7d0000 0x100>;
  			interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
@@ -1021,7 +1512,7 @@
  			#interrupt-cells = <2>;
  		};
 
-		gpio7: gpio7@ff7e0000 {
+		gpio7: gpio@ff7e0000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0xff7e0000 0x100>;
  			interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
@@ -1034,7 +1525,7 @@
  			#interrupt-cells = <2>;
  		};
 
-		gpio8: gpio8@ff7f0000 {
+		gpio8: gpio@ff7f0000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0xff7f0000 0x100>;
  			interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
@@ -1051,6 +1542,24 @@
  			hdmi_cec_c0: hdmi-cec-c0 {
  				rockchip,pins = <7 RK_PC0 2 &pcfg_pull_none>;
  			};
+
+			hdmi_cec_c7: hdmi-cec-c7 {
+				rockchip,pins = <7 RK_PC7 4 &pcfg_pull_none>;
+			};
+
+			hdmi_ddc: hdmi-ddc {
+				rockchip,pins = <7 RK_PC3 2 &pcfg_pull_none>,
+						<7 RK_PC4 2 &pcfg_pull_none>;
+			};
+
+			hdmi_ddc_unwedge: hdmi-ddc-unwedge {
+				rockchip,pins = <7 RK_PC3 RK_FUNC_GPIO &pcfg_output_low>,
+						<7 RK_PC4 2 &pcfg_pull_none>;
+			};
+		};
+
+		pcfg_output_low: pcfg-output-low {
+			output-low;
  		};
 
  		pcfg_pull_up: pcfg-pull-up {
@@ -1070,472 +1579,424 @@
  			drive-strength = <12>;
  		};
 
-		sleep {
+		suspend {
  			global_pwroff: global-pwroff {
-				rockchip,pins = <0 0 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PA0 1 &pcfg_pull_none>;
  			};
 
  			ddrio_pwroff: ddrio-pwroff {
-				rockchip,pins = <0 1 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PA1 1 &pcfg_pull_none>;
  			};
 
  			ddr0_retention: ddr0-retention {
-				rockchip,pins = <0 2 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <0 RK_PA2 1 &pcfg_pull_up>;
  			};
 
  			ddr1_retention: ddr1-retention {
-				rockchip,pins = <0 3 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <0 RK_PA3 1 &pcfg_pull_up>;
+			};
+		};
+
+		edp {
+			edp_hpd: edp-hpd {
+				rockchip,pins = <7 RK_PB3 2 &pcfg_pull_down>;
  			};
  		};
 
  		i2c0 {
  			i2c0_xfer: i2c0-xfer {
-				rockchip,pins = <0 15 RK_FUNC_1 &pcfg_pull_none>,
-						<0 16 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PB7 1 &pcfg_pull_none>,
+						<0 RK_PC0 1 &pcfg_pull_none>;
  			};
  		};
 
  		i2c1 {
  			i2c1_xfer: i2c1-xfer {
-				rockchip,pins = <8 4 RK_FUNC_1 &pcfg_pull_none>,
-						<8 5 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <8 RK_PA4 1 &pcfg_pull_none>,
+						<8 RK_PA5 1 &pcfg_pull_none>;
  			};
  		};
 
  		i2c2 {
  			i2c2_xfer: i2c2-xfer {
-				rockchip,pins = <6 9 RK_FUNC_1 &pcfg_pull_none>,
-						<6 10 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <6 RK_PB1 1 &pcfg_pull_none>,
+						<6 RK_PB2 1 &pcfg_pull_none>;
  			};
  		};
 
  		i2c3 {
  			i2c3_xfer: i2c3-xfer {
-				rockchip,pins = <2 16 RK_FUNC_1 &pcfg_pull_none>,
-						<2 17 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <2 RK_PC0 1 &pcfg_pull_none>,
+						<2 RK_PC1 1 &pcfg_pull_none>;
  			};
  		};
 
  		i2c4 {
  			i2c4_xfer: i2c4-xfer {
-				rockchip,pins = <7 17 RK_FUNC_1 &pcfg_pull_none>,
-						<7 18 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <7 RK_PC1 1 &pcfg_pull_none>,
+						<7 RK_PC2 1 &pcfg_pull_none>;
  			};
  		};
 
  		i2c5 {
  			i2c5_xfer: i2c5-xfer {
-				rockchip,pins = <7 19 RK_FUNC_1 &pcfg_pull_none>,
-						<7 20 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <7 RK_PC3 1 &pcfg_pull_none>,
+						<7 RK_PC4 1 &pcfg_pull_none>;
  			};
  		};
 
  		i2s0 {
  			i2s0_bus: i2s0-bus {
-				rockchip,pins = <6 0 RK_FUNC_1 &pcfg_pull_none>,
-						<6 1 RK_FUNC_1 &pcfg_pull_none>,
-						<6 2 RK_FUNC_1 &pcfg_pull_none>,
-						<6 3 RK_FUNC_1 &pcfg_pull_none>,
-						<6 4 RK_FUNC_1 &pcfg_pull_none>,
-						<6 8 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <6 RK_PA0 1 &pcfg_pull_none>,
+						<6 RK_PA1 1 &pcfg_pull_none>,
+						<6 RK_PA2 1 &pcfg_pull_none>,
+						<6 RK_PA3 1 &pcfg_pull_none>,
+						<6 RK_PA4 1 &pcfg_pull_none>,
+						<6 RK_PB0 1 &pcfg_pull_none>;
  			};
  		};
 
-		lcdc0 {
-			lcdc0_ctl: lcdc0-ctl {
-				rockchip,pins = <1 24 RK_FUNC_1 &pcfg_pull_none>,
-						<1 25 RK_FUNC_1 &pcfg_pull_none>,
-						<1 26 RK_FUNC_1 &pcfg_pull_none>,
-						<1 27 RK_FUNC_1 &pcfg_pull_none>;
+		lcdc {
+			lcdc_ctl: lcdc-ctl {
+				rockchip,pins = <1 RK_PD0 1 &pcfg_pull_none>,
+						<1 RK_PD1 1 &pcfg_pull_none>,
+						<1 RK_PD2 1 &pcfg_pull_none>,
+						<1 RK_PD3 1 &pcfg_pull_none>;
  			};
  		};
 
  		sdmmc {
  			sdmmc_clk: sdmmc-clk {
-				rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <6 RK_PC4 1 &pcfg_pull_none>;
  			};
 
  			sdmmc_cmd: sdmmc-cmd {
-				rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <6 RK_PC5 1 &pcfg_pull_up>;
  			};
 
-			sdmmc_cd: sdmcc-cd {
-				rockchip,pins = <6 22 RK_FUNC_1 &pcfg_pull_up>;
+			sdmmc_cd: sdmmc-cd {
+				rockchip,pins = <6 RK_PC6 1 &pcfg_pull_up>;
  			};
 
  			sdmmc_bus1: sdmmc-bus1 {
-				rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <6 RK_PC0 1 &pcfg_pull_up>;
  			};
 
  			sdmmc_bus4: sdmmc-bus4 {
-				rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up>,
-						<6 17 RK_FUNC_1 &pcfg_pull_up>,
-						<6 18 RK_FUNC_1 &pcfg_pull_up>,
-						<6 19 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <6 RK_PC0 1 &pcfg_pull_up>,
+						<6 RK_PC1 1 &pcfg_pull_up>,
+						<6 RK_PC2 1 &pcfg_pull_up>,
+						<6 RK_PC3 1 &pcfg_pull_up>;
  			};
  		};
 
  		sdio0 {
  			sdio0_bus1: sdio0-bus1 {
-				rockchip,pins = <4 20 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <4 RK_PC4 1 &pcfg_pull_up>;
  			};
 
  			sdio0_bus4: sdio0-bus4 {
-				rockchip,pins = <4 20 RK_FUNC_1 &pcfg_pull_up>,
-						<4 21 RK_FUNC_1 &pcfg_pull_up>,
-						<4 22 RK_FUNC_1 &pcfg_pull_up>,
-						<4 23 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <4 RK_PC4 1 &pcfg_pull_up>,
+						<4 RK_PC5 1 &pcfg_pull_up>,
+						<4 RK_PC6 1 &pcfg_pull_up>,
+						<4 RK_PC7 1 &pcfg_pull_up>;
  			};
 
  			sdio0_cmd: sdio0-cmd {
-				rockchip,pins = <4 24 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <4 RK_PD0 1 &pcfg_pull_up>;
  			};
 
  			sdio0_clk: sdio0-clk {
-				rockchip,pins = <4 25 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <4 RK_PD1 1 &pcfg_pull_none>;
  			};
 
  			sdio0_cd: sdio0-cd {
-				rockchip,pins = <4 26 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <4 RK_PD2 1 &pcfg_pull_up>;
  			};
 
  			sdio0_wp: sdio0-wp {
-				rockchip,pins = <4 27 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <4 RK_PD3 1 &pcfg_pull_up>;
  			};
 
  			sdio0_pwr: sdio0-pwr {
-				rockchip,pins = <4 28 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <4 RK_PD4 1 &pcfg_pull_up>;
  			};
 
  			sdio0_bkpwr: sdio0-bkpwr {
-				rockchip,pins = <4 29 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <4 RK_PD5 1 &pcfg_pull_up>;
  			};
 
  			sdio0_int: sdio0-int {
-				rockchip,pins = <4 30 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <4 RK_PD6 1 &pcfg_pull_up>;
  			};
  		};
 
  		sdio1 {
  			sdio1_bus1: sdio1-bus1 {
-				rockchip,pins = <3 24 RK_FUNC_4 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PD0 4 &pcfg_pull_up>;
  			};
 
  			sdio1_bus4: sdio1-bus4 {
-				rockchip,pins = <3 24 RK_FUNC_4 &pcfg_pull_up>,
-						<3 25 RK_FUNC_4 &pcfg_pull_up>,
-						<3 26 RK_FUNC_4 &pcfg_pull_up>,
-						<3 27 RK_FUNC_4 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PD0 4 &pcfg_pull_up>,
+						<3 RK_PD1 4 &pcfg_pull_up>,
+						<3 RK_PD2 4 &pcfg_pull_up>,
+						<3 RK_PD3 4 &pcfg_pull_up>;
  			};
 
  			sdio1_cd: sdio1-cd {
-				rockchip,pins = <3 28 RK_FUNC_4 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PD4 4 &pcfg_pull_up>;
  			};
 
  			sdio1_wp: sdio1-wp {
-				rockchip,pins = <3 29 RK_FUNC_4 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PD5 4 &pcfg_pull_up>;
  			};
 
  			sdio1_bkpwr: sdio1-bkpwr {
-				rockchip,pins = <3 30 RK_FUNC_4 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PD6 4 &pcfg_pull_up>;
  			};
 
  			sdio1_int: sdio1-int {
-				rockchip,pins = <3 31 RK_FUNC_4 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PD7 4 &pcfg_pull_up>;
  			};
 
  			sdio1_cmd: sdio1-cmd {
-				rockchip,pins = <4 6 RK_FUNC_4 &pcfg_pull_up>;
+				rockchip,pins = <4 RK_PA6 4 &pcfg_pull_up>;
  			};
 
  			sdio1_clk: sdio1-clk {
-				rockchip,pins = <4 7 RK_FUNC_4 &pcfg_pull_none>;
+				rockchip,pins = <4 RK_PA7 4 &pcfg_pull_none>;
  			};
 
  			sdio1_pwr: sdio1-pwr {
-				rockchip,pins = <4 9 RK_FUNC_4 &pcfg_pull_up>;
+				rockchip,pins = <4 RK_PB1 4 &pcfg_pull_up>;
  			};
  		};
 
  		emmc {
  			emmc_clk: emmc-clk {
-				rockchip,pins = <3 18 RK_FUNC_2 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PC2 2 &pcfg_pull_none>;
  			};
 
  			emmc_cmd: emmc-cmd {
-				rockchip,pins = <3 16 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PC0 2 &pcfg_pull_up>;
  			};
 
  			emmc_pwr: emmc-pwr {
-				rockchip,pins = <3 9 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PB1 2 &pcfg_pull_up>;
  			};
 
  			emmc_bus1: emmc-bus1 {
-				rockchip,pins = <3 0 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PA0 2 &pcfg_pull_up>;
  			};
 
  			emmc_bus4: emmc-bus4 {
-				rockchip,pins = <3 0 RK_FUNC_2 &pcfg_pull_up>,
-						<3 1 RK_FUNC_2 &pcfg_pull_up>,
-						<3 2 RK_FUNC_2 &pcfg_pull_up>,
-						<3 3 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PA0 2 &pcfg_pull_up>,
+						<3 RK_PA1 2 &pcfg_pull_up>,
+						<3 RK_PA2 2 &pcfg_pull_up>,
+						<3 RK_PA3 2 &pcfg_pull_up>;
  			};
 
  			emmc_bus8: emmc-bus8 {
-				rockchip,pins = <3 0 RK_FUNC_2 &pcfg_pull_up>,
-						<3 1 RK_FUNC_2 &pcfg_pull_up>,
-						<3 2 RK_FUNC_2 &pcfg_pull_up>,
-						<3 3 RK_FUNC_2 &pcfg_pull_up>,
-						<3 4 RK_FUNC_2 &pcfg_pull_up>,
-						<3 5 RK_FUNC_2 &pcfg_pull_up>,
-						<3 6 RK_FUNC_2 &pcfg_pull_up>,
-						<3 7 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PA0 2 &pcfg_pull_up>,
+						<3 RK_PA1 2 &pcfg_pull_up>,
+						<3 RK_PA2 2 &pcfg_pull_up>,
+						<3 RK_PA3 2 &pcfg_pull_up>,
+						<3 RK_PA4 2 &pcfg_pull_up>,
+						<3 RK_PA5 2 &pcfg_pull_up>,
+						<3 RK_PA6 2 &pcfg_pull_up>,
+						<3 RK_PA7 2 &pcfg_pull_up>;
  			};
  		};
 
  		spi0 {
  			spi0_clk: spi0-clk {
-				rockchip,pins = <5 12 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <5 RK_PB4 1 &pcfg_pull_up>;
  			};
  			spi0_cs0: spi0-cs0 {
-				rockchip,pins = <5 13 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <5 RK_PB5 1 &pcfg_pull_up>;
  			};
  			spi0_tx: spi0-tx {
-				rockchip,pins = <5 14 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <5 RK_PB6 1 &pcfg_pull_up>;
  			};
  			spi0_rx: spi0-rx {
-				rockchip,pins = <5 15 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <5 RK_PB7 1 &pcfg_pull_up>;
  			};
  			spi0_cs1: spi0-cs1 {
-				rockchip,pins = <5 16 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <5 RK_PC0 1 &pcfg_pull_up>;
  			};
  		};
  		spi1 {
  			spi1_clk: spi1-clk {
-				rockchip,pins = <7 12 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <7 RK_PB4 2 &pcfg_pull_up>;
  			};
  			spi1_cs0: spi1-cs0 {
-				rockchip,pins = <7 13 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <7 RK_PB5 2 &pcfg_pull_up>;
  			};
  			spi1_rx: spi1-rx {
-				rockchip,pins = <7 14 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <7 RK_PB6 2 &pcfg_pull_up>;
  			};
  			spi1_tx: spi1-tx {
-				rockchip,pins = <7 15 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <7 RK_PB7 2 &pcfg_pull_up>;
  			};
  		};
 
  		spi2 {
  			spi2_cs1: spi2-cs1 {
-				rockchip,pins = <8 3 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <8 RK_PA3 1 &pcfg_pull_up>;
  			};
  			spi2_clk: spi2-clk {
-				rockchip,pins = <8 6 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <8 RK_PA6 1 &pcfg_pull_up>;
  			};
  			spi2_cs0: spi2-cs0 {
-				rockchip,pins = <8 7 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <8 RK_PA7 1 &pcfg_pull_up>;
  			};
  			spi2_rx: spi2-rx {
-				rockchip,pins = <8 8 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <8 RK_PB0 1 &pcfg_pull_up>;
  			};
  			spi2_tx: spi2-tx {
-				rockchip,pins = <8 9 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <8 RK_PB1 1 &pcfg_pull_up>;
  			};
  		};
 
  		uart0 {
  			uart0_xfer: uart0-xfer {
-				rockchip,pins = <4 16 RK_FUNC_1 &pcfg_pull_up>,
-						<4 17 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <4 RK_PC0 1 &pcfg_pull_up>,
+						<4 RK_PC1 1 &pcfg_pull_none>;
  			};
 
  			uart0_cts: uart0-cts {
-				rockchip,pins = <4 18 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <4 RK_PC2 1 &pcfg_pull_up>;
  			};
 
  			uart0_rts: uart0-rts {
-				rockchip,pins = <4 19 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <4 RK_PC3 1 &pcfg_pull_none>;
  			};
  		};
 
  		uart1 {
  			uart1_xfer: uart1-xfer {
-				rockchip,pins = <5 8 RK_FUNC_1 &pcfg_pull_up>,
-						<5 9 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <5 RK_PB0 1 &pcfg_pull_up>,
+						<5 RK_PB1 1 &pcfg_pull_none>;
  			};
 
  			uart1_cts: uart1-cts {
-				rockchip,pins = <5 10 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <5 RK_PB2 1 &pcfg_pull_up>;
  			};
 
  			uart1_rts: uart1-rts {
-				rockchip,pins = <5 11 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <5 RK_PB3 1 &pcfg_pull_none>;
  			};
  		};
 
  		uart2 {
  			uart2_xfer: uart2-xfer {
-				rockchip,pins = <7 22 RK_FUNC_1 &pcfg_pull_up>,
-						<7 23 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <7 RK_PC6 1 &pcfg_pull_up>,
+						<7 RK_PC7 1 &pcfg_pull_none>;
  			};
  			/* no rts / cts for uart2 */
  		};
 
  		uart3 {
  			uart3_xfer: uart3-xfer {
-				rockchip,pins = <7 7 RK_FUNC_1 &pcfg_pull_up>,
-						<7 8 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <7 RK_PA7 1 &pcfg_pull_up>,
+						<7 RK_PB0 1 &pcfg_pull_none>;
  			};
 
  			uart3_cts: uart3-cts {
-				rockchip,pins = <7 9 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <7 RK_PB1 1 &pcfg_pull_up>;
  			};
 
  			uart3_rts: uart3-rts {
-				rockchip,pins = <7 10 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <7 RK_PB2 1 &pcfg_pull_none>;
  			};
  		};
 
  		uart4 {
  			uart4_xfer: uart4-xfer {
-				rockchip,pins = <5 12 3 &pcfg_pull_up>,
-						<5 13 3 &pcfg_pull_none>;
+				rockchip,pins = <5 RK_PB7 3 &pcfg_pull_up>,
+						<5 RK_PB6 3 &pcfg_pull_none>;
  			};
 
  			uart4_cts: uart4-cts {
-				rockchip,pins = <5 14 3 &pcfg_pull_none>;
+				rockchip,pins = <5 RK_PB4 3 &pcfg_pull_up>;
  			};
 
  			uart4_rts: uart4-rts {
-				rockchip,pins = <5 15 3 &pcfg_pull_none>;
+				rockchip,pins = <5 RK_PB5 3 &pcfg_pull_none>;
  			};
  		};
 
  		tsadc {
+			otp_pin: otp-pin {
+				rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
+			};
+
  			otp_out: otp-out {
-				rockchip,pins = <0 10 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PB2 1 &pcfg_pull_none>;
  			};
  		};
 
  		pwm0 {
  			pwm0_pin: pwm0-pin {
-				rockchip,pins = <7 0 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <7 RK_PA0 1 &pcfg_pull_none>;
  			};
  		};
 
  		pwm1 {
  			pwm1_pin: pwm1-pin {
-				rockchip,pins = <7 1 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <7 RK_PA1 1 &pcfg_pull_none>;
  			};
  		};
 
  		pwm2 {
  			pwm2_pin: pwm2-pin {
-				rockchip,pins = <7 22 RK_FUNC_3 &pcfg_pull_none>;
+				rockchip,pins = <7 RK_PC6 3 &pcfg_pull_none>;
  			};
  		};
 
  		pwm3 {
  			pwm3_pin: pwm3-pin {
-				rockchip,pins = <7 23 RK_FUNC_3 &pcfg_pull_none>;
+				rockchip,pins = <7 RK_PC7 3 &pcfg_pull_none>;
  			};
  		};
 
  		gmac {
  			rgmii_pins: rgmii-pins {
-				rockchip,pins = <3 30 3 &pcfg_pull_none>,
-						<3 31 3 &pcfg_pull_none>,
-						<3 26 3 &pcfg_pull_none>,
-						<3 27 3 &pcfg_pull_none>,
-						<3 28 3 &pcfg_pull_none_12ma>,
-						<3 29 3 &pcfg_pull_none_12ma>,
-						<3 24 3 &pcfg_pull_none_12ma>,
-						<3 25 3 &pcfg_pull_none_12ma>,
-						<4 0 3 &pcfg_pull_none>,
-						<4 5 3 &pcfg_pull_none>,
-						<4 6 3 &pcfg_pull_none>,
-						<4 9 3 &pcfg_pull_none_12ma>,
-						<4 4 3 &pcfg_pull_none_12ma>,
-						<4 1 3 &pcfg_pull_none>,
-						<4 3 3 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PD6 3 &pcfg_pull_none>,
+						<3 RK_PD7 3 &pcfg_pull_none>,
+						<3 RK_PD2 3 &pcfg_pull_none>,
+						<3 RK_PD3 3 &pcfg_pull_none>,
+						<3 RK_PD4 3 &pcfg_pull_none_12ma>,
+						<3 RK_PD5 3 &pcfg_pull_none_12ma>,
+						<3 RK_PD0 3 &pcfg_pull_none_12ma>,
+						<3 RK_PD1 3 &pcfg_pull_none_12ma>,
+						<4 RK_PA0 3 &pcfg_pull_none>,
+						<4 RK_PA5 3 &pcfg_pull_none>,
+						<4 RK_PA6 3 &pcfg_pull_none>,
+						<4 RK_PB1 3 &pcfg_pull_none_12ma>,
+						<4 RK_PA4 3 &pcfg_pull_none_12ma>,
+						<4 RK_PA1 3 &pcfg_pull_none>,
+						<4 RK_PA3 3 &pcfg_pull_none>;
  			};
 
  			rmii_pins: rmii-pins {
-				rockchip,pins = <3 30 3 &pcfg_pull_none>,
-						<3 31 3 &pcfg_pull_none>,
-						<3 28 3 &pcfg_pull_none>,
-						<3 29 3 &pcfg_pull_none>,
-						<4 0 3 &pcfg_pull_none>,
-						<4 5 3 &pcfg_pull_none>,
-						<4 4 3 &pcfg_pull_none>,
-						<4 1 3 &pcfg_pull_none>,
-						<4 2 3 &pcfg_pull_none>,
-						<4 3 3 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PD6 3 &pcfg_pull_none>,
+						<3 RK_PD7 3 &pcfg_pull_none>,
+						<3 RK_PD4 3 &pcfg_pull_none>,
+						<3 RK_PD5 3 &pcfg_pull_none>,
+						<4 RK_PA0 3 &pcfg_pull_none>,
+						<4 RK_PA5 3 &pcfg_pull_none>,
+						<4 RK_PA4 3 &pcfg_pull_none>,
+						<4 RK_PA1 3 &pcfg_pull_none>,
+						<4 RK_PA2 3 &pcfg_pull_none>,
+						<4 RK_PA3 3 &pcfg_pull_none>;
  			};
  		};
 
  		spdif {
  			spdif_tx: spdif-tx {
-				rockchip,pins = <RK_GPIO6 11 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <6 RK_PB3 1 &pcfg_pull_none>;
  			};
  		};
  	};
-
-	power: power-controller {
-		compatible = "rockchip,rk3288-power-controller";
-		#power-domain-cells = <1>;
-		rockchip,pmu = <&pmu>;
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		pd_gpu {
-			reg = <RK3288_PD_GPU>;
-			clocks = <&cru ACLK_GPU>;
-		};
-
-		pd_hevc {
-			reg = <RK3288_PD_HEVC>;
-			clocks = <&cru ACLK_HEVC>,
-				 <&cru SCLK_HEVC_CABAC>,
-				 <&cru SCLK_HEVC_CORE>,
-				 <&cru HCLK_HEVC>;
-		};
-
-		pd_vio {
-			reg = <RK3288_PD_VIO>;
-			clocks = <&cru ACLK_IEP>,
-				 <&cru ACLK_ISP>,
-				 <&cru ACLK_RGA>,
-				 <&cru ACLK_VIP>,
-				 <&cru ACLK_VOP0>,
-				 <&cru ACLK_VOP1>,
-				 <&cru DCLK_VOP0>,
-				 <&cru DCLK_VOP1>,
-				 <&cru HCLK_IEP>,
-				 <&cru HCLK_ISP>,
-				 <&cru HCLK_RGA>,
-				 <&cru HCLK_VIP>,
-				 <&cru HCLK_VOP0>,
-				 <&cru HCLK_VOP1>,
-				 <&cru PCLK_EDP_CTRL>,
-				 <&cru PCLK_HDMI_CTRL>,
-				 <&cru PCLK_LVDS_PHY>,
-				 <&cru PCLK_MIPI_CSI>,
-				 <&cru PCLK_MIPI_DSI0>,
-				 <&cru PCLK_MIPI_DSI1>,
-				 <&cru SCLK_EDP_24M>,
-				 <&cru SCLK_EDP>,
-				 <&cru SCLK_HDMI_CEC>,
-				 <&cru SCLK_HDMI_HDCP>,
-				 <&cru SCLK_ISP_JPE>,
-				 <&cru SCLK_ISP>,
-				 <&cru SCLK_RGA>;
-		};
-
-		pd_video {
-			reg = <RK3288_PD_VIDEO>;
-			clocks = <&cru ACLK_VCODEC>,
-				 <&cru HCLK_VCODEC>;
-		};
-	};
  };
#17 lore raw

Re: [PATCH v3 09/12] arm: dts: rockchip: sync rk3288.dtsi from Linux

In reply to Johan Jonker

Hi Johan,

    I got build fail for phycore-rk3288 after this patch:

+Error: SPL image is too large (size 0x8800 than 0x8000) +Error: Bad parameters for image type

Thanks,

- Kever

Quoted 2,522 lines · Johan Jonker

Sync rk3288.dtsi from Linux version 5.17.

---

Changed V3:
change reg size

Changed V2:
rename mipi_dsi0 label
move io_domains
remove hdmi_audio veyron node
change memory@0 reg size

---
  arch/arm/dts/rk3288-evb.dtsi         |    2 +-
  arch/arm/dts/rk3288-miqi.dtsi        |   28 +-
  arch/arm/dts/rk3288-phycore-som.dtsi |   30 +-
  arch/arm/dts/rk3288-popmetal.dtsi    |   30 +-
  arch/arm/dts/rk3288-thermal.dtsi     |   87 --
  arch/arm/dts/rk3288-veyron-jerry.dts |    6 -
  arch/arm/dts/rk3288-veyron.dtsi      |   33 +-
  arch/arm/dts/rk3288.dtsi             | 1367 +++++++++++++++++---------
  8 files changed, 970 insertions(+), 613 deletions(-)

delete mode 100644 arch/arm/dts/rk3288-thermal.dtsi

arch/arm/dts/rk3288-evb.dtsi +1 -1
index 04902c0b..72da8847 100644
@@ -448,7 +448,7 @@
  	status = "okay";
  };
 
-&mipi_dsi0 {
+&mipi_dsi {
  	status = "disabled";
  	rockchip,panel = <&panel>;
  	display-timings {
arch/arm/dts/rk3288-miqi.dtsi +13 -15
index cb80cbf2..b1c286c9 100644
@@ -18,21 +18,6 @@
  		clock-output-names = "ext_gmac";
  	};
 
-	io_domains: io-domains {
-		compatible = "rockchip,rk3288-io-voltage-domain";
-		rockchip,grf = <&grf>;
-
-		audio-supply = <&vcca_33>;
-		flash0-supply = <&vcc_flash>;
-		flash1-supply = <&vcc_lan>;
-		gpio30-supply = <&vcc_io>;
-		gpio1830-supply = <&vcc_io>;
-		lcdc-supply = <&vcc_io>;
-		sdcard-supply = <&vccio_sd>;
-		wifi-supply = <&vcc_18>;
-	};
-
-
  	leds {
  		compatible = "gpio-leds";
 
@@ -277,6 +262,19 @@
  	status = "okay";
  };
 
+&io_domains {
+	status = "okay";
+
+	audio-supply = <&vcca_33>;
+	flash0-supply = <&vcc_flash>;
+	flash1-supply = <&vcc_lan>;
+	gpio30-supply = <&vcc_io>;
+	gpio1830-supply = <&vcc_io>;
+	lcdc-supply = <&vcc_io>;
+	sdcard-supply = <&vccio_sd>;
+	wifi-supply = <&vcc_18>;
+};
+
  &pinctrl {
  	pcfg_output_high: pcfg-output-high {
  		output-high;
arch/arm/dts/rk3288-phycore-som.dtsi +14 -16
index 821525f7..8ac695c8 100644
@@ -71,22 +71,6 @@
  		clock-output-names = "ext_gmac";
  	};
 
-	io_domains: io_domains {
-		compatible = "rockchip,rk3288-io-voltage-domain";
-
-		status = "okay";
-		sdcard-supply = <&vdd_io_sd>;
-		flash0-supply = <&vdd_emmc_io>;
-		flash1-supply = <&vdd_misc_1v8>;
-		gpio1830-supply = <&vdd_3v3_io>;
-		gpio30-supply = <&vdd_3v3_io>;
-		bb-supply = <&vdd_3v3_io>;
-		dvp-supply = <&vdd_3v3_io>;
-		lcdc-supply = <&vdd_3v3_io>;
-		wifi-supply = <&vdd_3v3_io>;
-		audio-supply = <&vdd_3v3_io>;
-	};
-
  	leds: user-leds {
  		compatible = "gpio-leds";
  		pinctrl-names = "default";
@@ -197,6 +181,20 @@
  	ddc-i2c-bus = <&i2c5>;
  };
 
+&io_domains {
+	status = "okay";
+	sdcard-supply = <&vdd_io_sd>;
+	flash0-supply = <&vdd_emmc_io>;
+	flash1-supply = <&vdd_misc_1v8>;
+	gpio1830-supply = <&vdd_3v3_io>;
+	gpio30-supply = <&vdd_3v3_io>;
+	bb-supply = <&vdd_3v3_io>;
+	dvp-supply = <&vdd_3v3_io>;
+	lcdc-supply = <&vdd_3v3_io>;
+	wifi-supply = <&vdd_3v3_io>;
+	audio-supply = <&vdd_3v3_io>;
+};
+
  &i2c0 {
  	status = "okay";
  	clock-frequency = <400000>;
arch/arm/dts/rk3288-popmetal.dtsi +14 -16
index 63785eb5..bcd8fded 100644
@@ -69,22 +69,6 @@
  		};
  	};
 
-	io_domains: io-domains {
-		compatible = "rockchip,rk3288-io-voltage-domain";
-		rockchip,grf = <&grf>;
-
-		audio-supply = <&vcca_33>;
-		bb-supply = <&vcc_io>;
-		dvp-supply = <&vcc18_dvp>;
-		flash0-supply = <&vcc_flash>;
-		flash1-supply = <&vcc_lan>;
-		gpio30-supply = <&vcc_io>;
-		gpio1830-supply = <&vcc_io>;
-		lcdc-supply = <&vcc_io>;
-		sdcard-supply = <&vccio_sd>;
-		wifi-supply = <&vccio_wl>;
-	};
-
  	ir: ir-receiver {
  		compatible = "gpio-ir-receiver";
  		gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
@@ -441,6 +425,20 @@
  	status = "okay";
  };
 
+&io_domains {
+	status = "okay";
+	audio-supply = <&vcca_33>;
+	bb-supply = <&vcc_io>;
+	dvp-supply = <&vcc18_dvp>;
+	flash0-supply = <&vcc_flash>;
+	flash1-supply = <&vcc_lan>;
+	gpio30-supply = <&vcc_io>;
+	gpio1830-supply = <&vcc_io>;
+	lcdc-supply = <&vcc_io>;
+	sdcard-supply = <&vccio_sd>;
+	wifi-supply = <&vccio_wl>;
+};
+
  &pinctrl {
  	ak8963 {
  		comp_int: comp-int {
arch/arm/dts/rk3288-thermal.dtsi deleted +0 -87
deleted file mode 100644
index 87dd8142..00000000
@@ -1,87 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source for RK3288 SoC thermal
- *
- * Copyright (c) 2014, Fuzhou Rockchip Electronics Co., Ltd
- */
-
-#include <dt-bindings/thermal/thermal.h>
-
-reserve_thermal: reserve_thermal {
-	polling-delay-passive = <1000>; /* milliseconds */
-	polling-delay = <5000>; /* milliseconds */
-
-			/* sensor	ID */
-	thermal-sensors = <&tsadc	0>;
-
-};
-
-cpu_thermal: cpu_thermal {
-	polling-delay-passive = <100>; /* milliseconds */
-	polling-delay = <5000>; /* milliseconds */
-
-			/* sensor	ID */
-	thermal-sensors = <&tsadc	1>;
-	linux,hwmon;
-
-	trips {
-		cpu_alert0: cpu_alert0 {
-			temperature = <70000>; /* millicelsius */
-			hysteresis = <2000>; /* millicelsius */
-			type = "passive";
-		};
-		cpu_alert1: cpu_alert1 {
-			temperature = <75000>; /* millicelsius */
-			hysteresis = <2000>; /* millicelsius */
-			type = "passive";
-		};
-		cpu_crit: cpu_crit {
-			temperature = <100000>; /* millicelsius */
-			hysteresis = <2000>; /* millicelsius */
-			type = "critical";
-		};
-	};
-
-	cooling-maps {
-		map0 {
-			trip = <&cpu_alert0>;
-			cooling-device =
-				<&cpu0 THERMAL_NO_LIMIT 6>;
-		};
-		map1 {
-			trip = <&cpu_alert1>;
-			cooling-device =
-				<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-		};
-	};
-};
-
-gpu_thermal: gpu_thermal {
-	polling-delay-passive = <100>; /* milliseconds */
-	polling-delay = <5000>; /* milliseconds */
-
-			/* sensor	ID */
-	thermal-sensors = <&tsadc	2>;
-	linux,hwmon;
-
-	trips {
-		gpu_alert0: gpu_alert0 {
-			temperature = <80000>; /* millicelsius */
-			hysteresis = <2000>; /* millicelsius */
-			type = "passive";
-		};
-		gpu_crit: gpu_crit {
-			temperature = <100000>; /* millicelsius */
-			hysteresis = <2000>; /* millicelsius */
-			type = "critical";
-		};
-	};
-
-	cooling-maps {
-		map0 {
-			trip = <&gpu_alert0>;
-			cooling-device =
-				<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-		};
-	};
-};
arch/arm/dts/rk3288-veyron-jerry.dts +0 -6
index ff7669eb..40fee55c 100644
@@ -137,12 +137,6 @@
  		};
  	};
 
-	edp {
-		edp_hpd: edp_hpd {
-			rockchip,pins = <7 11 RK_FUNC_2 &pcfg_pull_down>;
-		};
-	};
-
  	emmc {
  		/* Make sure eMMC is not in reset */
  		emmc_deassert_reset: emmc-deassert-reset {
arch/arm/dts/rk3288-veyron.dtsi +14 -19
index 4a9c27a4..ac9e815e 100644
@@ -198,21 +198,6 @@
  		/* Faux input supply.  See bt_regulator description. */
  		vin-supply = <&bt_regulator>;
  	};
-
-	io-domains {
-		compatible = "rockchip,rk3288-io-voltage-domain";
-		rockchip,grf = <&grf>;
-
-		audio-supply = <&vcc18_codec>;
-		bb-supply = <&vcc33_io>;
-		dvp-supply = <&vcc_18>;
-		flash0-supply = <&vcc18_flashio>;
-		gpio1830-supply = <&vcc33_io>;
-		gpio30-supply = <&vcc33_io>;
-		lcdc-supply = <&vcc33_lcd>;
-		sdcard-supply = <&vccio_sd>;
-		wifi-supply = <&vcc18_wl>;
-	};
  };
 
  &cpu0 {
@@ -503,6 +488,20 @@
  	clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>, <&cru SCLK_I2S0_OUT>;
  };
 
+&io_domains {
+	status = "okay";
+
+	audio-supply = <&vcc18_codec>;
+	bb-supply = <&vcc33_io>;
+	dvp-supply = <&vcc_18>;
+	flash0-supply = <&vcc18_flashio>;
+	gpio1830-supply = <&vcc33_io>;
+	gpio30-supply = <&vcc33_io>;
+	lcdc-supply = <&vcc33_lcd>;
+	sdcard-supply = <&vccio_sd>;
+	wifi-supply = <&vcc18_wl>;
+};
+
  &wdt {
  	status = "okay";
  };
@@ -560,10 +559,6 @@
  	status = "okay";
  };
 
-&hdmi_audio {
-	status = "okay";
-};
-
  &gpu {
  	status = "okay";
  };
arch/arm/dts/rk3288.dtsi +914 -453
index c4abfa37..14a3f8e8 100644
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 
  #include <dt-bindings/gpio/gpio.h>
  #include <dt-bindings/interrupt-controller/irq.h>
@@ -7,14 +7,18 @@
  #include <dt-bindings/clock/rk3288-cru.h>
  #include <dt-bindings/power/rk3288-power.h>
  #include <dt-bindings/thermal/thermal.h>
-#include <dt-bindings/video/rk3288.h>
-#include "skeleton.dtsi"
+#include <dt-bindings/soc/rockchip,boot-mode.h>
 
  / {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
  	compatible = "rockchip,rk3288";
 
  	interrupt-parent = <&gic>;
+
  	aliases {
+		ethernet0 = &gmac;
  		i2c0 = &i2c0;
  		i2c1 = &i2c1;
  		i2c2 = &i2c2;
@@ -35,6 +39,15 @@
  		spi2 = &spi2;
  	};
 
+	arm-pmu {
+		compatible = "arm,cortex-a12-pmu";
+		interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
+	};
+
  	cpus {
  		#address-cells = <1>;
  		#size-cells = <0>;
@@ -45,85 +58,119 @@
  			device_type = "cpu";
  			compatible = "arm,cortex-a12";
  			reg = <0x500>;
-			operating-points = <
-				/* KHz    uV */
-				1800000 1400000
-				1704000 1350000
-				1608000 1300000
-				1512000 1250000
-				1416000 1200000
-				1200000 1100000
-				1008000 1050000
-				 816000 1000000
-				 696000  950000
-				 600000  900000
-				 408000  900000
-				 216000  900000
-				 126000  900000
-			>;
+			resets = <&cru SRST_CORE0>;
+			operating-points-v2 = <&cpu_opp_table>;
  			#cooling-cells = <2>; /* min followed by max */
  			clock-latency = <40000>;
  			clocks = <&cru ARMCLK>;
-			resets = <&cru SRST_CORE0>;
+			dynamic-power-coefficient = <370>;
  		};
-		cpu@501 {
+		cpu1: cpu@501 {
  			device_type = "cpu";
  			compatible = "arm,cortex-a12";
  			reg = <0x501>;
  			resets = <&cru SRST_CORE1>;
+			operating-points-v2 = <&cpu_opp_table>;
+			#cooling-cells = <2>; /* min followed by max */
+			clock-latency = <40000>;
+			clocks = <&cru ARMCLK>;
+			dynamic-power-coefficient = <370>;
  		};
-		cpu@502 {
+		cpu2: cpu@502 {
  			device_type = "cpu";
  			compatible = "arm,cortex-a12";
  			reg = <0x502>;
  			resets = <&cru SRST_CORE2>;
+			operating-points-v2 = <&cpu_opp_table>;
+			#cooling-cells = <2>; /* min followed by max */
+			clock-latency = <40000>;
+			clocks = <&cru ARMCLK>;
+			dynamic-power-coefficient = <370>;
  		};
-		cpu@503 {
+		cpu3: cpu@503 {
  			device_type = "cpu";
  			compatible = "arm,cortex-a12";
  			reg = <0x503>;
  			resets = <&cru SRST_CORE3>;
+			operating-points-v2 = <&cpu_opp_table>;
+			#cooling-cells = <2>; /* min followed by max */
+			clock-latency = <40000>;
+			clocks = <&cru ARMCLK>;
+			dynamic-power-coefficient = <370>;
  		};
  	};
 
-	amba {
-		compatible = "arm,amba-bus";
+	cpu_opp_table: opp-table-0 {
+		compatible = "operating-points-v2";
+		opp-shared;
+
+		opp-126000000 {
+			opp-hz = /bits/ 64 <126000000>;
+			opp-microvolt = <900000>;
+		};
+		opp-216000000 {
+			opp-hz = /bits/ 64 <216000000>;
+			opp-microvolt = <900000>;
+		};
+		opp-312000000 {
+			opp-hz = /bits/ 64 <312000000>;
+			opp-microvolt = <900000>;
+		};
+		opp-408000000 {
+			opp-hz = /bits/ 64 <408000000>;
+			opp-microvolt = <900000>;
+		};
+		opp-600000000 {
+			opp-hz = /bits/ 64 <600000000>;
+			opp-microvolt = <900000>;
+		};
+		opp-696000000 {
+			opp-hz = /bits/ 64 <696000000>;
+			opp-microvolt = <950000>;
+		};
+		opp-816000000 {
+			opp-hz = /bits/ 64 <816000000>;
+			opp-microvolt = <1000000>;
+		};
+		opp-1008000000 {
+			opp-hz = /bits/ 64 <1008000000>;
+			opp-microvolt = <1050000>;
+		};
+		opp-1200000000 {
+			opp-hz = /bits/ 64 <1200000000>;
+			opp-microvolt = <1100000>;
+		};
+		opp-1416000000 {
+			opp-hz = /bits/ 64 <1416000000>;
+			opp-microvolt = <1200000>;
+		};
+		opp-1512000000 {
+			opp-hz = /bits/ 64 <1512000000>;
+			opp-microvolt = <1300000>;
+		};
+		opp-1608000000 {
+			opp-hz = /bits/ 64 <1608000000>;
+			opp-microvolt = <1350000>;
+		};
+	};
+
+	reserved-memory {
  		#address-cells = <1>;
  		#size-cells = <1>;
  		ranges;
 
-		dmac_peri: dma-controller@ff250000 {
-			compatible = "arm,pl330", "arm,primecell";
-			broken-no-flushp;
-			reg = <0xff250000 0x4000>;
-			interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
-			#dma-cells = <1>;
-			clocks = <&cru ACLK_DMAC2>;
-			clock-names = "apb_pclk";
-		};
-
-		dmac_bus_ns: dma-controller@ff600000 {
-			compatible = "arm,pl330", "arm,primecell";
-			broken-no-flushp;
-			reg = <0xff600000 0x4000>;
-			interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
-			#dma-cells = <1>;
-			clocks = <&cru ACLK_DMAC1>;
-			clock-names = "apb_pclk";
-			status = "disabled";
-		};
-
-		dmac_bus_s: dma-controller@ffb20000 {
-			compatible = "arm,pl330", "arm,primecell";
-			broken-no-flushp;
-			reg = <0xffb20000 0x4000>;
-			interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
-			#dma-cells = <1>;
-			clocks = <&cru ACLK_DMAC1>;
-			clock-names = "apb_pclk";
+		/*
+		 * The rk3288 cannot use the memory area above 0xfe000000
+		 * for dma operations for some reason. While there is
+		 * probably a better solution available somewhere, we
+		 * haven't found it yet and while devices with 2GB of ram
+		 * are not affected, this issue prevents 4GB from booting.
+		 * So to make these devices at least bootable, block
+		 * this area for the time being until the real solution
+		 * is found.
+		 */
+		dma-unusable@fe000000 {
+			reg = <0xfe000000 0x1000000>;
  		};
  	};
 
@@ -135,14 +182,22 @@
  	};
 
  	timer {
-	        arm,use-physical-timer;
  		compatible = "arm,armv7-timer";
+		arm,cpu-registers-not-fw-configured;
  		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
  			     <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
  			     <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
  			     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
  		clock-frequency = <24000000>;
-		always-on;
+		arm,no-tick-in-suspend;
+	};
+
+	timer: timer@ff810000 {
+		compatible = "rockchip,rk3288-timer";
+		reg = <0xff810000 0x20>;
+		interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru PCLK_TIMER>, <&xin24m>;
+		clock-names = "pclk", "timer";
  	};
 
  	display-subsystem {
@@ -150,51 +205,59 @@
  		ports = <&vopl_out>, <&vopb_out>;
  	};
 
-	sdmmc: dwmmc@ff0c0000 {
+	sdmmc: mmc@ff0c0000 {
  		compatible = "rockchip,rk3288-dw-mshc";
  		max-frequency = <150000000>;
  		clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
  			 <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
-		clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
  		fifo-depth = <0x100>;
  		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
  		reg = <0xff0c0000 0x4000>;
+		resets = <&cru SRST_MMC0>;
+		reset-names = "reset";
  		status = "disabled";
  	};
 
-	sdio0: dwmmc@ff0d0000 {
+	sdio0: mmc@ff0d0000 {
  		compatible = "rockchip,rk3288-dw-mshc";
  		max-frequency = <150000000>;
  		clocks = <&cru HCLK_SDIO0>, <&cru SCLK_SDIO0>,
  			 <&cru SCLK_SDIO0_DRV>, <&cru SCLK_SDIO0_SAMPLE>;
-		clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
  		fifo-depth = <0x100>;
  		interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
  		reg = <0xff0d0000 0x4000>;
+		resets = <&cru SRST_SDIO0>;
+		reset-names = "reset";
  		status = "disabled";
  	};
 
-	sdio1: dwmmc@ff0e0000 {
+	sdio1: mmc@ff0e0000 {
  		compatible = "rockchip,rk3288-dw-mshc";
  		max-frequency = <150000000>;
  		clocks = <&cru HCLK_SDIO1>, <&cru SCLK_SDIO1>,
  			 <&cru SCLK_SDIO1_DRV>, <&cru SCLK_SDIO1_SAMPLE>;
-		clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
  		fifo-depth = <0x100>;
  		interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
  		reg = <0xff0e0000 0x4000>;
+		resets = <&cru SRST_SDIO1>;
+		reset-names = "reset";
  		status = "disabled";
  	};
 
-	emmc: dwmmc@ff0f0000 {
+	emmc: mmc@ff0f0000 {
  		compatible = "rockchip,rk3288-dw-mshc";
  		max-frequency = <150000000>;
  		clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
  			 <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
-		clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
  		fifo-depth = <0x100>;
  		interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
  		reg = <0xff0f0000 0x4000>;
+		resets = <&cru SRST_EMMC>;
+		reset-names = "reset";
  		status = "disabled";
  	};
 
@@ -205,6 +268,8 @@
  		#io-channel-cells = <1>;
  		clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>;
  		clock-names = "saradc", "apb_pclk";
+		resets = <&cru SRST_SARADC>;
+		reset-names = "saradc-apb";
  		status = "disabled";
  	};
 
@@ -304,6 +369,7 @@
  		pinctrl-0 = <&i2c5_xfer>;
  		status = "disabled";
  	};
+
  	uart0: serial@ff180000 {
  		compatible = "rockchip,rk3288-uart", "snps,dw-apb-uart";
  		reg = <0xff180000 0x100>;
@@ -312,6 +378,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";
@@ -325,6 +393,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";
@@ -342,6 +412,7 @@
  		pinctrl-0 = <&uart2_xfer>;
  		status = "disabled";
  	};
+
  	uart3: serial@ff1b0000 {
  		compatible = "rockchip,rk3288-uart", "snps,dw-apb-uart";
  		reg = <0xff1b0000 0x100>;
@@ -350,6 +421,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";
@@ -363,12 +436,104 @@
  		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";
  	};
-	thermal: thermal-zones {
-		#include "rk3288-thermal.dtsi"
+
+	dmac_peri: dma-controller@ff250000 {
+		compatible = "arm,pl330", "arm,primecell";
+		reg = <0xff250000 0x4000>;
+		interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
+		#dma-cells = <1>;
+		arm,pl330-broken-no-flushp;
+		arm,pl330-periph-burst;
+		clocks = <&cru ACLK_DMAC2>;
+		clock-names = "apb_pclk";
+	};
+
+	thermal-zones {
+		reserve_thermal: reserve-thermal {
+			polling-delay-passive = <1000>; /* milliseconds */
+			polling-delay = <5000>; /* milliseconds */
+
+			thermal-sensors = <&tsadc 0>;
+		};
+
+		cpu_thermal: cpu-thermal {
+			polling-delay-passive = <100>; /* milliseconds */
+			polling-delay = <5000>; /* milliseconds */
+
+			thermal-sensors = <&tsadc 1>;
+
+			trips {
+				cpu_alert0: cpu_alert0 {
+					temperature = <70000>; /* millicelsius */
+					hysteresis = <2000>; /* millicelsius */
+					type = "passive";
+				};
+				cpu_alert1: cpu_alert1 {
+					temperature = <75000>; /* millicelsius */
+					hysteresis = <2000>; /* millicelsius */
+					type = "passive";
+				};
+				cpu_crit: cpu_crit {
+					temperature = <90000>; /* millicelsius */
+					hysteresis = <2000>; /* millicelsius */
+					type = "critical";
+				};
+			};
+
+			cooling-maps {
+				map0 {
+					trip = <&cpu_alert0>;
+					cooling-device =
+						<&cpu0 THERMAL_NO_LIMIT 6>,
+						<&cpu1 THERMAL_NO_LIMIT 6>,
+						<&cpu2 THERMAL_NO_LIMIT 6>,
+						<&cpu3 THERMAL_NO_LIMIT 6>;
+				};
+				map1 {
+					trip = <&cpu_alert1>;
+					cooling-device =
+						<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+						<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+						<&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+						<&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+				};
+			};
+		};
+
+		gpu_thermal: gpu-thermal {
+			polling-delay-passive = <100>; /* milliseconds */
+			polling-delay = <5000>; /* milliseconds */
+
+			thermal-sensors = <&tsadc 2>;
+
+			trips {
+				gpu_alert0: gpu_alert0 {
+					temperature = <70000>; /* millicelsius */
+					hysteresis = <2000>; /* millicelsius */
+					type = "passive";
+				};
+				gpu_crit: gpu_crit {
+					temperature = <90000>; /* millicelsius */
+					hysteresis = <2000>; /* millicelsius */
+					type = "critical";
+				};
+			};
+
+			cooling-maps {
+				map0 {
+					trip = <&gpu_alert0>;
+					cooling-device =
+						<&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+				};
+			};
+		};
  	};
 
  	tsadc: tsadc@ff280000 {
@@ -379,18 +544,22 @@
  		clock-names = "tsadc", "apb_pclk";
  		resets = <&cru SRST_TSADC>;
  		reset-names = "tsadc-apb";
-		pinctrl-names = "otp_out";
-		pinctrl-0 = <&otp_out>;
+		pinctrl-names = "init", "default", "sleep";
+		pinctrl-0 = <&otp_pin>;
+		pinctrl-1 = <&otp_out>;
+		pinctrl-2 = <&otp_pin>;
  		#thermal-sensor-cells = <1>;
-		hw-shut-temp = <125000>;
+		rockchip,grf = <&grf>;
+		rockchip,hw-tshut-temp = <95000>;
  		status = "disabled";
  	};
 
  	gmac: ethernet@ff290000 {
  		compatible = "rockchip,rk3288-gmac";
  		reg = <0xff290000 0x10000>;
-		interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
-		interrupt-names = "macirq";
+		interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>,
+				<GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "macirq", "eth_wake_irq";
  		rockchip,grf = <&grf>;
  		clocks = <&cru SCLK_MAC>,
  			<&cru SCLK_MAC_RX>, <&cru SCLK_MAC_TX>,
@@ -400,6 +569,9 @@
  			"mac_clk_rx", "mac_clk_tx",
  			"clk_mac_ref", "clk_mac_refout",
  			"aclk_mac", "pclk_mac";
+		resets = <&cru SRST_MAC>;
+		reset-names = "stmmaceth";
+		status = "disabled";
  	};
 
  	usb_host0_ehci: usb@ff500000 {
@@ -407,16 +579,15 @@
  		reg = <0xff500000 0x100>;
  		interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&cru HCLK_USBHOST0>;
-		clock-names = "usbhost";
  		phys = <&usbphy1>;
  		phy-names = "usb";
  		status = "disabled";
  	};
 
-	/* NOTE: doesn't work on RK3288, but fixed on RK3288W */
+	/* NOTE: doesn't work on RK3288, but was fixed on RK3288W */
  	usb_host0_ohci: usb@ff520000 {
  		compatible = "generic-ohci";
-		reg = <0x0 0xff520000 0x0 0x100>;
+		reg = <0xff520000 0x100>;
  		interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&cru HCLK_USBHOST0>;
  		phys = <&usbphy1>;
@@ -431,8 +602,10 @@
  		interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&cru HCLK_USBHOST1>;
  		clock-names = "otg";
+		dr_mode = "host";
  		phys = <&usbphy2>;
  		phy-names = "usb2-phy";
+		snps,reset-phy-on-wake;
  		status = "disabled";
  	};
 
@@ -444,6 +617,9 @@
  		clocks = <&cru HCLK_OTG0>;
  		clock-names = "otg";
  		dr_mode = "otg";
+		g-np-tx-fifo-size = <16>;
+		g-rx-fifo-size = <275>;
+		g-tx-fifo-size = <256 128 128 64 64 32>;
  		phys = <&usbphy0>;
  		phy-names = "usb2-phy";
  		status = "disabled";
@@ -454,7 +630,19 @@
  		reg = <0xff5c0000 0x100>;
  		interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&cru HCLK_HSIC>;
-		clock-names = "usbhost";
+		status = "disabled";
+	};
+
+	dmac_bus_ns: dma-controller@ff600000 {
+		compatible = "arm,pl330", "arm,primecell";
+		reg = <0xff600000 0x4000>;
+		interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
+		#dma-cells = <1>;
+		arm,pl330-broken-no-flushp;
+		arm,pl330-periph-burst;
+		clocks = <&cru ACLK_DMAC1>;
+		clock-names = "apb_pclk";
  		status = "disabled";
  	};
 
@@ -490,9 +678,7 @@
  		#pwm-cells = <3>;
  		pinctrl-names = "default";
  		pinctrl-0 = <&pwm0_pin>;
-		clocks = <&cru PCLK_PWM>;
-		clock-names = "pwm";
-		rockchip,grf = <&grf>;
+		clocks = <&cru PCLK_RKPWM>;
  		status = "disabled";
  	};
 
@@ -502,9 +688,7 @@
  		#pwm-cells = <3>;
  		pinctrl-names = "default";
  		pinctrl-0 = <&pwm1_pin>;
-		clocks = <&cru PCLK_PWM>;
-		clock-names = "pwm";
-		rockchip,grf = <&grf>;
+		clocks = <&cru PCLK_RKPWM>;
  		status = "disabled";
  	};
 
@@ -514,25 +698,21 @@
  		#pwm-cells = <3>;
  		pinctrl-names = "default";
  		pinctrl-0 = <&pwm2_pin>;
-		clocks = <&cru PCLK_PWM>;
-		clock-names = "pwm";
-		rockchip,grf = <&grf>;
+		clocks = <&cru PCLK_RKPWM>;
  		status = "disabled";
  	};
 
  	pwm3: pwm@ff680030 {
  		compatible = "rockchip,rk3288-pwm";
  		reg = <0xff680030 0x10>;
-		#pwm-cells = <2>;
+		#pwm-cells = <3>;
  		pinctrl-names = "default";
  		pinctrl-0 = <&pwm3_pin>;
-		clocks = <&cru PCLK_PWM>;
-		clock-names = "pwm";
-		rockchip,grf = <&grf>;
+		clocks = <&cru PCLK_RKPWM>;
  		status = "disabled";
  	};
 
-	bus_intmem: bus_intmem@ff700000 {
+	bus_intmem: sram@ff700000 {
  		compatible = "mmio-sram";
  		reg = <0xff700000 0x18000>;
  		#address-cells = <1>;
@@ -544,14 +724,134 @@
  		};
  	};
 
-	sram@ff720000 {
+	pmu_sram: sram@ff720000 {
  		compatible = "rockchip,rk3288-pmu-sram", "mmio-sram";
  		reg = <0xff720000 0x1000>;
  	};
 
  	pmu: power-management@ff730000 {
-		compatible = "rockchip,rk3288-pmu", "syscon";
+		compatible = "rockchip,rk3288-pmu", "syscon", "simple-mfd";
  		reg = <0xff730000 0x100>;
+
+		power: power-controller {
+			compatible = "rockchip,rk3288-power-controller";
+			#power-domain-cells = <1>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			assigned-clocks = <&cru SCLK_EDP_24M>;
+			assigned-clock-parents = <&xin24m>;
+
+			/*
+			 * Note: Although SCLK_* are the working clocks
+			 * of device without including on the NOC, needed for
+			 * synchronous reset.
+			 *
+			 * The clocks on the which NOC:
+			 * ACLK_IEP/ACLK_VIP/ACLK_VOP0 are on ACLK_VIO0_NIU.
+			 * ACLK_ISP/ACLK_VOP1 are on ACLK_VIO1_NIU.
+			 * ACLK_RGA is on ACLK_RGA_NIU.
+			 * The others (HCLK_*,PLCK_*) are on HCLK_VIO_NIU.
+			 *
+			 * Which clock are device clocks:
+			 *	clocks		devices
+			 *	*_IEP		IEP:Image Enhancement Processor
+			 *	*_ISP		ISP:Image Signal Processing
+			 *	*_VIP		VIP:Video Input Processor
+			 *	*_VOP*		VOP:Visual Output Processor
+			 *	*_RGA		RGA
+			 *	*_EDP*		EDP
+			 *	*_LVDS_*	LVDS
+			 *	*_HDMI		HDMI
+			 *	*_MIPI_*	MIPI
+			 */
+			power-domain@RK3288_PD_VIO {
+				reg = <RK3288_PD_VIO>;
+				clocks = <&cru ACLK_IEP>,
+					 <&cru ACLK_ISP>,
+					 <&cru ACLK_RGA>,
+					 <&cru ACLK_VIP>,
+					 <&cru ACLK_VOP0>,
+					 <&cru ACLK_VOP1>,
+					 <&cru DCLK_VOP0>,
+					 <&cru DCLK_VOP1>,
+					 <&cru HCLK_IEP>,
+					 <&cru HCLK_ISP>,
+					 <&cru HCLK_RGA>,
+					 <&cru HCLK_VIP>,
+					 <&cru HCLK_VOP0>,
+					 <&cru HCLK_VOP1>,
+					 <&cru PCLK_EDP_CTRL>,
+					 <&cru PCLK_HDMI_CTRL>,
+					 <&cru PCLK_LVDS_PHY>,
+					 <&cru PCLK_MIPI_CSI>,
+					 <&cru PCLK_MIPI_DSI0>,
+					 <&cru PCLK_MIPI_DSI1>,
+					 <&cru SCLK_EDP_24M>,
+					 <&cru SCLK_EDP>,
+					 <&cru SCLK_ISP_JPE>,
+					 <&cru SCLK_ISP>,
+					 <&cru SCLK_RGA>;
+				pm_qos = <&qos_vio0_iep>,
+					 <&qos_vio1_vop>,
+					 <&qos_vio1_isp_w0>,
+					 <&qos_vio1_isp_w1>,
+					 <&qos_vio0_vop>,
+					 <&qos_vio0_vip>,
+					 <&qos_vio2_rga_r>,
+					 <&qos_vio2_rga_w>,
+					 <&qos_vio1_isp_r>;
+				#power-domain-cells = <0>;
+			};
+
+			/*
+			 * Note: The following 3 are HEVC(H.265) clocks,
+			 * and on the ACLK_HEVC_NIU (NOC).
+			 */
+			power-domain@RK3288_PD_HEVC {
+				reg = <RK3288_PD_HEVC>;
+				clocks = <&cru ACLK_HEVC>,
+					 <&cru SCLK_HEVC_CABAC>,
+					 <&cru SCLK_HEVC_CORE>;
+				pm_qos = <&qos_hevc_r>,
+					 <&qos_hevc_w>;
+				#power-domain-cells = <0>;
+			};
+
+			/*
+			 * Note: ACLK_VCODEC/HCLK_VCODEC are VCODEC
+			 * (video endecoder & decoder) clocks that on the
+			 * ACLK_VCODEC_NIU and HCLK_VCODEC_NIU (NOC).
+			 */
+			power-domain@RK3288_PD_VIDEO {
+				reg = <RK3288_PD_VIDEO>;
+				clocks = <&cru ACLK_VCODEC>,
+					 <&cru HCLK_VCODEC>;
+				pm_qos = <&qos_video>;
+				#power-domain-cells = <0>;
+			};
+
+			/*
+			 * Note: ACLK_GPU is the GPU clock,
+			 * and on the ACLK_GPU_NIU (NOC).
+			 */
+			power-domain@RK3288_PD_GPU {
+				reg = <RK3288_PD_GPU>;
+				clocks = <&cru ACLK_GPU>;
+				pm_qos = <&qos_gpu_r>,
+					 <&qos_gpu_w>;
+				#power-domain-cells = <0>;
+			};
+		};
+
+		reboot-mode {
+			compatible = "syscon-reboot-mode";
+			offset = <0x94>;
+			mode-normal = <BOOT_NORMAL>;
+			mode-recovery = <BOOT_RECOVERY>;
+			mode-bootloader = <BOOT_FASTBOOT>;
+			mode-loader = <BOOT_BL_DOWNLOAD>;
+		};
  	};
 
  	sgrf: syscon@ff740000 {
@@ -578,15 +878,65 @@
  	};
 
  	grf: syscon@ff770000 {
-		compatible = "rockchip,rk3288-grf", "syscon";
+		compatible = "rockchip,rk3288-grf", "syscon", "simple-mfd";
  		reg = <0xff770000 0x1000>;
+
+		edp_phy: edp-phy {
+			compatible = "rockchip,rk3288-dp-phy";
+			clocks = <&cru SCLK_EDP_24M>;
+			clock-names = "24m";
+			#phy-cells = <0>;
+			status = "disabled";
+		};
+
+		io_domains: io-domains {
+			compatible = "rockchip,rk3288-io-voltage-domain";
+			status = "disabled";
+		};
+
+		usbphy: usbphy {
+			compatible = "rockchip,rk3288-usb-phy";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+
+			usbphy0: usb-phy@320 {
+				#phy-cells = <0>;
+				reg = <0x320>;
+				clocks = <&cru SCLK_OTGPHY0>;
+				clock-names = "phyclk";
+				#clock-cells = <0>;
+				resets = <&cru SRST_USBOTG_PHY>;
+				reset-names = "phy-reset";
+			};
+
+			usbphy1: usb-phy@334 {
+				#phy-cells = <0>;
+				reg = <0x334>;
+				clocks = <&cru SCLK_OTGPHY1>;
+				clock-names = "phyclk";
+				#clock-cells = <0>;
+				resets = <&cru SRST_USBHOST0_PHY>;
+				reset-names = "phy-reset";
+			};
+
+			usbphy2: usb-phy@348 {
+				#phy-cells = <0>;
+				reg = <0x348>;
+				clocks = <&cru SCLK_OTGPHY2>;
+				clock-names = "phyclk";
+				#clock-cells = <0>;
+				resets = <&cru SRST_USBHOST1_PHY>;
+				reset-names = "phy-reset";
+			};
+		};
  	};
 
  	wdt: watchdog@ff800000 {
  		compatible = "rockchip,rk3288-wdt", "snps,dw-wdt";
  		reg = <0xff800000 0x100>;
  		clocks = <&cru PCLK_WDT>;
-		interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
+		interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
  		status = "disabled";
  	};
 
@@ -594,11 +944,11 @@
  		compatible = "rockchip,rk3288-spdif", "rockchip,rk3066-spdif";
  		reg = <0xff8b0000 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 85 IRQ_TYPE_LEVEL_HIGH>;
+		interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
  		pinctrl-names = "default";
  		pinctrl-0 = <&spdif_tx>;
  		rockchip,grf = <&grf>;
@@ -608,50 +958,97 @@
  	i2s: i2s@ff890000 {
  		compatible = "rockchip,rk3288-i2s", "rockchip,rk3066-i2s";
  		reg = <0xff890000 0x10000>;
-		interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
-		#address-cells = <1>;
-		#size-cells = <0>;
-		#sound-dai-cells = <1>;
+		#sound-dai-cells = <0>;
+		interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
+		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>;
+		rockchip,capture-channels = <2>;
+		status = "disabled";
+	};
+
+	crypto: cypto-controller@ff8a0000 {
+		compatible = "rockchip,rk3288-crypto";
+		reg = <0xff8a0000 0x4000>;
+		interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru ACLK_CRYPTO>, <&cru HCLK_CRYPTO>,
+			 <&cru SCLK_CRYPTO>, <&cru ACLK_DMAC1>;
+		clock-names = "aclk", "hclk", "sclk", "apb_pclk";
+		resets = <&cru SRST_CRYPTO>;
+		reset-names = "crypto-rst";
+	};
+
+	iep_mmu: iommu@ff900800 {
+		compatible = "rockchip,iommu";
+		reg = <0xff900800 0x40>;
+		interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>;
+		clock-names = "aclk", "iface";
+		#iommu-cells = <0>;
+		status = "disabled";
+	};
+
+	isp_mmu: iommu@ff914000 {
+		compatible = "rockchip,iommu";
+		reg = <0xff914000 0x100>, <0xff915000 0x100>;
+		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru ACLK_ISP>, <&cru HCLK_ISP>;
+		clock-names = "aclk", "iface";
+		#iommu-cells = <0>;
+		rockchip,disable-mmu-reset;
  		status = "disabled";
  	};
 
+	rga: rga@ff920000 {
+		compatible = "rockchip,rk3288-rga";
+		reg = <0xff920000 0x180>;
+		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru SCLK_RGA>;
+		clock-names = "aclk", "hclk", "sclk";
+		power-domains = <&power RK3288_PD_VIO>;
+		resets = <&cru SRST_RGA_CORE>, <&cru SRST_RGA_AXI>, <&cru SRST_RGA_AHB>;
+		reset-names = "core", "axi", "ahb";
+	};
+
  	vopb: vop@ff930000 {
  		compatible = "rockchip,rk3288-vop";
-		reg = <0xff930000 0x19c>;
+		reg = <0xff930000 0x19c>, <0xff931000 0x1000>;
  		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&cru ACLK_VOP0>, <&cru DCLK_VOP0>, <&cru HCLK_VOP0>;
  		clock-names = "aclk_vop", "dclk_vop", "hclk_vop";
+		power-domains = <&power RK3288_PD_VIO>;
  		resets = <&cru SRST_LCDC0_AXI>, <&cru SRST_LCDC0_AHB>, <&cru SRST_LCDC0_DCLK>;
  		reset-names = "axi", "ahb", "dclk";
  		iommus = <&vopb_mmu>;
-		power-domains = <&power RK3288_PD_VIO>;
  		status = "disabled";
+
  		vopb_out: port {
  			#address-cells = <1>;
  			#size-cells = <0>;
-			vopb_out_edp: endpoint@0 {
+
+			vopb_out_hdmi: endpoint@0 {
  				reg = <0>;
-				remote-endpoint = <&edp_in_vopb>;
+				remote-endpoint = <&hdmi_in_vopb>;
  			};
-			vopb_out_hdmi: endpoint@1 {
+
+			vopb_out_edp: endpoint@1 {
  				reg = <1>;
-				remote-endpoint = <&hdmi_in_vopb>;
+				remote-endpoint = <&edp_in_vopb>;
  			};
-			vopb_out_lvds: endpoint@2 {
+
+			vopb_out_mipi: endpoint@2 {
  				reg = <2>;
-				remote-endpoint = <&lvds_in_vopb>;
-			};
-			vopb_out_mipi: endpoint@3 {
-				reg = <3>;
  				remote-endpoint = <&mipi_in_vopb>;
  			};
 
+			vopb_out_lvds: endpoint@3 {
+				reg = <3>;
+				remote-endpoint = <&lvds_in_vopb>;
+			};
  		};
  	};
 
@@ -659,7 +1056,8 @@
  		compatible = "rockchip,iommu";
  		reg = <0xff930300 0x100>;
  		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
-		interrupt-names = "vopb_mmu";
+		clocks = <&cru ACLK_VOP0>, <&cru HCLK_VOP0>;
+		clock-names = "aclk", "iface";
  		power-domains = <&power RK3288_PD_VIO>;
  		#iommu-cells = <0>;
  		status = "disabled";
@@ -667,35 +1065,39 @@
 
  	vopl: vop@ff940000 {
  		compatible = "rockchip,rk3288-vop";
-		reg = <0xff940000 0x19c>;
+		reg = <0xff940000 0x19c>, <0xff941000 0x1000>;
  		interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&cru ACLK_VOP1>, <&cru DCLK_VOP1>, <&cru HCLK_VOP1>;
  		clock-names = "aclk_vop", "dclk_vop", "hclk_vop";
+		power-domains = <&power RK3288_PD_VIO>;
  		resets = <&cru SRST_LCDC1_AXI>, <&cru SRST_LCDC1_AHB>, <&cru SRST_LCDC1_DCLK>;
  		reset-names = "axi", "ahb", "dclk";
  		iommus = <&vopl_mmu>;
-		power-domains = <&power RK3288_PD_VIO>;
  		status = "disabled";
+
  		vopl_out: port {
  			#address-cells = <1>;
  			#size-cells = <0>;
-			vopl_out_edp: endpoint@0 {
+
+			vopl_out_hdmi: endpoint@0 {
  				reg = <0>;
-				remote-endpoint = <&edp_in_vopl>;
+				remote-endpoint = <&hdmi_in_vopl>;
  			};
-			vopl_out_hdmi: endpoint@1 {
+
+			vopl_out_edp: endpoint@1 {
  				reg = <1>;
-				remote-endpoint = <&hdmi_in_vopl>;
+				remote-endpoint = <&edp_in_vopl>;
  			};
-			vopl_out_lvds: endpoint@2 {
+
+			vopl_out_mipi: endpoint@2 {
  				reg = <2>;
-				remote-endpoint = <&lvds_in_vopl>;
-			};
-			vopl_out_mipi: endpoint@3 {
-				reg = <3>;
  				remote-endpoint = <&mipi_in_vopl>;
  			};
 
+			vopl_out_lvds: endpoint@3 {
+				reg = <3>;
+				remote-endpoint = <&lvds_in_vopl>;
+			};
  		};
  	};
 
@@ -703,60 +1105,34 @@
  		compatible = "rockchip,iommu";
  		reg = <0xff940300 0x100>;
  		interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
-		interrupt-names = "vopl_mmu";
+		clocks = <&cru ACLK_VOP1>, <&cru HCLK_VOP1>;
+		clock-names = "aclk", "iface";
  		power-domains = <&power RK3288_PD_VIO>;
  		#iommu-cells = <0>;
  		status = "disabled";
  	};
 
-	edp: edp@ff970000 {
-		compatible = "rockchip,rk3288-edp";
-		reg = <0xff970000 0x4000>;
-		interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&cru SCLK_EDP>, <&cru SCLK_EDP_24M>, <&cru PCLK_EDP_CTRL>;
-		rockchip,grf = <&grf>;
-		clock-names = "clk_edp", "clk_edp_24m", "pclk_edp";
-		resets = <&cru 111>;
-		reset-names = "edp";
+	mipi_dsi: mipi@ff960000 {
+		compatible = "rockchip,rk3288-mipi-dsi", "snps,dw-mipi-dsi";
+		reg = <0xff960000 0x4000>;
+		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru SCLK_MIPIDSI_24M>, <&cru PCLK_MIPI_DSI0>;
+		clock-names = "ref", "pclk";
  		power-domains = <&power RK3288_PD_VIO>;
-		status = "disabled";
-		ports {
-			edp_in: port {
-				#address-cells = <1>;
-				#size-cells = <0>;
-				edp_in_vopb: endpoint@0 {
-					reg = <0>;
-					remote-endpoint = <&vopb_out_edp>;
-				};
-				edp_in_vopl: endpoint@1 {
-					reg = <1>;
-					remote-endpoint = <&vopl_out_edp>;
-				};
-			};
-		};
-	};
-
-	hdmi: hdmi@ff980000 {
-		compatible = "rockchip,rk3288-dw-hdmi";
-		reg = <0xff980000 0x20000>;
-		reg-io-width = <4>;
-		ddc-i2c-bus = <&i2c5>;
  		rockchip,grf = <&grf>;
-		interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&cru  PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>;
-		clock-names = "iahb", "isfr";
  		status = "disabled";
+
  		ports {
-			hdmi_in: port {
+			mipi_in: port {
  				#address-cells = <1>;
  				#size-cells = <0>;
-				hdmi_in_vopb: endpoint@0 {
+				mipi_in_vopb: endpoint@0 {
  					reg = <0>;
-					remote-endpoint = <&vopb_out_hdmi>;
+					remote-endpoint = <&vopb_out_mipi>;
  				};
-				hdmi_in_vopl: endpoint@1 {
+				mipi_in_vopl: endpoint@1 {
  					reg = <1>;
-					remote-endpoint = <&vopl_out_hdmi>;
+					remote-endpoint = <&vopl_out_mipi>;
  				};
  			};
  		};
@@ -767,17 +1143,22 @@
  		reg = <0xff96c000 0x4000>;
  		clocks = <&cru PCLK_LVDS_PHY>;
  		clock-names = "pclk_lvds";
-		pinctrl-names = "default";
-		pinctrl-0 = <&lcdc0_ctl>;
+		pinctrl-names = "lcdc";
+		pinctrl-0 = <&lcdc_ctl>;
+		power-domains = <&power RK3288_PD_VIO>;
  		rockchip,grf = <&grf>;
  		status = "disabled";
+
  		ports {
  			#address-cells = <1>;
  			#size-cells = <0>;
+
  			lvds_in: port@0 {
  				reg = <0>;
+
  				#address-cells = <1>;
  				#size-cells = <0>;
+
  				lvds_in_vopb: endpoint@0 {
  					reg = <0>;
  					remote-endpoint = <&vopb_out_lvds>;
@@ -790,90 +1171,233 @@
  		};
  	};
 
-	mipi_dsi0: mipi@ff960000 {
-		compatible = "rockchip,rk3288_mipi_dsi";
-		reg = <0xff960000 0x4000>;
-		clocks = <&cru PCLK_MIPI_DSI0>;
-		clock-names = "pclk_mipi";
-		/*pinctrl-names = "default";
-		pinctrl-0 = <&lcdc0_ctl>;*/
+	edp: dp@ff970000 {
+		compatible = "rockchip,rk3288-dp";
+		reg = <0xff970000 0x4000>;
+		interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru SCLK_EDP>, <&cru PCLK_EDP_CTRL>;
+		clock-names = "dp", "pclk";
+		phys = <&edp_phy>;
+		phy-names = "dp";
+		resets = <&cru SRST_EDP>;
+		reset-names = "dp";
  		rockchip,grf = <&grf>;
-		#address-cells = <1>;
-		#size-cells = <0>;
  		status = "disabled";
+
  		ports {
-			reg = <1>;
-			mipi_in: port {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			edp_in: port@0 {
+				reg = <0>;
  				#address-cells = <1>;
  				#size-cells = <0>;
-				mipi_in_vopb: endpoint@0 {
+				edp_in_vopb: endpoint@0 {
  					reg = <0>;
-					remote-endpoint = <&vopb_out_mipi>;
+					remote-endpoint = <&vopb_out_edp>;
  				};
-				mipi_in_vopl: endpoint@1 {
+				edp_in_vopl: endpoint@1 {
  					reg = <1>;
-					remote-endpoint = <&vopl_out_mipi>;
+					remote-endpoint = <&vopl_out_edp>;
  				};
  			};
  		};
  	};
 
-	hdmi_audio: hdmi_audio {
-		compatible = "rockchip,rk3288-hdmi-audio";
-		i2s-controller = <&i2s>;
-		status = "disable";
+	hdmi: hdmi@ff980000 {
+		compatible = "rockchip,rk3288-dw-hdmi";
+		reg = <0xff980000 0x20000>;
+		reg-io-width = <4>;
+		#sound-dai-cells = <0>;
+		rockchip,grf = <&grf>;
+		interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru  PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>, <&cru SCLK_HDMI_CEC>;
+		clock-names = "iahb", "isfr", "cec";
+		power-domains = <&power RK3288_PD_VIO>;
+		status = "disabled";
+
+		ports {
+			hdmi_in: port {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				hdmi_in_vopb: endpoint@0 {
+					reg = <0>;
+					remote-endpoint = <&vopb_out_hdmi>;
+				};
+				hdmi_in_vopl: endpoint@1 {
+					reg = <1>;
+					remote-endpoint = <&vopl_out_hdmi>;
+				};
+			};
+		};
  	};
 
  	vpu: video-codec@ff9a0000 {
  		compatible = "rockchip,rk3288-vpu";
  		reg = <0xff9a0000 0x800>;
  		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
-				<GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+			     <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
  		interrupt-names = "vepu", "vdpu";
  		clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
-		clock-names = "aclk_vcodec", "hclk_vcodec";
-		power-domains = <&power RK3288_PD_VIDEO>;
+		clock-names = "aclk", "hclk";
  		iommus = <&vpu_mmu>;
+		power-domains = <&power RK3288_PD_VIDEO>;
  	};
 
  	vpu_mmu: iommu@ff9a0800 {
  		compatible = "rockchip,iommu";
  		reg = <0xff9a0800 0x100>;
  		interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
-		interrupt-names = "vpu_mmu";
+		clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
+		clock-names = "aclk", "iface";
+		#iommu-cells = <0>;
  		power-domains = <&power RK3288_PD_VIDEO>;
+	};
+
+	hevc_mmu: iommu@ff9c0440 {
+		compatible = "rockchip,iommu";
+		reg = <0xff9c0440 0x40>, <0xff9c0480 0x40>;
+		interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru ACLK_HEVC>, <&cru HCLK_HEVC>;
+		clock-names = "aclk", "iface";
  		#iommu-cells = <0>;
+		status = "disabled";
  	};
 
  	gpu: gpu@ffa30000 {
-		compatible = "arm,malit764",
-			     "arm,malit76x",
-			     "arm,malit7xx",
-			     "arm,mali-midgard";
+		compatible = "rockchip,rk3288-mali", "arm,mali-t760";
  		reg = <0xffa30000 0x10000>;
  		interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
  			     <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
  			     <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
-		interrupt-names = "JOB", "MMU", "GPU";
+		interrupt-names = "job", "mmu", "gpu";
  		clocks = <&cru ACLK_GPU>;
-		clock-names = "aclk_gpu";
-		operating-points = <
-			/* KHz uV */
-			100000 950000
-			200000 950000
-			300000 1000000
-			400000 1100000
-			/* 500000 1200000 - See crosbug.com/p/33857 */
-			600000 1250000
-		>;
+		operating-points-v2 = <&gpu_opp_table>;
+		#cooling-cells = <2>; /* min followed by max */
  		power-domains = <&power RK3288_PD_GPU>;
  		status = "disabled";
  	};
 
+	gpu_opp_table: opp-table-1 {
+		compatible = "operating-points-v2";
+
+		opp-100000000 {
+			opp-hz = /bits/ 64 <100000000>;
+			opp-microvolt = <950000>;
+		};
+		opp-200000000 {
+			opp-hz = /bits/ 64 <200000000>;
+			opp-microvolt = <950000>;
+		};
+		opp-300000000 {
+			opp-hz = /bits/ 64 <300000000>;
+			opp-microvolt = <1000000>;
+		};
+		opp-400000000 {
+			opp-hz = /bits/ 64 <400000000>;
+			opp-microvolt = <1100000>;
+		};
+		opp-600000000 {
+			opp-hz = /bits/ 64 <600000000>;
+			opp-microvolt = <1250000>;
+		};
+	};
+
+	qos_gpu_r: qos@ffaa0000 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffaa0000 0x20>;
+	};
+
+	qos_gpu_w: qos@ffaa0080 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffaa0080 0x20>;
+	};
+
+	qos_vio1_vop: qos@ffad0000 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffad0000 0x20>;
+	};
+
+	qos_vio1_isp_w0: qos@ffad0100 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffad0100 0x20>;
+	};
+
+	qos_vio1_isp_w1: qos@ffad0180 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffad0180 0x20>;
+	};
+
+	qos_vio0_vop: qos@ffad0400 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffad0400 0x20>;
+	};
+
+	qos_vio0_vip: qos@ffad0480 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffad0480 0x20>;
+	};
+
+	qos_vio0_iep: qos@ffad0500 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffad0500 0x20>;
+	};
+
+	qos_vio2_rga_r: qos@ffad0800 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffad0800 0x20>;
+	};
+
+	qos_vio2_rga_w: qos@ffad0880 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0x0 0xffad0880 0x0 0x20>;
+	};
+
+	qos_vio1_isp_r: qos@ffad0900 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffad0900 0x20>;
+	};
+
+	qos_video: qos@ffae0000 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffae0000 0x20>;
+	};
+
+	qos_hevc_r: qos@ffaf0000 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffaf0000 0x20>;
+	};
+
+	qos_hevc_w: qos@ffaf0080 {
+		compatible = "rockchip,rk3288-qos", "syscon";
+		reg = <0xffaf0080 0x20>;
+	};
+
+	dmac_bus_s: dma-controller@ffb20000 {
+		compatible = "arm,pl330", "arm,primecell";
+		reg = <0xffb20000 0x4000>;
+		interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
+		#dma-cells = <1>;
+		arm,pl330-broken-no-flushp;
+		arm,pl330-periph-burst;
+		clocks = <&cru ACLK_DMAC1>;
+		clock-names = "apb_pclk";
+	};
+
  	efuse: efuse@ffb40000 {
  		compatible = "rockchip,rk3288-efuse";
-		reg = <0xffb40000 0x10000>;
-		status = "disabled";
+		reg = <0xffb40000 0x20>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		clocks = <&cru PCLK_EFUSE256>;
+		clock-names = "pclk_efuse";
+
+		cpu_id: cpu-id@7 {
+			reg = <0x07 0x10>;
+		};
+		cpu_leakage: cpu_leakage@17 {
+			reg = <0x17 0x1>;
+		};
  	};
 
  	gic: interrupt-controller@ffc01000 {
@@ -883,45 +1407,12 @@
  		#address-cells = <0>;
 
  		reg = <0xffc01000 0x1000>,
-		      <0xffc02000 0x1000>,
+		      <0xffc02000 0x2000>,
  		      <0xffc04000 0x2000>,
  		      <0xffc06000 0x2000>;
  		interrupts = <GIC_PPI 9 0xf04>;
  	};
 
-	cpuidle: cpuidle {
-		compatible = "rockchip,rk3288-cpuidle";
-	};
-
-	usbphy: phy {
-		compatible = "rockchip,rk3288-usb-phy";
-		rockchip,grf = <&grf>;
-		#address-cells = <1>;
-		#size-cells = <0>;
-		status = "disabled";
-
-		usbphy0: usb-phy0 {
-			#phy-cells = <0>;
-			reg = <0x320>;
-			clocks = <&cru SCLK_OTGPHY0>;
-			clock-names = "phyclk";
-		};
-
-		usbphy1: usb-phy1 {
-			#phy-cells = <0>;
-			reg = <0x334>;
-			clocks = <&cru SCLK_OTGPHY1>;
-			clock-names = "phyclk";
-		};
-
-		usbphy2: usb-phy2 {
-			#phy-cells = <0>;
-			reg = <0x348>;
-			clocks = <&cru SCLK_OTGPHY2>;
-			clock-names = "phyclk";
-		};
-	};
-
  	pinctrl: pinctrl {
  		compatible = "rockchip,rk3288-pinctrl";
  		rockchip,grf = <&grf>;
@@ -930,9 +1421,9 @@
  		#size-cells = <1>;
  		ranges;
 
-		gpio0: gpio0@ff750000 {
+		gpio0: gpio@ff750000 {
  			compatible = "rockchip,gpio-bank";
-			reg =	<0xff750000 0x100>;
+			reg = <0xff750000 0x100>;
  			interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
  			clocks = <&cru PCLK_GPIO0>;
 
@@ -943,7 +1434,7 @@
  			#interrupt-cells = <2>;
  		};
 
-		gpio1: gpio1@ff780000 {
+		gpio1: gpio@ff780000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0xff780000 0x100>;
  			interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
@@ -956,7 +1447,7 @@
  			#interrupt-cells = <2>;
  		};
 
-		gpio2: gpio2@ff790000 {
+		gpio2: gpio@ff790000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0xff790000 0x100>;
  			interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
@@ -969,7 +1460,7 @@
  			#interrupt-cells = <2>;
  		};
 
-		gpio3: gpio3@ff7a0000 {
+		gpio3: gpio@ff7a0000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0xff7a0000 0x100>;
  			interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
@@ -982,7 +1473,7 @@
  			#interrupt-cells = <2>;
  		};
 
-		gpio4: gpio4@ff7b0000 {
+		gpio4: gpio@ff7b0000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0xff7b0000 0x100>;
  			interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
@@ -995,7 +1486,7 @@
  			#interrupt-cells = <2>;
  		};
 
-		gpio5: gpio5@ff7c0000 {
+		gpio5: gpio@ff7c0000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0xff7c0000 0x100>;
  			interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
@@ -1008,7 +1499,7 @@
  			#interrupt-cells = <2>;
  		};
 
-		gpio6: gpio6@ff7d0000 {
+		gpio6: gpio@ff7d0000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0xff7d0000 0x100>;
  			interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
@@ -1021,7 +1512,7 @@
  			#interrupt-cells = <2>;
  		};
 
-		gpio7: gpio7@ff7e0000 {
+		gpio7: gpio@ff7e0000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0xff7e0000 0x100>;
  			interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
@@ -1034,7 +1525,7 @@
  			#interrupt-cells = <2>;
  		};
 
-		gpio8: gpio8@ff7f0000 {
+		gpio8: gpio@ff7f0000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0xff7f0000 0x100>;
  			interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
@@ -1051,6 +1542,24 @@
  			hdmi_cec_c0: hdmi-cec-c0 {
  				rockchip,pins = <7 RK_PC0 2 &pcfg_pull_none>;
  			};
+
+			hdmi_cec_c7: hdmi-cec-c7 {
+				rockchip,pins = <7 RK_PC7 4 &pcfg_pull_none>;
+			};
+
+			hdmi_ddc: hdmi-ddc {
+				rockchip,pins = <7 RK_PC3 2 &pcfg_pull_none>,
+						<7 RK_PC4 2 &pcfg_pull_none>;
+			};
+
+			hdmi_ddc_unwedge: hdmi-ddc-unwedge {
+				rockchip,pins = <7 RK_PC3 RK_FUNC_GPIO &pcfg_output_low>,
+						<7 RK_PC4 2 &pcfg_pull_none>;
+			};
+		};
+
+		pcfg_output_low: pcfg-output-low {
+			output-low;
  		};
 
  		pcfg_pull_up: pcfg-pull-up {
@@ -1070,472 +1579,424 @@
  			drive-strength = <12>;
  		};
 
-		sleep {
+		suspend {
  			global_pwroff: global-pwroff {
-				rockchip,pins = <0 0 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PA0 1 &pcfg_pull_none>;
  			};
 
  			ddrio_pwroff: ddrio-pwroff {
-				rockchip,pins = <0 1 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PA1 1 &pcfg_pull_none>;
  			};
 
  			ddr0_retention: ddr0-retention {
-				rockchip,pins = <0 2 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <0 RK_PA2 1 &pcfg_pull_up>;
  			};
 
  			ddr1_retention: ddr1-retention {
-				rockchip,pins = <0 3 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <0 RK_PA3 1 &pcfg_pull_up>;
+			};
+		};
+
+		edp {
+			edp_hpd: edp-hpd {
+				rockchip,pins = <7 RK_PB3 2 &pcfg_pull_down>;
  			};
  		};
 
  		i2c0 {
  			i2c0_xfer: i2c0-xfer {
-				rockchip,pins = <0 15 RK_FUNC_1 &pcfg_pull_none>,
-						<0 16 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PB7 1 &pcfg_pull_none>,
+						<0 RK_PC0 1 &pcfg_pull_none>;
  			};
  		};
 
  		i2c1 {
  			i2c1_xfer: i2c1-xfer {
-				rockchip,pins = <8 4 RK_FUNC_1 &pcfg_pull_none>,
-						<8 5 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <8 RK_PA4 1 &pcfg_pull_none>,
+						<8 RK_PA5 1 &pcfg_pull_none>;
  			};
  		};
 
  		i2c2 {
  			i2c2_xfer: i2c2-xfer {
-				rockchip,pins = <6 9 RK_FUNC_1 &pcfg_pull_none>,
-						<6 10 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <6 RK_PB1 1 &pcfg_pull_none>,
+						<6 RK_PB2 1 &pcfg_pull_none>;
  			};
  		};
 
  		i2c3 {
  			i2c3_xfer: i2c3-xfer {
-				rockchip,pins = <2 16 RK_FUNC_1 &pcfg_pull_none>,
-						<2 17 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <2 RK_PC0 1 &pcfg_pull_none>,
+						<2 RK_PC1 1 &pcfg_pull_none>;
  			};
  		};
 
  		i2c4 {
  			i2c4_xfer: i2c4-xfer {
-				rockchip,pins = <7 17 RK_FUNC_1 &pcfg_pull_none>,
-						<7 18 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <7 RK_PC1 1 &pcfg_pull_none>,
+						<7 RK_PC2 1 &pcfg_pull_none>;
  			};
  		};
 
  		i2c5 {
  			i2c5_xfer: i2c5-xfer {
-				rockchip,pins = <7 19 RK_FUNC_1 &pcfg_pull_none>,
-						<7 20 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <7 RK_PC3 1 &pcfg_pull_none>,
+						<7 RK_PC4 1 &pcfg_pull_none>;
  			};
  		};
 
  		i2s0 {
  			i2s0_bus: i2s0-bus {
-				rockchip,pins = <6 0 RK_FUNC_1 &pcfg_pull_none>,
-						<6 1 RK_FUNC_1 &pcfg_pull_none>,
-						<6 2 RK_FUNC_1 &pcfg_pull_none>,
-						<6 3 RK_FUNC_1 &pcfg_pull_none>,
-						<6 4 RK_FUNC_1 &pcfg_pull_none>,
-						<6 8 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <6 RK_PA0 1 &pcfg_pull_none>,
+						<6 RK_PA1 1 &pcfg_pull_none>,
+						<6 RK_PA2 1 &pcfg_pull_none>,
+						<6 RK_PA3 1 &pcfg_pull_none>,
+						<6 RK_PA4 1 &pcfg_pull_none>,
+						<6 RK_PB0 1 &pcfg_pull_none>;
  			};
  		};
 
-		lcdc0 {
-			lcdc0_ctl: lcdc0-ctl {
-				rockchip,pins = <1 24 RK_FUNC_1 &pcfg_pull_none>,
-						<1 25 RK_FUNC_1 &pcfg_pull_none>,
-						<1 26 RK_FUNC_1 &pcfg_pull_none>,
-						<1 27 RK_FUNC_1 &pcfg_pull_none>;
+		lcdc {
+			lcdc_ctl: lcdc-ctl {
+				rockchip,pins = <1 RK_PD0 1 &pcfg_pull_none>,
+						<1 RK_PD1 1 &pcfg_pull_none>,
+						<1 RK_PD2 1 &pcfg_pull_none>,
+						<1 RK_PD3 1 &pcfg_pull_none>;
  			};
  		};
 
  		sdmmc {
  			sdmmc_clk: sdmmc-clk {
-				rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <6 RK_PC4 1 &pcfg_pull_none>;
  			};
 
  			sdmmc_cmd: sdmmc-cmd {
-				rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <6 RK_PC5 1 &pcfg_pull_up>;
  			};
 
-			sdmmc_cd: sdmcc-cd {
-				rockchip,pins = <6 22 RK_FUNC_1 &pcfg_pull_up>;
+			sdmmc_cd: sdmmc-cd {
+				rockchip,pins = <6 RK_PC6 1 &pcfg_pull_up>;
  			};
 
  			sdmmc_bus1: sdmmc-bus1 {
-				rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <6 RK_PC0 1 &pcfg_pull_up>;
  			};
 
  			sdmmc_bus4: sdmmc-bus4 {
-				rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up>,
-						<6 17 RK_FUNC_1 &pcfg_pull_up>,
-						<6 18 RK_FUNC_1 &pcfg_pull_up>,
-						<6 19 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <6 RK_PC0 1 &pcfg_pull_up>,
+						<6 RK_PC1 1 &pcfg_pull_up>,
+						<6 RK_PC2 1 &pcfg_pull_up>,
+						<6 RK_PC3 1 &pcfg_pull_up>;
  			};
  		};
 
  		sdio0 {
  			sdio0_bus1: sdio0-bus1 {
-				rockchip,pins = <4 20 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <4 RK_PC4 1 &pcfg_pull_up>;
  			};
 
  			sdio0_bus4: sdio0-bus4 {
-				rockchip,pins = <4 20 RK_FUNC_1 &pcfg_pull_up>,
-						<4 21 RK_FUNC_1 &pcfg_pull_up>,
-						<4 22 RK_FUNC_1 &pcfg_pull_up>,
-						<4 23 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <4 RK_PC4 1 &pcfg_pull_up>,
+						<4 RK_PC5 1 &pcfg_pull_up>,
+						<4 RK_PC6 1 &pcfg_pull_up>,
+						<4 RK_PC7 1 &pcfg_pull_up>;
  			};
 
  			sdio0_cmd: sdio0-cmd {
-				rockchip,pins = <4 24 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <4 RK_PD0 1 &pcfg_pull_up>;
  			};
 
  			sdio0_clk: sdio0-clk {
-				rockchip,pins = <4 25 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <4 RK_PD1 1 &pcfg_pull_none>;
  			};
 
  			sdio0_cd: sdio0-cd {
-				rockchip,pins = <4 26 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <4 RK_PD2 1 &pcfg_pull_up>;
  			};
 
  			sdio0_wp: sdio0-wp {
-				rockchip,pins = <4 27 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <4 RK_PD3 1 &pcfg_pull_up>;
  			};
 
  			sdio0_pwr: sdio0-pwr {
-				rockchip,pins = <4 28 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <4 RK_PD4 1 &pcfg_pull_up>;
  			};
 
  			sdio0_bkpwr: sdio0-bkpwr {
-				rockchip,pins = <4 29 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <4 RK_PD5 1 &pcfg_pull_up>;
  			};
 
  			sdio0_int: sdio0-int {
-				rockchip,pins = <4 30 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <4 RK_PD6 1 &pcfg_pull_up>;
  			};
  		};
 
  		sdio1 {
  			sdio1_bus1: sdio1-bus1 {
-				rockchip,pins = <3 24 RK_FUNC_4 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PD0 4 &pcfg_pull_up>;
  			};
 
  			sdio1_bus4: sdio1-bus4 {
-				rockchip,pins = <3 24 RK_FUNC_4 &pcfg_pull_up>,
-						<3 25 RK_FUNC_4 &pcfg_pull_up>,
-						<3 26 RK_FUNC_4 &pcfg_pull_up>,
-						<3 27 RK_FUNC_4 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PD0 4 &pcfg_pull_up>,
+						<3 RK_PD1 4 &pcfg_pull_up>,
+						<3 RK_PD2 4 &pcfg_pull_up>,
+						<3 RK_PD3 4 &pcfg_pull_up>;
  			};
 
  			sdio1_cd: sdio1-cd {
-				rockchip,pins = <3 28 RK_FUNC_4 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PD4 4 &pcfg_pull_up>;
  			};
 
  			sdio1_wp: sdio1-wp {
-				rockchip,pins = <3 29 RK_FUNC_4 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PD5 4 &pcfg_pull_up>;
  			};
 
  			sdio1_bkpwr: sdio1-bkpwr {
-				rockchip,pins = <3 30 RK_FUNC_4 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PD6 4 &pcfg_pull_up>;
  			};
 
  			sdio1_int: sdio1-int {
-				rockchip,pins = <3 31 RK_FUNC_4 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PD7 4 &pcfg_pull_up>;
  			};
 
  			sdio1_cmd: sdio1-cmd {
-				rockchip,pins = <4 6 RK_FUNC_4 &pcfg_pull_up>;
+				rockchip,pins = <4 RK_PA6 4 &pcfg_pull_up>;
  			};
 
  			sdio1_clk: sdio1-clk {
-				rockchip,pins = <4 7 RK_FUNC_4 &pcfg_pull_none>;
+				rockchip,pins = <4 RK_PA7 4 &pcfg_pull_none>;
  			};
 
  			sdio1_pwr: sdio1-pwr {
-				rockchip,pins = <4 9 RK_FUNC_4 &pcfg_pull_up>;
+				rockchip,pins = <4 RK_PB1 4 &pcfg_pull_up>;
  			};
  		};
 
  		emmc {
  			emmc_clk: emmc-clk {
-				rockchip,pins = <3 18 RK_FUNC_2 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PC2 2 &pcfg_pull_none>;
  			};
 
  			emmc_cmd: emmc-cmd {
-				rockchip,pins = <3 16 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PC0 2 &pcfg_pull_up>;
  			};
 
  			emmc_pwr: emmc-pwr {
-				rockchip,pins = <3 9 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PB1 2 &pcfg_pull_up>;
  			};
 
  			emmc_bus1: emmc-bus1 {
-				rockchip,pins = <3 0 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PA0 2 &pcfg_pull_up>;
  			};
 
  			emmc_bus4: emmc-bus4 {
-				rockchip,pins = <3 0 RK_FUNC_2 &pcfg_pull_up>,
-						<3 1 RK_FUNC_2 &pcfg_pull_up>,
-						<3 2 RK_FUNC_2 &pcfg_pull_up>,
-						<3 3 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PA0 2 &pcfg_pull_up>,
+						<3 RK_PA1 2 &pcfg_pull_up>,
+						<3 RK_PA2 2 &pcfg_pull_up>,
+						<3 RK_PA3 2 &pcfg_pull_up>;
  			};
 
  			emmc_bus8: emmc-bus8 {
-				rockchip,pins = <3 0 RK_FUNC_2 &pcfg_pull_up>,
-						<3 1 RK_FUNC_2 &pcfg_pull_up>,
-						<3 2 RK_FUNC_2 &pcfg_pull_up>,
-						<3 3 RK_FUNC_2 &pcfg_pull_up>,
-						<3 4 RK_FUNC_2 &pcfg_pull_up>,
-						<3 5 RK_FUNC_2 &pcfg_pull_up>,
-						<3 6 RK_FUNC_2 &pcfg_pull_up>,
-						<3 7 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PA0 2 &pcfg_pull_up>,
+						<3 RK_PA1 2 &pcfg_pull_up>,
+						<3 RK_PA2 2 &pcfg_pull_up>,
+						<3 RK_PA3 2 &pcfg_pull_up>,
+						<3 RK_PA4 2 &pcfg_pull_up>,
+						<3 RK_PA5 2 &pcfg_pull_up>,
+						<3 RK_PA6 2 &pcfg_pull_up>,
+						<3 RK_PA7 2 &pcfg_pull_up>;
  			};
  		};
 
  		spi0 {
  			spi0_clk: spi0-clk {
-				rockchip,pins = <5 12 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <5 RK_PB4 1 &pcfg_pull_up>;
  			};
  			spi0_cs0: spi0-cs0 {
-				rockchip,pins = <5 13 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <5 RK_PB5 1 &pcfg_pull_up>;
  			};
  			spi0_tx: spi0-tx {
-				rockchip,pins = <5 14 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <5 RK_PB6 1 &pcfg_pull_up>;
  			};
  			spi0_rx: spi0-rx {
-				rockchip,pins = <5 15 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <5 RK_PB7 1 &pcfg_pull_up>;
  			};
  			spi0_cs1: spi0-cs1 {
-				rockchip,pins = <5 16 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <5 RK_PC0 1 &pcfg_pull_up>;
  			};
  		};
  		spi1 {
  			spi1_clk: spi1-clk {
-				rockchip,pins = <7 12 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <7 RK_PB4 2 &pcfg_pull_up>;
  			};
  			spi1_cs0: spi1-cs0 {
-				rockchip,pins = <7 13 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <7 RK_PB5 2 &pcfg_pull_up>;
  			};
  			spi1_rx: spi1-rx {
-				rockchip,pins = <7 14 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <7 RK_PB6 2 &pcfg_pull_up>;
  			};
  			spi1_tx: spi1-tx {
-				rockchip,pins = <7 15 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <7 RK_PB7 2 &pcfg_pull_up>;
  			};
  		};
 
  		spi2 {
  			spi2_cs1: spi2-cs1 {
-				rockchip,pins = <8 3 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <8 RK_PA3 1 &pcfg_pull_up>;
  			};
  			spi2_clk: spi2-clk {
-				rockchip,pins = <8 6 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <8 RK_PA6 1 &pcfg_pull_up>;
  			};
  			spi2_cs0: spi2-cs0 {
-				rockchip,pins = <8 7 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <8 RK_PA7 1 &pcfg_pull_up>;
  			};
  			spi2_rx: spi2-rx {
-				rockchip,pins = <8 8 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <8 RK_PB0 1 &pcfg_pull_up>;
  			};
  			spi2_tx: spi2-tx {
-				rockchip,pins = <8 9 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <8 RK_PB1 1 &pcfg_pull_up>;
  			};
  		};
 
  		uart0 {
  			uart0_xfer: uart0-xfer {
-				rockchip,pins = <4 16 RK_FUNC_1 &pcfg_pull_up>,
-						<4 17 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <4 RK_PC0 1 &pcfg_pull_up>,
+						<4 RK_PC1 1 &pcfg_pull_none>;
  			};
 
  			uart0_cts: uart0-cts {
-				rockchip,pins = <4 18 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <4 RK_PC2 1 &pcfg_pull_up>;
  			};
 
  			uart0_rts: uart0-rts {
-				rockchip,pins = <4 19 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <4 RK_PC3 1 &pcfg_pull_none>;
  			};
  		};
 
  		uart1 {
  			uart1_xfer: uart1-xfer {
-				rockchip,pins = <5 8 RK_FUNC_1 &pcfg_pull_up>,
-						<5 9 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <5 RK_PB0 1 &pcfg_pull_up>,
+						<5 RK_PB1 1 &pcfg_pull_none>;
  			};
 
  			uart1_cts: uart1-cts {
-				rockchip,pins = <5 10 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <5 RK_PB2 1 &pcfg_pull_up>;
  			};
 
  			uart1_rts: uart1-rts {
-				rockchip,pins = <5 11 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <5 RK_PB3 1 &pcfg_pull_none>;
  			};
  		};
 
  		uart2 {
  			uart2_xfer: uart2-xfer {
-				rockchip,pins = <7 22 RK_FUNC_1 &pcfg_pull_up>,
-						<7 23 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <7 RK_PC6 1 &pcfg_pull_up>,
+						<7 RK_PC7 1 &pcfg_pull_none>;
  			};
  			/* no rts / cts for uart2 */
  		};
 
  		uart3 {
  			uart3_xfer: uart3-xfer {
-				rockchip,pins = <7 7 RK_FUNC_1 &pcfg_pull_up>,
-						<7 8 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <7 RK_PA7 1 &pcfg_pull_up>,
+						<7 RK_PB0 1 &pcfg_pull_none>;
  			};
 
  			uart3_cts: uart3-cts {
-				rockchip,pins = <7 9 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <7 RK_PB1 1 &pcfg_pull_up>;
  			};
 
  			uart3_rts: uart3-rts {
-				rockchip,pins = <7 10 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <7 RK_PB2 1 &pcfg_pull_none>;
  			};
  		};
 
  		uart4 {
  			uart4_xfer: uart4-xfer {
-				rockchip,pins = <5 12 3 &pcfg_pull_up>,
-						<5 13 3 &pcfg_pull_none>;
+				rockchip,pins = <5 RK_PB7 3 &pcfg_pull_up>,
+						<5 RK_PB6 3 &pcfg_pull_none>;
  			};
 
  			uart4_cts: uart4-cts {
-				rockchip,pins = <5 14 3 &pcfg_pull_none>;
+				rockchip,pins = <5 RK_PB4 3 &pcfg_pull_up>;
  			};
 
  			uart4_rts: uart4-rts {
-				rockchip,pins = <5 15 3 &pcfg_pull_none>;
+				rockchip,pins = <5 RK_PB5 3 &pcfg_pull_none>;
  			};
  		};
 
  		tsadc {
+			otp_pin: otp-pin {
+				rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
+			};
+
  			otp_out: otp-out {
-				rockchip,pins = <0 10 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PB2 1 &pcfg_pull_none>;
  			};
  		};
 
  		pwm0 {
  			pwm0_pin: pwm0-pin {
-				rockchip,pins = <7 0 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <7 RK_PA0 1 &pcfg_pull_none>;
  			};
  		};
 
  		pwm1 {
  			pwm1_pin: pwm1-pin {
-				rockchip,pins = <7 1 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <7 RK_PA1 1 &pcfg_pull_none>;
  			};
  		};
 
  		pwm2 {
  			pwm2_pin: pwm2-pin {
-				rockchip,pins = <7 22 RK_FUNC_3 &pcfg_pull_none>;
+				rockchip,pins = <7 RK_PC6 3 &pcfg_pull_none>;
  			};
  		};
 
  		pwm3 {
  			pwm3_pin: pwm3-pin {
-				rockchip,pins = <7 23 RK_FUNC_3 &pcfg_pull_none>;
+				rockchip,pins = <7 RK_PC7 3 &pcfg_pull_none>;
  			};
  		};
 
  		gmac {
  			rgmii_pins: rgmii-pins {
-				rockchip,pins = <3 30 3 &pcfg_pull_none>,
-						<3 31 3 &pcfg_pull_none>,
-						<3 26 3 &pcfg_pull_none>,
-						<3 27 3 &pcfg_pull_none>,
-						<3 28 3 &pcfg_pull_none_12ma>,
-						<3 29 3 &pcfg_pull_none_12ma>,
-						<3 24 3 &pcfg_pull_none_12ma>,
-						<3 25 3 &pcfg_pull_none_12ma>,
-						<4 0 3 &pcfg_pull_none>,
-						<4 5 3 &pcfg_pull_none>,
-						<4 6 3 &pcfg_pull_none>,
-						<4 9 3 &pcfg_pull_none_12ma>,
-						<4 4 3 &pcfg_pull_none_12ma>,
-						<4 1 3 &pcfg_pull_none>,
-						<4 3 3 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PD6 3 &pcfg_pull_none>,
+						<3 RK_PD7 3 &pcfg_pull_none>,
+						<3 RK_PD2 3 &pcfg_pull_none>,
+						<3 RK_PD3 3 &pcfg_pull_none>,
+						<3 RK_PD4 3 &pcfg_pull_none_12ma>,
+						<3 RK_PD5 3 &pcfg_pull_none_12ma>,
+						<3 RK_PD0 3 &pcfg_pull_none_12ma>,
+						<3 RK_PD1 3 &pcfg_pull_none_12ma>,
+						<4 RK_PA0 3 &pcfg_pull_none>,
+						<4 RK_PA5 3 &pcfg_pull_none>,
+						<4 RK_PA6 3 &pcfg_pull_none>,
+						<4 RK_PB1 3 &pcfg_pull_none_12ma>,
+						<4 RK_PA4 3 &pcfg_pull_none_12ma>,
+						<4 RK_PA1 3 &pcfg_pull_none>,
+						<4 RK_PA3 3 &pcfg_pull_none>;
  			};
 
  			rmii_pins: rmii-pins {
-				rockchip,pins = <3 30 3 &pcfg_pull_none>,
-						<3 31 3 &pcfg_pull_none>,
-						<3 28 3 &pcfg_pull_none>,
-						<3 29 3 &pcfg_pull_none>,
-						<4 0 3 &pcfg_pull_none>,
-						<4 5 3 &pcfg_pull_none>,
-						<4 4 3 &pcfg_pull_none>,
-						<4 1 3 &pcfg_pull_none>,
-						<4 2 3 &pcfg_pull_none>,
-						<4 3 3 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PD6 3 &pcfg_pull_none>,
+						<3 RK_PD7 3 &pcfg_pull_none>,
+						<3 RK_PD4 3 &pcfg_pull_none>,
+						<3 RK_PD5 3 &pcfg_pull_none>,
+						<4 RK_PA0 3 &pcfg_pull_none>,
+						<4 RK_PA5 3 &pcfg_pull_none>,
+						<4 RK_PA4 3 &pcfg_pull_none>,
+						<4 RK_PA1 3 &pcfg_pull_none>,
+						<4 RK_PA2 3 &pcfg_pull_none>,
+						<4 RK_PA3 3 &pcfg_pull_none>;
  			};
  		};
 
  		spdif {
  			spdif_tx: spdif-tx {
-				rockchip,pins = <RK_GPIO6 11 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <6 RK_PB3 1 &pcfg_pull_none>;
  			};
  		};
  	};
-
-	power: power-controller {
-		compatible = "rockchip,rk3288-power-controller";
-		#power-domain-cells = <1>;
-		rockchip,pmu = <&pmu>;
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		pd_gpu {
-			reg = <RK3288_PD_GPU>;
-			clocks = <&cru ACLK_GPU>;
-		};
-
-		pd_hevc {
-			reg = <RK3288_PD_HEVC>;
-			clocks = <&cru ACLK_HEVC>,
-				 <&cru SCLK_HEVC_CABAC>,
-				 <&cru SCLK_HEVC_CORE>,
-				 <&cru HCLK_HEVC>;
-		};
-
-		pd_vio {
-			reg = <RK3288_PD_VIO>;
-			clocks = <&cru ACLK_IEP>,
-				 <&cru ACLK_ISP>,
-				 <&cru ACLK_RGA>,
-				 <&cru ACLK_VIP>,
-				 <&cru ACLK_VOP0>,
-				 <&cru ACLK_VOP1>,
-				 <&cru DCLK_VOP0>,
-				 <&cru DCLK_VOP1>,
-				 <&cru HCLK_IEP>,
-				 <&cru HCLK_ISP>,
-				 <&cru HCLK_RGA>,
-				 <&cru HCLK_VIP>,
-				 <&cru HCLK_VOP0>,
-				 <&cru HCLK_VOP1>,
-				 <&cru PCLK_EDP_CTRL>,
-				 <&cru PCLK_HDMI_CTRL>,
-				 <&cru PCLK_LVDS_PHY>,
-				 <&cru PCLK_MIPI_CSI>,
-				 <&cru PCLK_MIPI_DSI0>,
-				 <&cru PCLK_MIPI_DSI1>,
-				 <&cru SCLK_EDP_24M>,
-				 <&cru SCLK_EDP>,
-				 <&cru SCLK_HDMI_CEC>,
-				 <&cru SCLK_HDMI_HDCP>,
-				 <&cru SCLK_ISP_JPE>,
-				 <&cru SCLK_ISP>,
-				 <&cru SCLK_RGA>;
-		};
-
-		pd_video {
-			reg = <RK3288_PD_VIDEO>;
-			clocks = <&cru ACLK_VCODEC>,
-				 <&cru HCLK_VCODEC>;
-		};
-	};
  };
#18 lore raw

Re: [PATCH v3 09/12] arm: dts: rockchip: sync rk3288.dtsi from Linux

Review

Quoted 6 lines · Kever Yang

Hi Johan,

    I got build fail for phycore-rk3288 after this patch:

(quoted diff) +2 -0
+Error: SPL image is too large (size 0x8800 than 0x8000)
+Error: Bad parameters for image type

Hi,

Could you disclose your bash commands for reproducing? I've downloaded from your git on April 15th 2022. Added missing patches and compiled.
No warning seen here.

u-boot-spl.bin size 31.9 KiB (32675 bytes) ==> 0x7FA3 so below 0x8000 == 32768 bytes.

===

For rk3288 SPL images with OF_PLATDATA the ns16550.c and serial_rockchip.c driver are now included due to DM_DRIVER_ALIAS fix for SPL_OF_PLATDATA, but this config is compiled with CONFIG_SPL_OF_REAL=y.

===

Your patch for:
rockchip: fix boot_devices constants
contains a warning:
check for migrated symbols...

What does it check and is that something I can fix?

===

For patches 9,10 and 11 I'm planning a v4 with:

ec-interrupt in u-boot-xxxx.dtsi

===

The driver rk_edp.c needs too fixing to comply with current Linux DP node.

I need board maintainers with hardware for that to fix and check.

compatible ="cnm,n116bgeea2","simple-panel";
vs.
compatible = "innolux,n116bge";
==> compatible = "simple-panel";

compatible = "rockchip,rk3288-edp";
vs.
compatible = "rockchip,rk3288-dp";

	ret = uclass_get_device_by_phandle(UCLASS_PANEL, dev, "rockchip,panel",
					   &priv->panel);


                clock-names = "clk_edp", "clk_edp_24m", "pclk_edp"; //
U-boot
		ret = clk_get_by_index(dev, 1, &clk);

vs.

                clock-names = "dp", "pclk"; // Linux



	ret = reset_get_by_name(dev, "dp", &dp_rst);
vs.
                reset-names = "edp"; //rk3288
                reset-names = "dp";  //rk3399

===
Let me know what you prefere.
Please offload the (dt-header) patches that are ready, so that I don't have to resend them all the time.

===

Kind regards,

Johan

===

git clone --depth 40
https://source.denx.de/u-boot/custodians/u-boot-rockchip.git

git am v3-0009-arm-dts-rockchip-sync-rk3288.dtsi-from-Linux.patch git am v3-0010-arm-dts-rockchip-sync-rk3288-DT-boards-from-Linux.patch git am v3-0011-arm-dts-rockchip-sync-rk3288-veyron-DT-from-Linux.patch

make CROSS_COMPILE=arm-linux-gnueabihf- phycore-rk3288_defconfig all

mkimage ???

Quoted 2,410 lines

Thanks,

- Kever

Quoted 2,404 lines · Johan Jonker

Sync rk3288.dtsi from Linux version 5.17.

---

Changed V3:
   change reg size

Changed V2:
   rename mipi_dsi0 label
   move io_domains
   remove hdmi_audio veyron node
   change memory@0 reg size
---
  arch/arm/dts/rk3288-evb.dtsi         |    2 +- arch/arm/dts/rk3288-miqi.dtsi        |   28 +- arch/arm/dts/rk3288-phycore-som.dtsi |   30 +- arch/arm/dts/rk3288-popmetal.dtsi    |   30 +- arch/arm/dts/rk3288-thermal.dtsi     |   87 -- arch/arm/dts/rk3288-veyron-jerry.dts |    6 - arch/arm/dts/rk3288-veyron.dtsi      |   33 +- arch/arm/dts/rk3288.dtsi             | 1367 +++++++++++++++++---------

  8 files changed, 970 insertions(+), 613 deletions(-)

  delete mode 100644 arch/arm/dts/rk3288-thermal.dtsi

arch/arm/dts/rk3288-evb.dtsi +1 -0
index 04902c0b..72da8847 100644
@@ -448,7 +448,7 @@
       status = "okay";
   };
   -&mipi_dsi0 {
+&mipi_dsi {
       status = "disabled";
       rockchip,panel = <&panel>;
       display-timings {
arch/arm/dts/rk3288-miqi.dtsi +0 -14
index cb80cbf2..b1c286c9 100644
@@ -18,21 +18,6 @@
           clock-output-names = "ext_gmac";
       };
   -    io_domains: io-domains {
-        compatible = "rockchip,rk3288-io-voltage-domain";
-        rockchip,grf = <&grf>;
-
-        audio-supply = <&vcca_33>;
-        flash0-supply = <&vcc_flash>;
-        flash1-supply = <&vcc_lan>;
-        gpio30-supply = <&vcc_io>;
-        gpio1830-supply = <&vcc_io>;
-        lcdc-supply = <&vcc_io>;
-        sdcard-supply = <&vccio_sd>;
-        wifi-supply = <&vcc_18>;
-    };
-
-
       leds {
           compatible = "gpio-leds";

  @@ -277,6 +262,19 @@
      status = "okay";
  };
  +&io_domains {
+    status = "okay";

arch/arm/dts/rk3288-miqi.dtsi +11 -0
+
+    audio-supply = <&vcca_33>;
+    flash0-supply = <&vcc_flash>;
+    flash1-supply = <&vcc_lan>;
+    gpio30-supply = <&vcc_io>;
+    gpio1830-supply = <&vcc_io>;
+    lcdc-supply = <&vcc_io>;
+    sdcard-supply = <&vccio_sd>;
+    wifi-supply = <&vcc_18>;
+};
+

  &pinctrl {
      pcfg_output_high: pcfg-output-high {
          output-high;

arch/arm/dts/rk3288-phycore-som.dtsi +13 -15
index 821525f7..8ac695c8 100644
@@ -71,22 +71,6 @@
           clock-output-names = "ext_gmac";
       };
   -    io_domains: io_domains {
-        compatible = "rockchip,rk3288-io-voltage-domain";
-
-        status = "okay";
-        sdcard-supply = <&vdd_io_sd>;
-        flash0-supply = <&vdd_emmc_io>;
-        flash1-supply = <&vdd_misc_1v8>;
-        gpio1830-supply = <&vdd_3v3_io>;
-        gpio30-supply = <&vdd_3v3_io>;
-        bb-supply = <&vdd_3v3_io>;
-        dvp-supply = <&vdd_3v3_io>;
-        lcdc-supply = <&vdd_3v3_io>;
-        wifi-supply = <&vdd_3v3_io>;
-        audio-supply = <&vdd_3v3_io>;
-    };
-
       leds: user-leds {
           compatible = "gpio-leds";
           pinctrl-names = "default";
@@ -197,6 +181,20 @@
       ddc-i2c-bus = <&i2c5>;
   };
   +&io_domains {
+    status = "okay";
+    sdcard-supply = <&vdd_io_sd>;
+    flash0-supply = <&vdd_emmc_io>;
+    flash1-supply = <&vdd_misc_1v8>;
+    gpio1830-supply = <&vdd_3v3_io>;
+    gpio30-supply = <&vdd_3v3_io>;
+    bb-supply = <&vdd_3v3_io>;
+    dvp-supply = <&vdd_3v3_io>;
+    lcdc-supply = <&vdd_3v3_io>;
+    wifi-supply = <&vdd_3v3_io>;
+    audio-supply = <&vdd_3v3_io>;
+};
+
   &i2c0 {
       status = "okay";
       clock-frequency = <400000>;
arch/arm/dts/rk3288-popmetal.dtsi +13 -15
index 63785eb5..bcd8fded 100644
@@ -69,22 +69,6 @@
           };
       };
   -    io_domains: io-domains {
-        compatible = "rockchip,rk3288-io-voltage-domain";
-        rockchip,grf = <&grf>;
-
-        audio-supply = <&vcca_33>;
-        bb-supply = <&vcc_io>;
-        dvp-supply = <&vcc18_dvp>;
-        flash0-supply = <&vcc_flash>;
-        flash1-supply = <&vcc_lan>;
-        gpio30-supply = <&vcc_io>;
-        gpio1830-supply = <&vcc_io>;
-        lcdc-supply = <&vcc_io>;
-        sdcard-supply = <&vccio_sd>;
-        wifi-supply = <&vccio_wl>;
-    };
-
       ir: ir-receiver {
           compatible = "gpio-ir-receiver";
           gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
@@ -441,6 +425,20 @@
       status = "okay";
   };
   +&io_domains {
+    status = "okay";
+    audio-supply = <&vcca_33>;
+    bb-supply = <&vcc_io>;
+    dvp-supply = <&vcc18_dvp>;
+    flash0-supply = <&vcc_flash>;
+    flash1-supply = <&vcc_lan>;
+    gpio30-supply = <&vcc_io>;
+    gpio1830-supply = <&vcc_io>;
+    lcdc-supply = <&vcc_io>;
+    sdcard-supply = <&vccio_sd>;
+    wifi-supply = <&vccio_wl>;
+};
+
   &pinctrl {
       ak8963 {
           comp_int: comp-int {
arch/arm/dts/rk3288-thermal.dtsi deleted +0 -87
deleted file mode 100644
index 87dd8142..00000000
@@ -1,87 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source for RK3288 SoC thermal
- *
- * Copyright (c) 2014, Fuzhou Rockchip Electronics Co., Ltd
- */
-
-#include <dt-bindings/thermal/thermal.h>
-
-reserve_thermal: reserve_thermal {
-    polling-delay-passive = <1000>; /* milliseconds */
-    polling-delay = <5000>; /* milliseconds */
-
-            /* sensor    ID */
-    thermal-sensors = <&tsadc    0>;
-
-};
-
-cpu_thermal: cpu_thermal {
-    polling-delay-passive = <100>; /* milliseconds */
-    polling-delay = <5000>; /* milliseconds */
-
-            /* sensor    ID */
-    thermal-sensors = <&tsadc    1>;
-    linux,hwmon;
-
-    trips {
-        cpu_alert0: cpu_alert0 {
-            temperature = <70000>; /* millicelsius */
-            hysteresis = <2000>; /* millicelsius */
-            type = "passive";
-        };
-        cpu_alert1: cpu_alert1 {
-            temperature = <75000>; /* millicelsius */
-            hysteresis = <2000>; /* millicelsius */
-            type = "passive";
-        };
-        cpu_crit: cpu_crit {
-            temperature = <100000>; /* millicelsius */
-            hysteresis = <2000>; /* millicelsius */
-            type = "critical";
-        };
-    };
-
-    cooling-maps {
-        map0 {
-            trip = <&cpu_alert0>;
-            cooling-device =
-                <&cpu0 THERMAL_NO_LIMIT 6>;
-        };
-        map1 {
-            trip = <&cpu_alert1>;
-            cooling-device =
-                <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-        };
-    };
-};
-
-gpu_thermal: gpu_thermal {
-    polling-delay-passive = <100>; /* milliseconds */
-    polling-delay = <5000>; /* milliseconds */
-
-            /* sensor    ID */
-    thermal-sensors = <&tsadc    2>;
-    linux,hwmon;
-
-    trips {
-        gpu_alert0: gpu_alert0 {
-            temperature = <80000>; /* millicelsius */
-            hysteresis = <2000>; /* millicelsius */
-            type = "passive";
-        };
-        gpu_crit: gpu_crit {
-            temperature = <100000>; /* millicelsius */
-            hysteresis = <2000>; /* millicelsius */
-            type = "critical";
-        };
-    };
-
-    cooling-maps {
-        map0 {
-            trip = <&gpu_alert0>;
-            cooling-device =
-                <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-        };
-    };
-};
arch/arm/dts/rk3288-veyron-jerry.dts +0 -5
index ff7669eb..40fee55c 100644
@@ -137,12 +137,6 @@
           };
       };
   -    edp {
-        edp_hpd: edp_hpd {
-            rockchip,pins = <7 11 RK_FUNC_2 &pcfg_pull_down>;
-        };
-    };
-
       emmc {
           /* Make sure eMMC is not in reset */
           emmc_deassert_reset: emmc-deassert-reset {
arch/arm/dts/rk3288-veyron.dtsi +13 -18
index 4a9c27a4..ac9e815e 100644
@@ -198,21 +198,6 @@
           /* Faux input supply.  See bt_regulator description. */
           vin-supply = <&bt_regulator>;
       };
-
-    io-domains {
-        compatible = "rockchip,rk3288-io-voltage-domain";
-        rockchip,grf = <&grf>;
-
-        audio-supply = <&vcc18_codec>;
-        bb-supply = <&vcc33_io>;
-        dvp-supply = <&vcc_18>;
-        flash0-supply = <&vcc18_flashio>;
-        gpio1830-supply = <&vcc33_io>;
-        gpio30-supply = <&vcc33_io>;
-        lcdc-supply = <&vcc33_lcd>;
-        sdcard-supply = <&vccio_sd>;
-        wifi-supply = <&vcc18_wl>;
-    };
   };
     &cpu0 {
@@ -503,6 +488,20 @@
       clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>, <&cru SCLK_I2S0_OUT>;
   };
   +&io_domains {
+    status = "okay";
+
+    audio-supply = <&vcc18_codec>;
+    bb-supply = <&vcc33_io>;
+    dvp-supply = <&vcc_18>;
+    flash0-supply = <&vcc18_flashio>;
+    gpio1830-supply = <&vcc33_io>;
+    gpio30-supply = <&vcc33_io>;
+    lcdc-supply = <&vcc33_lcd>;
+    sdcard-supply = <&vccio_sd>;
+    wifi-supply = <&vcc18_wl>;
+};
+
   &wdt {
       status = "okay";
   };
@@ -560,10 +559,6 @@
       status = "okay";
   };
   -&hdmi_audio {
-    status = "okay";
-};
-
   &gpu {
       status = "okay";
   };
arch/arm/dts/rk3288.dtsi +103 -55
index c4abfa37..14a3f8e8 100644
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
     #include <dt-bindings/gpio/gpio.h>
   #include <dt-bindings/interrupt-controller/irq.h>
@@ -7,14 +7,18 @@
   #include <dt-bindings/clock/rk3288-cru.h>
   #include <dt-bindings/power/rk3288-power.h>
   #include <dt-bindings/thermal/thermal.h>
-#include <dt-bindings/video/rk3288.h>
-#include "skeleton.dtsi"
+#include <dt-bindings/soc/rockchip,boot-mode.h>
     / {
+    #address-cells = <1>;
+    #size-cells = <1>;
+
       compatible = "rockchip,rk3288";
         interrupt-parent = <&gic>;
+
       aliases {
+        ethernet0 = &gmac;
           i2c0 = &i2c0;
           i2c1 = &i2c1;
           i2c2 = &i2c2;
@@ -35,6 +39,15 @@
           spi2 = &spi2;
       };
   +    arm-pmu {
+        compatible = "arm,cortex-a12-pmu";
+        interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>,
+                 <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>,
+                 <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>,
+                 <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
+        interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
+    };
+
       cpus {
           #address-cells = <1>;
           #size-cells = <0>;
@@ -45,85 +58,119 @@
               device_type = "cpu";
               compatible = "arm,cortex-a12";
               reg = <0x500>;
-            operating-points = <
-                /* KHz    uV */
-                1800000 1400000
-                1704000 1350000
-                1608000 1300000
-                1512000 1250000
-                1416000 1200000
-                1200000 1100000
-                1008000 1050000
-                 816000 1000000
-                 696000  950000
-                 600000  900000
-                 408000  900000
-                 216000  900000
-                 126000  900000
-            >;
+            resets = <&cru SRST_CORE0>;
+            operating-points-v2 = <&cpu_opp_table>;
               #cooling-cells = <2>; /* min followed by max */
               clock-latency = <40000>;
               clocks = <&cru ARMCLK>;
-            resets = <&cru SRST_CORE0>;
+            dynamic-power-coefficient = <370>;
           };
-        cpu@501 {
+        cpu1: cpu@501 {
               device_type = "cpu";
               compatible = "arm,cortex-a12";
               reg = <0x501>;
               resets = <&cru SRST_CORE1>;
+            operating-points-v2 = <&cpu_opp_table>;
+            #cooling-cells = <2>; /* min followed by max */
+            clock-latency = <40000>;
+            clocks = <&cru ARMCLK>;
+            dynamic-power-coefficient = <370>;
           };
-        cpu@502 {
+        cpu2: cpu@502 {
               device_type = "cpu";
               compatible = "arm,cortex-a12";
               reg = <0x502>;
               resets = <&cru SRST_CORE2>;
+            operating-points-v2 = <&cpu_opp_table>;
+            #cooling-cells = <2>; /* min followed by max */
+            clock-latency = <40000>;
+            clocks = <&cru ARMCLK>;
+            dynamic-power-coefficient = <370>;
           };
-        cpu@503 {
+        cpu3: cpu@503 {
               device_type = "cpu";
               compatible = "arm,cortex-a12";
               reg = <0x503>;
               resets = <&cru SRST_CORE3>;
+            operating-points-v2 = <&cpu_opp_table>;
+            #cooling-cells = <2>; /* min followed by max */
+            clock-latency = <40000>;
+            clocks = <&cru ARMCLK>;
+            dynamic-power-coefficient = <370>;
           };
       };
   -    amba {
-        compatible = "arm,amba-bus";
+    cpu_opp_table: opp-table-0 {
+        compatible = "operating-points-v2";
+        opp-shared;
+
+        opp-126000000 {
+            opp-hz = /bits/ 64 <126000000>;
+            opp-microvolt = <900000>;
+        };
+        opp-216000000 {
+            opp-hz = /bits/ 64 <216000000>;
+            opp-microvolt = <900000>;
+        };
+        opp-312000000 {
+            opp-hz = /bits/ 64 <312000000>;
+            opp-microvolt = <900000>;
+        };
+        opp-408000000 {
+            opp-hz = /bits/ 64 <408000000>;
+            opp-microvolt = <900000>;
+        };
+        opp-600000000 {
+            opp-hz = /bits/ 64 <600000000>;
+            opp-microvolt = <900000>;
+        };
+        opp-696000000 {
+            opp-hz = /bits/ 64 <696000000>;
+            opp-microvolt = <950000>;
+        };
+        opp-816000000 {
+            opp-hz = /bits/ 64 <816000000>;
+            opp-microvolt = <1000000>;
+        };
+        opp-1008000000 {
+            opp-hz = /bits/ 64 <1008000000>;
+            opp-microvolt = <1050000>;
+        };
+        opp-1200000000 {
+            opp-hz = /bits/ 64 <1200000000>;
+            opp-microvolt = <1100000>;
+        };
+        opp-1416000000 {
+            opp-hz = /bits/ 64 <1416000000>;
+            opp-microvolt = <1200000>;
+        };
+        opp-1512000000 {
+            opp-hz = /bits/ 64 <1512000000>;
+            opp-microvolt = <1300000>;
+        };
+        opp-1608000000 {
+            opp-hz = /bits/ 64 <1608000000>;
+            opp-microvolt = <1350000>;
+        };
+    };
+
+    reserved-memory {
           #address-cells = <1>;
           #size-cells = <1>;
           ranges;
   -        dmac_peri: dma-controller@ff250000 {
-            compatible = "arm,pl330", "arm,primecell";
-            broken-no-flushp;
-            reg = <0xff250000 0x4000>;
-            interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
-                     <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
-            #dma-cells = <1>;
-            clocks = <&cru ACLK_DMAC2>;
-            clock-names = "apb_pclk";
-        };
-
-        dmac_bus_ns: dma-controller@ff600000 {
-            compatible = "arm,pl330", "arm,primecell";
-            broken-no-flushp;
-            reg = <0xff600000 0x4000>;
-            interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
-                     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
-            #dma-cells = <1>;
-            clocks = <&cru ACLK_DMAC1>;
-            clock-names = "apb_pclk";
-            status = "disabled";
-        };
-
-        dmac_bus_s: dma-controller@ffb20000 {
-            compatible = "arm,pl330", "arm,primecell";
-            broken-no-flushp;
-            reg = <0xffb20000 0x4000>;
-            interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
-                     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
-            #dma-cells = <1>;
-            clocks = <&cru ACLK_DMAC1>;
-            clock-names = "apb_pclk";
+        /*
+         * The rk3288 cannot use the memory area above 0xfe000000
+         * for dma operations for some reason. While there is
+         * probably a better solution available somewhere, we
+         * haven't found it yet and while devices with 2GB of ram
+         * are not affected, this issue prevents 4GB from booting.
+         * So to make these devices at least bootable, block
+         * this area for the time being until the real solution
+         * is found.
+         */
+        dma-unusable@fe000000 {
+            reg = <0xfe000000 0x1000000>;
           };
       };

  @@ -135,14 +182,22 @@
      };
        timer {
-            arm,use-physical-timer;
          compatible = "arm,armv7-timer";
+        arm,cpu-registers-not-fw-configured; interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
                   <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
                   <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
                   <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
          clock-frequency = <24000000>;
-        always-on;
+        arm,no-tick-in-suspend;
+    };
+
+    timer: timer@ff810000 {
+        compatible = "rockchip,rk3288-timer";
+        reg = <0xff810000 0x20>;
+        interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>; +        clocks = <&cru PCLK_TIMER>, <&xin24m>;
+        clock-names = "pclk", "timer";
      };
        display-subsystem {

arch/arm/dts/rk3288.dtsi +16 -4
@@ -150,51 +205,59 @@
           ports = <&vopl_out>, <&vopb_out>;
       };
   -    sdmmc: dwmmc@ff0c0000 {
+    sdmmc: mmc@ff0c0000 {
           compatible = "rockchip,rk3288-dw-mshc";
           max-frequency = <150000000>;
           clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
                <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
-        clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+        clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
           fifo-depth = <0x100>;
           interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
           reg = <0xff0c0000 0x4000>;
+        resets = <&cru SRST_MMC0>;
+        reset-names = "reset";
           status = "disabled";
       };
   -    sdio0: dwmmc@ff0d0000 {
+    sdio0: mmc@ff0d0000 {
           compatible = "rockchip,rk3288-dw-mshc";
           max-frequency = <150000000>;
           clocks = <&cru HCLK_SDIO0>, <&cru SCLK_SDIO0>,
                <&cru SCLK_SDIO0_DRV>, <&cru SCLK_SDIO0_SAMPLE>;
-        clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+        clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
           fifo-depth = <0x100>;
           interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
           reg = <0xff0d0000 0x4000>;
+        resets = <&cru SRST_SDIO0>;
+        reset-names = "reset";
           status = "disabled";
       };
   -    sdio1: dwmmc@ff0e0000 {
+    sdio1: mmc@ff0e0000 {
           compatible = "rockchip,rk3288-dw-mshc";
           max-frequency = <150000000>;
           clocks = <&cru HCLK_SDIO1>, <&cru SCLK_SDIO1>,
                <&cru SCLK_SDIO1_DRV>, <&cru SCLK_SDIO1_SAMPLE>;
-        clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+        clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
           fifo-depth = <0x100>;
           interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
           reg = <0xff0e0000 0x4000>;
+        resets = <&cru SRST_SDIO1>;
+        reset-names = "reset";
           status = "disabled";
       };
   -    emmc: dwmmc@ff0f0000 {
+    emmc: mmc@ff0f0000 {
           compatible = "rockchip,rk3288-dw-mshc";
           max-frequency = <150000000>;
           clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
                <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
-        clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+        clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
           fifo-depth = <0x100>;
           interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
           reg = <0xff0f0000 0x4000>;
+        resets = <&cru SRST_EMMC>;
+        reset-names = "reset";
           status = "disabled";
       };

  @@ -205,6 +268,8 @@
          #io-channel-cells = <1>;
          clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>; clock-names = "saradc", "apb_pclk";
+        resets = <&cru SRST_SARADC>;
+        reset-names = "saradc-apb";
          status = "disabled";
      };
  @@ -304,6 +369,7 @@
          pinctrl-0 = <&i2c5_xfer>;
          status = "disabled";
      };
+
      uart0: serial@ff180000 {
          compatible = "rockchip,rk3288-uart", "snps,dw-apb-uart"; reg = <0xff180000 0x100>;

arch/arm/dts/rk3288.dtsi +113 -8
@@ -312,6 +378,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";
@@ -325,6 +393,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";
@@ -342,6 +412,7 @@
           pinctrl-0 = <&uart2_xfer>;
           status = "disabled";
       };
+
       uart3: serial@ff1b0000 {
           compatible = "rockchip,rk3288-uart", "snps,dw-apb-uart";
           reg = <0xff1b0000 0x100>;
@@ -350,6 +421,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";
@@ -363,12 +436,104 @@
           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";
       };
-    thermal: thermal-zones {
-        #include "rk3288-thermal.dtsi"
+
+    dmac_peri: dma-controller@ff250000 {
+        compatible = "arm,pl330", "arm,primecell";
+        reg = <0xff250000 0x4000>;
+        interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
+                 <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
+        #dma-cells = <1>;
+        arm,pl330-broken-no-flushp;
+        arm,pl330-periph-burst;
+        clocks = <&cru ACLK_DMAC2>;
+        clock-names = "apb_pclk";
+    };
+
+    thermal-zones {
+        reserve_thermal: reserve-thermal {
+            polling-delay-passive = <1000>; /* milliseconds */
+            polling-delay = <5000>; /* milliseconds */
+
+            thermal-sensors = <&tsadc 0>;
+        };
+
+        cpu_thermal: cpu-thermal {
+            polling-delay-passive = <100>; /* milliseconds */
+            polling-delay = <5000>; /* milliseconds */
+
+            thermal-sensors = <&tsadc 1>;
+
+            trips {
+                cpu_alert0: cpu_alert0 {
+                    temperature = <70000>; /* millicelsius */
+                    hysteresis = <2000>; /* millicelsius */
+                    type = "passive";
+                };
+                cpu_alert1: cpu_alert1 {
+                    temperature = <75000>; /* millicelsius */
+                    hysteresis = <2000>; /* millicelsius */
+                    type = "passive";
+                };
+                cpu_crit: cpu_crit {
+                    temperature = <90000>; /* millicelsius */
+                    hysteresis = <2000>; /* millicelsius */
+                    type = "critical";
+                };
+            };
+
+            cooling-maps {
+                map0 {
+                    trip = <&cpu_alert0>;
+                    cooling-device =
+                        <&cpu0 THERMAL_NO_LIMIT 6>,
+                        <&cpu1 THERMAL_NO_LIMIT 6>,
+                        <&cpu2 THERMAL_NO_LIMIT 6>,
+                        <&cpu3 THERMAL_NO_LIMIT 6>;
+                };
+                map1 {
+                    trip = <&cpu_alert1>;
+                    cooling-device =
+                        <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+                        <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+                        <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+                        <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+                };
+            };
+        };
+
+        gpu_thermal: gpu-thermal {
+            polling-delay-passive = <100>; /* milliseconds */
+            polling-delay = <5000>; /* milliseconds */
+
+            thermal-sensors = <&tsadc 2>;
+
+            trips {
+                gpu_alert0: gpu_alert0 {
+                    temperature = <70000>; /* millicelsius */
+                    hysteresis = <2000>; /* millicelsius */
+                    type = "passive";
+                };
+                gpu_crit: gpu_crit {
+                    temperature = <90000>; /* millicelsius */
+                    hysteresis = <2000>; /* millicelsius */
+                    type = "critical";
+                };
+            };
+
+            cooling-maps {
+                map0 {
+                    trip = <&gpu_alert0>;
+                    cooling-device =
+                        <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+                };
+            };
+        };
       };
         tsadc: tsadc@ff280000 {
@@ -379,18 +544,22 @@
           clock-names = "tsadc", "apb_pclk";
           resets = <&cru SRST_TSADC>;
           reset-names = "tsadc-apb";
-        pinctrl-names = "otp_out";
-        pinctrl-0 = <&otp_out>;
+        pinctrl-names = "init", "default", "sleep";
+        pinctrl-0 = <&otp_pin>;
+        pinctrl-1 = <&otp_out>;
+        pinctrl-2 = <&otp_pin>;
           #thermal-sensor-cells = <1>;
-        hw-shut-temp = <125000>;
+        rockchip,grf = <&grf>;
+        rockchip,hw-tshut-temp = <95000>;
           status = "disabled";
       };
         gmac: ethernet@ff290000 {
           compatible = "rockchip,rk3288-gmac";
           reg = <0xff290000 0x10000>;
-        interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
-        interrupt-names = "macirq";
+        interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>,
+                <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
+        interrupt-names = "macirq", "eth_wake_irq";
           rockchip,grf = <&grf>;
           clocks = <&cru SCLK_MAC>,
               <&cru SCLK_MAC_RX>, <&cru SCLK_MAC_TX>,
@@ -400,6 +569,9 @@
               "mac_clk_rx", "mac_clk_tx",
               "clk_mac_ref", "clk_mac_refout",
               "aclk_mac", "pclk_mac";
+        resets = <&cru SRST_MAC>;
+        reset-names = "stmmaceth";
+        status = "disabled";
       };
         usb_host0_ehci: usb@ff500000 {
@@ -407,16 +579,15 @@
           reg = <0xff500000 0x100>;
           interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
           clocks = <&cru HCLK_USBHOST0>;
-        clock-names = "usbhost";
           phys = <&usbphy1>;
           phy-names = "usb";
           status = "disabled";
       };

  -    /* NOTE: doesn't work on RK3288, but fixed on RK3288W */ +    /* NOTE: doesn't work on RK3288, but was fixed on RK3288W */
      usb_host0_ohci: usb@ff520000 {
          compatible = "generic-ohci";
-        reg = <0x0 0xff520000 0x0 0x100>;
+        reg = <0xff520000 0x100>;
          interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cru HCLK_USBHOST0>;
          phys = <&usbphy1>;

arch/arm/dts/rk3288.dtsi +2 -0
@@ -431,8 +602,10 @@
           interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
           clocks = <&cru HCLK_USBHOST1>;
           clock-names = "otg";
+        dr_mode = "host";
           phys = <&usbphy2>;
           phy-names = "usb2-phy";
+        snps,reset-phy-on-wake;
           status = "disabled";
       };

  @@ -444,6 +617,9 @@
          clocks = <&cru HCLK_OTG0>;
          clock-names = "otg";
          dr_mode = "otg";
+        g-np-tx-fifo-size = <16>;
+        g-rx-fifo-size = <275>;
+        g-tx-fifo-size = <256 128 128 64 64 32>;
          phys = <&usbphy0>;
          phy-names = "usb2-phy";
          status = "disabled";

arch/arm/dts/rk3288.dtsi +13 -1
@@ -454,7 +630,19 @@
           reg = <0xff5c0000 0x100>;
           interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
           clocks = <&cru HCLK_HSIC>;
-        clock-names = "usbhost";
+        status = "disabled";
+    };
+
+    dmac_bus_ns: dma-controller@ff600000 {
+        compatible = "arm,pl330", "arm,primecell";
+        reg = <0xff600000 0x4000>;
+        interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+                 <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
+        #dma-cells = <1>;
+        arm,pl330-broken-no-flushp;
+        arm,pl330-periph-burst;
+        clocks = <&cru ACLK_DMAC1>;
+        clock-names = "apb_pclk";
           status = "disabled";
       };

  @@ -490,9 +678,7 @@
          #pwm-cells = <3>;
          pinctrl-names = "default";
          pinctrl-0 = <&pwm0_pin>;
-        clocks = <&cru PCLK_PWM>;
-        clock-names = "pwm";
-        rockchip,grf = <&grf>;
+        clocks = <&cru PCLK_RKPWM>;
          status = "disabled";
      };
  @@ -502,9 +688,7 @@
          #pwm-cells = <3>;
          pinctrl-names = "default";
          pinctrl-0 = <&pwm1_pin>;
-        clocks = <&cru PCLK_PWM>;
-        clock-names = "pwm";
-        rockchip,grf = <&grf>;
+        clocks = <&cru PCLK_RKPWM>;
          status = "disabled";
      };
  @@ -514,25 +698,21 @@
          #pwm-cells = <3>;
          pinctrl-names = "default";
          pinctrl-0 = <&pwm2_pin>;
-        clocks = <&cru PCLK_PWM>;
-        clock-names = "pwm";
-        rockchip,grf = <&grf>;
+        clocks = <&cru PCLK_RKPWM>;
          status = "disabled";
      };
        pwm3: pwm@ff680030 {
          compatible = "rockchip,rk3288-pwm";
          reg = <0xff680030 0x10>;
-        #pwm-cells = <2>;
+        #pwm-cells = <3>;
          pinctrl-names = "default";
          pinctrl-0 = <&pwm3_pin>;
-        clocks = <&cru PCLK_PWM>;
-        clock-names = "pwm";
-        rockchip,grf = <&grf>;
+        clocks = <&cru PCLK_RKPWM>;
          status = "disabled";
      };
  -    bus_intmem: bus_intmem@ff700000 {
+    bus_intmem: sram@ff700000 {
          compatible = "mmio-sram";
          reg = <0xff700000 0x18000>;
          #address-cells = <1>;

arch/arm/dts/rk3288.dtsi +174 -3
@@ -544,14 +724,134 @@
           };
       };
   -    sram@ff720000 {
+    pmu_sram: sram@ff720000 {
           compatible = "rockchip,rk3288-pmu-sram", "mmio-sram";
           reg = <0xff720000 0x1000>;
       };
         pmu: power-management@ff730000 {
-        compatible = "rockchip,rk3288-pmu", "syscon";
+        compatible = "rockchip,rk3288-pmu", "syscon", "simple-mfd";
           reg = <0xff730000 0x100>;
+
+        power: power-controller {
+            compatible = "rockchip,rk3288-power-controller";
+            #power-domain-cells = <1>;
+            #address-cells = <1>;
+            #size-cells = <0>;
+
+            assigned-clocks = <&cru SCLK_EDP_24M>;
+            assigned-clock-parents = <&xin24m>;
+
+            /*
+             * Note: Although SCLK_* are the working clocks
+             * of device without including on the NOC, needed for
+             * synchronous reset.
+             *
+             * The clocks on the which NOC:
+             * ACLK_IEP/ACLK_VIP/ACLK_VOP0 are on ACLK_VIO0_NIU.
+             * ACLK_ISP/ACLK_VOP1 are on ACLK_VIO1_NIU.
+             * ACLK_RGA is on ACLK_RGA_NIU.
+             * The others (HCLK_*,PLCK_*) are on HCLK_VIO_NIU.
+             *
+             * Which clock are device clocks:
+             *    clocks        devices
+             *    *_IEP        IEP:Image Enhancement Processor
+             *    *_ISP        ISP:Image Signal Processing
+             *    *_VIP        VIP:Video Input Processor
+             *    *_VOP*        VOP:Visual Output Processor
+             *    *_RGA        RGA
+             *    *_EDP*        EDP
+             *    *_LVDS_*    LVDS
+             *    *_HDMI        HDMI
+             *    *_MIPI_*    MIPI
+             */
+            power-domain@RK3288_PD_VIO {
+                reg = <RK3288_PD_VIO>;
+                clocks = <&cru ACLK_IEP>,
+                     <&cru ACLK_ISP>,
+                     <&cru ACLK_RGA>,
+                     <&cru ACLK_VIP>,
+                     <&cru ACLK_VOP0>,
+                     <&cru ACLK_VOP1>,
+                     <&cru DCLK_VOP0>,
+                     <&cru DCLK_VOP1>,
+                     <&cru HCLK_IEP>,
+                     <&cru HCLK_ISP>,
+                     <&cru HCLK_RGA>,
+                     <&cru HCLK_VIP>,
+                     <&cru HCLK_VOP0>,
+                     <&cru HCLK_VOP1>,
+                     <&cru PCLK_EDP_CTRL>,
+                     <&cru PCLK_HDMI_CTRL>,
+                     <&cru PCLK_LVDS_PHY>,
+                     <&cru PCLK_MIPI_CSI>,
+                     <&cru PCLK_MIPI_DSI0>,
+                     <&cru PCLK_MIPI_DSI1>,
+                     <&cru SCLK_EDP_24M>,
+                     <&cru SCLK_EDP>,
+                     <&cru SCLK_ISP_JPE>,
+                     <&cru SCLK_ISP>,
+                     <&cru SCLK_RGA>;
+                pm_qos = <&qos_vio0_iep>,
+                     <&qos_vio1_vop>,
+                     <&qos_vio1_isp_w0>,
+                     <&qos_vio1_isp_w1>,
+                     <&qos_vio0_vop>,
+                     <&qos_vio0_vip>,
+                     <&qos_vio2_rga_r>,
+                     <&qos_vio2_rga_w>,
+                     <&qos_vio1_isp_r>;
+                #power-domain-cells = <0>;
+            };
+
+            /*
+             * Note: The following 3 are HEVC(H.265) clocks,
+             * and on the ACLK_HEVC_NIU (NOC).
+             */
+            power-domain@RK3288_PD_HEVC {
+                reg = <RK3288_PD_HEVC>;
+                clocks = <&cru ACLK_HEVC>,
+                     <&cru SCLK_HEVC_CABAC>,
+                     <&cru SCLK_HEVC_CORE>;
+                pm_qos = <&qos_hevc_r>,
+                     <&qos_hevc_w>;
+                #power-domain-cells = <0>;
+            };
+
+            /*
+             * Note: ACLK_VCODEC/HCLK_VCODEC are VCODEC
+             * (video endecoder & decoder) clocks that on the
+             * ACLK_VCODEC_NIU and HCLK_VCODEC_NIU (NOC).
+             */
+            power-domain@RK3288_PD_VIDEO {
+                reg = <RK3288_PD_VIDEO>;
+                clocks = <&cru ACLK_VCODEC>,
+                     <&cru HCLK_VCODEC>;
+                pm_qos = <&qos_video>;
+                #power-domain-cells = <0>;
+            };
+
+            /*
+             * Note: ACLK_GPU is the GPU clock,
+             * and on the ACLK_GPU_NIU (NOC).
+             */
+            power-domain@RK3288_PD_GPU {
+                reg = <RK3288_PD_GPU>;
+                clocks = <&cru ACLK_GPU>;
+                pm_qos = <&qos_gpu_r>,
+                     <&qos_gpu_w>;
+                #power-domain-cells = <0>;
+            };
+        };
+
+        reboot-mode {
+            compatible = "syscon-reboot-mode";
+            offset = <0x94>;
+            mode-normal = <BOOT_NORMAL>;
+            mode-recovery = <BOOT_RECOVERY>;
+            mode-bootloader = <BOOT_FASTBOOT>;
+            mode-loader = <BOOT_BL_DOWNLOAD>;
+        };
       };
         sgrf: syscon@ff740000 {
@@ -578,15 +878,65 @@
       };
         grf: syscon@ff770000 {
-        compatible = "rockchip,rk3288-grf", "syscon";
+        compatible = "rockchip,rk3288-grf", "syscon", "simple-mfd";
           reg = <0xff770000 0x1000>;
+
+        edp_phy: edp-phy {
+            compatible = "rockchip,rk3288-dp-phy";
+            clocks = <&cru SCLK_EDP_24M>;
+            clock-names = "24m";
+            #phy-cells = <0>;
+            status = "disabled";
+        };
+
+        io_domains: io-domains {
+            compatible = "rockchip,rk3288-io-voltage-domain";
+            status = "disabled";
+        };
+
+        usbphy: usbphy {
+            compatible = "rockchip,rk3288-usb-phy";
+            #address-cells = <1>;
+            #size-cells = <0>;
+            status = "disabled";
+
+            usbphy0: usb-phy@320 {
+                #phy-cells = <0>;
+                reg = <0x320>;
+                clocks = <&cru SCLK_OTGPHY0>;
+                clock-names = "phyclk";
+                #clock-cells = <0>;
+                resets = <&cru SRST_USBOTG_PHY>;
+                reset-names = "phy-reset";
+            };
+
+            usbphy1: usb-phy@334 {
+                #phy-cells = <0>;
+                reg = <0x334>;
+                clocks = <&cru SCLK_OTGPHY1>;
+                clock-names = "phyclk";
+                #clock-cells = <0>;
+                resets = <&cru SRST_USBHOST0_PHY>;
+                reset-names = "phy-reset";
+            };
+
+            usbphy2: usb-phy@348 {
+                #phy-cells = <0>;
+                reg = <0x348>;
+                clocks = <&cru SCLK_OTGPHY2>;
+                clock-names = "phyclk";
+                #clock-cells = <0>;
+                resets = <&cru SRST_USBHOST1_PHY>;
+                reset-names = "phy-reset";
+            };
+        };
       };
         wdt: watchdog@ff800000 {
           compatible = "rockchip,rk3288-wdt", "snps,dw-wdt";
           reg = <0xff800000 0x100>;
           clocks = <&cru PCLK_WDT>;
-        interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
+        interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
           status = "disabled";
       };

  @@ -594,11 +944,11 @@
          compatible = "rockchip,rk3288-spdif", "rockchip,rk3066-spdif"; reg = <0xff8b0000 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 85 IRQ_TYPE_LEVEL_HIGH>;
+        interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>; pinctrl-names = "default";
          pinctrl-0 = <&spdif_tx>;
          rockchip,grf = <&grf>;

arch/arm/dts/rk3288.dtsi +50 -7
@@ -608,50 +958,97 @@
       i2s: i2s@ff890000 {
           compatible = "rockchip,rk3288-i2s", "rockchip,rk3066-i2s";
           reg = <0xff890000 0x10000>;
-        interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
-        #address-cells = <1>;
-        #size-cells = <0>;
-        #sound-dai-cells = <1>;
+        #sound-dai-cells = <0>;
+        interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
+        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>;
+        rockchip,capture-channels = <2>;
+        status = "disabled";
+    };
+
+    crypto: cypto-controller@ff8a0000 {
+        compatible = "rockchip,rk3288-crypto";
+        reg = <0xff8a0000 0x4000>;
+        interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&cru ACLK_CRYPTO>, <&cru HCLK_CRYPTO>,
+             <&cru SCLK_CRYPTO>, <&cru ACLK_DMAC1>;
+        clock-names = "aclk", "hclk", "sclk", "apb_pclk";
+        resets = <&cru SRST_CRYPTO>;
+        reset-names = "crypto-rst";
+    };
+
+    iep_mmu: iommu@ff900800 {
+        compatible = "rockchip,iommu";
+        reg = <0xff900800 0x40>;
+        interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>;
+        clock-names = "aclk", "iface";
+        #iommu-cells = <0>;
+        status = "disabled";
+    };
+
+    isp_mmu: iommu@ff914000 {
+        compatible = "rockchip,iommu";
+        reg = <0xff914000 0x100>, <0xff915000 0x100>;
+        interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&cru ACLK_ISP>, <&cru HCLK_ISP>;
+        clock-names = "aclk", "iface";
+        #iommu-cells = <0>;
+        rockchip,disable-mmu-reset;
           status = "disabled";
       };
   +    rga: rga@ff920000 {
+        compatible = "rockchip,rk3288-rga";
+        reg = <0xff920000 0x180>;
+        interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru SCLK_RGA>;
+        clock-names = "aclk", "hclk", "sclk";
+        power-domains = <&power RK3288_PD_VIO>;
+        resets = <&cru SRST_RGA_CORE>, <&cru SRST_RGA_AXI>, <&cru
 SRST_RGA_AHB>;
+        reset-names = "core", "axi", "ahb";
+    };
+
       vopb: vop@ff930000 {
           compatible = "rockchip,rk3288-vop";
-        reg = <0xff930000 0x19c>;
+        reg = <0xff930000 0x19c>, <0xff931000 0x1000>;
           interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
           clocks = <&cru ACLK_VOP0>, <&cru DCLK_VOP0>, <&cru HCLK_VOP0>;
           clock-names = "aclk_vop", "dclk_vop", "hclk_vop";
+        power-domains = <&power RK3288_PD_VIO>;

          resets = <&cru SRST_LCDC0_AXI>, <&cru SRST_LCDC0_AHB>, <&cru SRST_LCDC0_DCLK>;
          reset-names = "axi", "ahb", "dclk";
          iommus = <&vopb_mmu>;
-        power-domains = <&power RK3288_PD_VIO>;
          status = "disabled";
+
          vopb_out: port {
              #address-cells = <1>;
              #size-cells = <0>;
-            vopb_out_edp: endpoint@0 {
+
+            vopb_out_hdmi: endpoint@0 {
                  reg = <0>;
-                remote-endpoint = <&edp_in_vopb>;
+                remote-endpoint = <&hdmi_in_vopb>;
              };
-            vopb_out_hdmi: endpoint@1 {
+
+            vopb_out_edp: endpoint@1 {
                  reg = <1>;
-                remote-endpoint = <&hdmi_in_vopb>;
+                remote-endpoint = <&edp_in_vopb>;
              };
-            vopb_out_lvds: endpoint@2 {
+
+            vopb_out_mipi: endpoint@2 {
                  reg = <2>;
-                remote-endpoint = <&lvds_in_vopb>;
-            };
-            vopb_out_mipi: endpoint@3 {
-                reg = <3>;
                  remote-endpoint = <&mipi_in_vopb>;
              };
  +            vopb_out_lvds: endpoint@3 {
+                reg = <3>;
+                remote-endpoint = <&lvds_in_vopb>;
+            };
          };
      };
  @@ -659,7 +1056,8 @@
          compatible = "rockchip,iommu";
          reg = <0xff930300 0x100>;
          interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
-        interrupt-names = "vopb_mmu";
+        clocks = <&cru ACLK_VOP0>, <&cru HCLK_VOP0>;
+        clock-names = "aclk", "iface";
          power-domains = <&power RK3288_PD_VIO>; #iommu-cells = <0>;
          status = "disabled";

arch/arm/dts/rk3288.dtsi +2 -1
@@ -667,35 +1065,39 @@
         vopl: vop@ff940000 {
           compatible = "rockchip,rk3288-vop";
-        reg = <0xff940000 0x19c>;
+        reg = <0xff940000 0x19c>, <0xff941000 0x1000>;
           interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
           clocks = <&cru ACLK_VOP1>, <&cru DCLK_VOP1>, <&cru HCLK_VOP1>;
           clock-names = "aclk_vop", "dclk_vop", "hclk_vop";
+        power-domains = <&power RK3288_PD_VIO>;

          resets = <&cru SRST_LCDC1_AXI>, <&cru SRST_LCDC1_AHB>, <&cru SRST_LCDC1_DCLK>;
          reset-names = "axi", "ahb", "dclk";
          iommus = <&vopl_mmu>;
-        power-domains = <&power RK3288_PD_VIO>;
          status = "disabled";
+
          vopl_out: port {
              #address-cells = <1>;
              #size-cells = <0>;
-            vopl_out_edp: endpoint@0 {
+
+            vopl_out_hdmi: endpoint@0 {
                  reg = <0>;
-                remote-endpoint = <&edp_in_vopl>;
+                remote-endpoint = <&hdmi_in_vopl>;
              };
-            vopl_out_hdmi: endpoint@1 {
+
+            vopl_out_edp: endpoint@1 {
                  reg = <1>;
-                remote-endpoint = <&hdmi_in_vopl>;
+                remote-endpoint = <&edp_in_vopl>;
              };
-            vopl_out_lvds: endpoint@2 {
+
+            vopl_out_mipi: endpoint@2 {
                  reg = <2>;
-                remote-endpoint = <&lvds_in_vopl>;
-            };
-            vopl_out_mipi: endpoint@3 {
-                reg = <3>;
                  remote-endpoint = <&mipi_in_vopl>;
              };
  +            vopl_out_lvds: endpoint@3 {
+                reg = <3>;
+                remote-endpoint = <&lvds_in_vopl>;
+            };
          };
      };
  @@ -703,60 +1105,34 @@
          compatible = "rockchip,iommu";
          reg = <0xff940300 0x100>;
          interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
-        interrupt-names = "vopl_mmu";
+        clocks = <&cru ACLK_VOP1>, <&cru HCLK_VOP1>;
+        clock-names = "aclk", "iface";
          power-domains = <&power RK3288_PD_VIO>; #iommu-cells = <0>;
          status = "disabled";
      };
  -    edp: edp@ff970000 {
-        compatible = "rockchip,rk3288-edp";
-        reg = <0xff970000 0x4000>;
-        interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
-        clocks = <&cru SCLK_EDP>, <&cru SCLK_EDP_24M>, <&cru PCLK_EDP_CTRL>;
-        rockchip,grf = <&grf>;
-        clock-names = "clk_edp", "clk_edp_24m", "pclk_edp"; -        resets = <&cru 111>;
-        reset-names = "edp";
+    mipi_dsi: mipi@ff960000 {
+        compatible = "rockchip,rk3288-mipi-dsi", "snps,dw-mipi-dsi"; +        reg = <0xff960000 0x4000>;
+        interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&cru SCLK_MIPIDSI_24M>, <&cru PCLK_MIPI_DSI0>; +        clock-names = "ref", "pclk";
          power-domains = <&power RK3288_PD_VIO>;
-        status = "disabled";
-        ports {
-            edp_in: port {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                edp_in_vopb: endpoint@0 {
-                    reg = <0>;
-                    remote-endpoint = <&vopb_out_edp>;
-                };
-                edp_in_vopl: endpoint@1 {
-                    reg = <1>;
-                    remote-endpoint = <&vopl_out_edp>;
-                };
-            };
-        };
-    };
-
-    hdmi: hdmi@ff980000 {
-        compatible = "rockchip,rk3288-dw-hdmi";
-        reg = <0xff980000 0x20000>;
-        reg-io-width = <4>;
-        ddc-i2c-bus = <&i2c5>;
          rockchip,grf = <&grf>;
-        interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
-        clocks = <&cru  PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>; -        clock-names = "iahb", "isfr";
          status = "disabled";
+
          ports {
-            hdmi_in: port {
+            mipi_in: port {
                  #address-cells = <1>;
                  #size-cells = <0>;
-                hdmi_in_vopb: endpoint@0 {
+                mipi_in_vopb: endpoint@0 {
                      reg = <0>;
-                    remote-endpoint = <&vopb_out_hdmi>;
+                    remote-endpoint = <&vopb_out_mipi>;
                  };
-                hdmi_in_vopl: endpoint@1 {
+                mipi_in_vopl: endpoint@1 {
                      reg = <1>;
-                    remote-endpoint = <&vopl_out_hdmi>;
+                    remote-endpoint = <&vopl_out_mipi>;
                  };
              };
          };

arch/arm/dts/rk3288.dtsi +192 -74
@@ -767,17 +1143,22 @@
           reg = <0xff96c000 0x4000>;
           clocks = <&cru PCLK_LVDS_PHY>;
           clock-names = "pclk_lvds";
-        pinctrl-names = "default";
-        pinctrl-0 = <&lcdc0_ctl>;
+        pinctrl-names = "lcdc";
+        pinctrl-0 = <&lcdc_ctl>;
+        power-domains = <&power RK3288_PD_VIO>;
           rockchip,grf = <&grf>;
           status = "disabled";
+
           ports {
               #address-cells = <1>;
               #size-cells = <0>;
+
               lvds_in: port@0 {
                   reg = <0>;
+
                   #address-cells = <1>;
                   #size-cells = <0>;
+
                   lvds_in_vopb: endpoint@0 {
                       reg = <0>;
                       remote-endpoint = <&vopb_out_lvds>;
@@ -790,90 +1171,233 @@
           };
       };
   -    mipi_dsi0: mipi@ff960000 {
-        compatible = "rockchip,rk3288_mipi_dsi";
-        reg = <0xff960000 0x4000>;
-        clocks = <&cru PCLK_MIPI_DSI0>;
-        clock-names = "pclk_mipi";
-        /*pinctrl-names = "default";
-        pinctrl-0 = <&lcdc0_ctl>;*/
+    edp: dp@ff970000 {
+        compatible = "rockchip,rk3288-dp";
+        reg = <0xff970000 0x4000>;
+        interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&cru SCLK_EDP>, <&cru PCLK_EDP_CTRL>;
+        clock-names = "dp", "pclk";
+        phys = <&edp_phy>;
+        phy-names = "dp";
+        resets = <&cru SRST_EDP>;
+        reset-names = "dp";
           rockchip,grf = <&grf>;
-        #address-cells = <1>;
-        #size-cells = <0>;
           status = "disabled";
+
           ports {
-            reg = <1>;
-            mipi_in: port {
+            #address-cells = <1>;
+            #size-cells = <0>;
+            edp_in: port@0 {
+                reg = <0>;
                   #address-cells = <1>;
                   #size-cells = <0>;
-                mipi_in_vopb: endpoint@0 {
+                edp_in_vopb: endpoint@0 {
                       reg = <0>;
-                    remote-endpoint = <&vopb_out_mipi>;
+                    remote-endpoint = <&vopb_out_edp>;
                   };
-                mipi_in_vopl: endpoint@1 {
+                edp_in_vopl: endpoint@1 {
                       reg = <1>;
-                    remote-endpoint = <&vopl_out_mipi>;
+                    remote-endpoint = <&vopl_out_edp>;
                   };
               };
           };
       };
   -    hdmi_audio: hdmi_audio {
-        compatible = "rockchip,rk3288-hdmi-audio";
-        i2s-controller = <&i2s>;
-        status = "disable";
+    hdmi: hdmi@ff980000 {
+        compatible = "rockchip,rk3288-dw-hdmi";
+        reg = <0xff980000 0x20000>;
+        reg-io-width = <4>;
+        #sound-dai-cells = <0>;
+        rockchip,grf = <&grf>;
+        interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&cru  PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>, <&cru
 SCLK_HDMI_CEC>;
+        clock-names = "iahb", "isfr", "cec";
+        power-domains = <&power RK3288_PD_VIO>;
+        status = "disabled";
+
+        ports {
+            hdmi_in: port {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                hdmi_in_vopb: endpoint@0 {
+                    reg = <0>;
+                    remote-endpoint = <&vopb_out_hdmi>;
+                };
+                hdmi_in_vopl: endpoint@1 {
+                    reg = <1>;
+                    remote-endpoint = <&vopl_out_hdmi>;
+                };
+            };
+        };
       };
         vpu: video-codec@ff9a0000 {
           compatible = "rockchip,rk3288-vpu";
           reg = <0xff9a0000 0x800>;
           interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
-                <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+                 <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
           interrupt-names = "vepu", "vdpu";
           clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
-        clock-names = "aclk_vcodec", "hclk_vcodec";
-        power-domains = <&power RK3288_PD_VIDEO>;
+        clock-names = "aclk", "hclk";
           iommus = <&vpu_mmu>;
+        power-domains = <&power RK3288_PD_VIDEO>;
       };
         vpu_mmu: iommu@ff9a0800 {
           compatible = "rockchip,iommu";
           reg = <0xff9a0800 0x100>;
           interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
-        interrupt-names = "vpu_mmu";
+        clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
+        clock-names = "aclk", "iface";
+        #iommu-cells = <0>;
           power-domains = <&power RK3288_PD_VIDEO>;
+    };
+
+    hevc_mmu: iommu@ff9c0440 {
+        compatible = "rockchip,iommu";
+        reg = <0xff9c0440 0x40>, <0xff9c0480 0x40>;
+        interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&cru ACLK_HEVC>, <&cru HCLK_HEVC>;
+        clock-names = "aclk", "iface";
           #iommu-cells = <0>;
+        status = "disabled";
       };
         gpu: gpu@ffa30000 {
-        compatible = "arm,malit764",
-                 "arm,malit76x",
-                 "arm,malit7xx",
-                 "arm,mali-midgard";
+        compatible = "rockchip,rk3288-mali", "arm,mali-t760";
           reg = <0xffa30000 0x10000>;
           interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
                    <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
                    <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
-        interrupt-names = "JOB", "MMU", "GPU";
+        interrupt-names = "job", "mmu", "gpu";
           clocks = <&cru ACLK_GPU>;
-        clock-names = "aclk_gpu";
-        operating-points = <
-            /* KHz uV */
-            100000 950000
-            200000 950000
-            300000 1000000
-            400000 1100000
-            /* 500000 1200000 - See crosbug.com/p/33857 */
-            600000 1250000
-        >;
+        operating-points-v2 = <&gpu_opp_table>;
+        #cooling-cells = <2>; /* min followed by max */
           power-domains = <&power RK3288_PD_GPU>;
           status = "disabled";
       };
   +    gpu_opp_table: opp-table-1 {
+        compatible = "operating-points-v2";
+
+        opp-100000000 {
+            opp-hz = /bits/ 64 <100000000>;
+            opp-microvolt = <950000>;
+        };
+        opp-200000000 {
+            opp-hz = /bits/ 64 <200000000>;
+            opp-microvolt = <950000>;
+        };
+        opp-300000000 {
+            opp-hz = /bits/ 64 <300000000>;
+            opp-microvolt = <1000000>;
+        };
+        opp-400000000 {
+            opp-hz = /bits/ 64 <400000000>;
+            opp-microvolt = <1100000>;
+        };
+        opp-600000000 {
+            opp-hz = /bits/ 64 <600000000>;
+            opp-microvolt = <1250000>;
+        };
+    };
+
+    qos_gpu_r: qos@ffaa0000 {
+        compatible = "rockchip,rk3288-qos", "syscon";
+        reg = <0xffaa0000 0x20>;
+    };
+
+    qos_gpu_w: qos@ffaa0080 {
+        compatible = "rockchip,rk3288-qos", "syscon";
+        reg = <0xffaa0080 0x20>;
+    };
+
+    qos_vio1_vop: qos@ffad0000 {
+        compatible = "rockchip,rk3288-qos", "syscon";
+        reg = <0xffad0000 0x20>;
+    };
+
+    qos_vio1_isp_w0: qos@ffad0100 {
+        compatible = "rockchip,rk3288-qos", "syscon";
+        reg = <0xffad0100 0x20>;
+    };
+
+    qos_vio1_isp_w1: qos@ffad0180 {
+        compatible = "rockchip,rk3288-qos", "syscon";
+        reg = <0xffad0180 0x20>;
+    };
+
+    qos_vio0_vop: qos@ffad0400 {
+        compatible = "rockchip,rk3288-qos", "syscon";
+        reg = <0xffad0400 0x20>;
+    };
+
+    qos_vio0_vip: qos@ffad0480 {
+        compatible = "rockchip,rk3288-qos", "syscon";
+        reg = <0xffad0480 0x20>;
+    };
+
+    qos_vio0_iep: qos@ffad0500 {
+        compatible = "rockchip,rk3288-qos", "syscon";
+        reg = <0xffad0500 0x20>;
+    };
+
+    qos_vio2_rga_r: qos@ffad0800 {
+        compatible = "rockchip,rk3288-qos", "syscon";
+        reg = <0xffad0800 0x20>;
+    };
+
+    qos_vio2_rga_w: qos@ffad0880 {
+        compatible = "rockchip,rk3288-qos", "syscon";
+        reg = <0x0 0xffad0880 0x0 0x20>;
+    };
+
+    qos_vio1_isp_r: qos@ffad0900 {
+        compatible = "rockchip,rk3288-qos", "syscon";
+        reg = <0xffad0900 0x20>;
+    };
+
+    qos_video: qos@ffae0000 {
+        compatible = "rockchip,rk3288-qos", "syscon";
+        reg = <0xffae0000 0x20>;
+    };
+
+    qos_hevc_r: qos@ffaf0000 {
+        compatible = "rockchip,rk3288-qos", "syscon";
+        reg = <0xffaf0000 0x20>;
+    };
+
+    qos_hevc_w: qos@ffaf0080 {
+        compatible = "rockchip,rk3288-qos", "syscon";
+        reg = <0xffaf0080 0x20>;
+    };
+
+    dmac_bus_s: dma-controller@ffb20000 {
+        compatible = "arm,pl330", "arm,primecell";
+        reg = <0xffb20000 0x4000>;
+        interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+                 <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
+        #dma-cells = <1>;
+        arm,pl330-broken-no-flushp;
+        arm,pl330-periph-burst;
+        clocks = <&cru ACLK_DMAC1>;
+        clock-names = "apb_pclk";
+    };
+
       efuse: efuse@ffb40000 {
           compatible = "rockchip,rk3288-efuse";
-        reg = <0xffb40000 0x10000>;
-        status = "disabled";
+        reg = <0xffb40000 0x20>;
+        #address-cells = <1>;
+        #size-cells = <1>;
+        clocks = <&cru PCLK_EFUSE256>;
+        clock-names = "pclk_efuse";
+
+        cpu_id: cpu-id@7 {
+            reg = <0x07 0x10>;
+        };
+        cpu_leakage: cpu_leakage@17 {
+            reg = <0x17 0x1>;
+        };
       };
         gic: interrupt-controller@ffc01000 {
@@ -883,45 +1407,12 @@
           #address-cells = <0>;
             reg = <0xffc01000 0x1000>,
-              <0xffc02000 0x1000>,
+              <0xffc02000 0x2000>,
                 <0xffc04000 0x2000>,
                 <0xffc06000 0x2000>;
           interrupts = <GIC_PPI 9 0xf04>;
       };
   -    cpuidle: cpuidle {
-        compatible = "rockchip,rk3288-cpuidle";
-    };
-
-    usbphy: phy {
-        compatible = "rockchip,rk3288-usb-phy";
-        rockchip,grf = <&grf>;
-        #address-cells = <1>;
-        #size-cells = <0>;
-        status = "disabled";
-
-        usbphy0: usb-phy0 {
-            #phy-cells = <0>;
-            reg = <0x320>;
-            clocks = <&cru SCLK_OTGPHY0>;
-            clock-names = "phyclk";
-        };
-
-        usbphy1: usb-phy1 {
-            #phy-cells = <0>;
-            reg = <0x334>;
-            clocks = <&cru SCLK_OTGPHY1>;
-            clock-names = "phyclk";
-        };
-
-        usbphy2: usb-phy2 {
-            #phy-cells = <0>;
-            reg = <0x348>;
-            clocks = <&cru SCLK_OTGPHY2>;
-            clock-names = "phyclk";
-        };
-    };
-
       pinctrl: pinctrl {
           compatible = "rockchip,rk3288-pinctrl";
           rockchip,grf = <&grf>;
@@ -930,9 +1421,9 @@
           #size-cells = <1>;
           ranges;
   -        gpio0: gpio0@ff750000 {
+        gpio0: gpio@ff750000 {
               compatible = "rockchip,gpio-bank";
-            reg =    <0xff750000 0x100>;
+            reg = <0xff750000 0x100>;
               interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
               clocks = <&cru PCLK_GPIO0>;

  @@ -943,7 +1434,7 @@
              #interrupt-cells = <2>;
          };
  -        gpio1: gpio1@ff780000 {
+        gpio1: gpio@ff780000 {
              compatible = "rockchip,gpio-bank"; reg = <0xff780000 0x100>;
              interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/dts/rk3288.dtsi +176 -196
@@ -956,7 +1447,7 @@
               #interrupt-cells = <2>;
           };
   -        gpio2: gpio2@ff790000 {
+        gpio2: gpio@ff790000 {
               compatible = "rockchip,gpio-bank";
               reg = <0xff790000 0x100>;
               interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
@@ -969,7 +1460,7 @@
               #interrupt-cells = <2>;
           };
   -        gpio3: gpio3@ff7a0000 {
+        gpio3: gpio@ff7a0000 {
               compatible = "rockchip,gpio-bank";
               reg = <0xff7a0000 0x100>;
               interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
@@ -982,7 +1473,7 @@
               #interrupt-cells = <2>;
           };
   -        gpio4: gpio4@ff7b0000 {
+        gpio4: gpio@ff7b0000 {
               compatible = "rockchip,gpio-bank";
               reg = <0xff7b0000 0x100>;
               interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
@@ -995,7 +1486,7 @@
               #interrupt-cells = <2>;
           };
   -        gpio5: gpio5@ff7c0000 {
+        gpio5: gpio@ff7c0000 {
               compatible = "rockchip,gpio-bank";
               reg = <0xff7c0000 0x100>;
               interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
@@ -1008,7 +1499,7 @@
               #interrupt-cells = <2>;
           };
   -        gpio6: gpio6@ff7d0000 {
+        gpio6: gpio@ff7d0000 {
               compatible = "rockchip,gpio-bank";
               reg = <0xff7d0000 0x100>;
               interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
@@ -1021,7 +1512,7 @@
               #interrupt-cells = <2>;
           };
   -        gpio7: gpio7@ff7e0000 {
+        gpio7: gpio@ff7e0000 {
               compatible = "rockchip,gpio-bank";
               reg = <0xff7e0000 0x100>;
               interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
@@ -1034,7 +1525,7 @@
               #interrupt-cells = <2>;
           };
   -        gpio8: gpio8@ff7f0000 {
+        gpio8: gpio@ff7f0000 {
               compatible = "rockchip,gpio-bank";
               reg = <0xff7f0000 0x100>;
               interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
@@ -1051,6 +1542,24 @@
               hdmi_cec_c0: hdmi-cec-c0 {
                   rockchip,pins = <7 RK_PC0 2 &pcfg_pull_none>;
               };
+
+            hdmi_cec_c7: hdmi-cec-c7 {
+                rockchip,pins = <7 RK_PC7 4 &pcfg_pull_none>;
+            };
+
+            hdmi_ddc: hdmi-ddc {
+                rockchip,pins = <7 RK_PC3 2 &pcfg_pull_none>,
+                        <7 RK_PC4 2 &pcfg_pull_none>;
+            };
+
+            hdmi_ddc_unwedge: hdmi-ddc-unwedge {
+                rockchip,pins = <7 RK_PC3 RK_FUNC_GPIO
 &pcfg_output_low>,
+                        <7 RK_PC4 2 &pcfg_pull_none>;
+            };
+        };
+
+        pcfg_output_low: pcfg-output-low {
+            output-low;
           };
             pcfg_pull_up: pcfg-pull-up {
@@ -1070,472 +1579,424 @@
               drive-strength = <12>;
           };
   -        sleep {
+        suspend {
               global_pwroff: global-pwroff {
-                rockchip,pins = <0 0 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <0 RK_PA0 1 &pcfg_pull_none>;
               };
                 ddrio_pwroff: ddrio-pwroff {
-                rockchip,pins = <0 1 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <0 RK_PA1 1 &pcfg_pull_none>;
               };
                 ddr0_retention: ddr0-retention {
-                rockchip,pins = <0 2 RK_FUNC_1 &pcfg_pull_up>;
+                rockchip,pins = <0 RK_PA2 1 &pcfg_pull_up>;
               };
                 ddr1_retention: ddr1-retention {
-                rockchip,pins = <0 3 RK_FUNC_1 &pcfg_pull_up>;
+                rockchip,pins = <0 RK_PA3 1 &pcfg_pull_up>;
+            };
+        };
+
+        edp {
+            edp_hpd: edp-hpd {
+                rockchip,pins = <7 RK_PB3 2 &pcfg_pull_down>;
               };
           };
             i2c0 {
               i2c0_xfer: i2c0-xfer {
-                rockchip,pins = <0 15 RK_FUNC_1 &pcfg_pull_none>,
-                        <0 16 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <0 RK_PB7 1 &pcfg_pull_none>,
+                        <0 RK_PC0 1 &pcfg_pull_none>;
               };
           };
             i2c1 {
               i2c1_xfer: i2c1-xfer {
-                rockchip,pins = <8 4 RK_FUNC_1 &pcfg_pull_none>,
-                        <8 5 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <8 RK_PA4 1 &pcfg_pull_none>,
+                        <8 RK_PA5 1 &pcfg_pull_none>;
               };
           };
             i2c2 {
               i2c2_xfer: i2c2-xfer {
-                rockchip,pins = <6 9 RK_FUNC_1 &pcfg_pull_none>,
-                        <6 10 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <6 RK_PB1 1 &pcfg_pull_none>,
+                        <6 RK_PB2 1 &pcfg_pull_none>;
               };
           };
             i2c3 {
               i2c3_xfer: i2c3-xfer {
-                rockchip,pins = <2 16 RK_FUNC_1 &pcfg_pull_none>,
-                        <2 17 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <2 RK_PC0 1 &pcfg_pull_none>,
+                        <2 RK_PC1 1 &pcfg_pull_none>;
               };
           };
             i2c4 {
               i2c4_xfer: i2c4-xfer {
-                rockchip,pins = <7 17 RK_FUNC_1 &pcfg_pull_none>,
-                        <7 18 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <7 RK_PC1 1 &pcfg_pull_none>,
+                        <7 RK_PC2 1 &pcfg_pull_none>;
               };
           };
             i2c5 {
               i2c5_xfer: i2c5-xfer {
-                rockchip,pins = <7 19 RK_FUNC_1 &pcfg_pull_none>,
-                        <7 20 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <7 RK_PC3 1 &pcfg_pull_none>,
+                        <7 RK_PC4 1 &pcfg_pull_none>;
               };
           };
             i2s0 {
               i2s0_bus: i2s0-bus {
-                rockchip,pins = <6 0 RK_FUNC_1 &pcfg_pull_none>,
-                        <6 1 RK_FUNC_1 &pcfg_pull_none>,
-                        <6 2 RK_FUNC_1 &pcfg_pull_none>,
-                        <6 3 RK_FUNC_1 &pcfg_pull_none>,
-                        <6 4 RK_FUNC_1 &pcfg_pull_none>,
-                        <6 8 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <6 RK_PA0 1 &pcfg_pull_none>,
+                        <6 RK_PA1 1 &pcfg_pull_none>,
+                        <6 RK_PA2 1 &pcfg_pull_none>,
+                        <6 RK_PA3 1 &pcfg_pull_none>,
+                        <6 RK_PA4 1 &pcfg_pull_none>,
+                        <6 RK_PB0 1 &pcfg_pull_none>;
               };
           };
   -        lcdc0 {
-            lcdc0_ctl: lcdc0-ctl {
-                rockchip,pins = <1 24 RK_FUNC_1 &pcfg_pull_none>,
-                        <1 25 RK_FUNC_1 &pcfg_pull_none>,
-                        <1 26 RK_FUNC_1 &pcfg_pull_none>,
-                        <1 27 RK_FUNC_1 &pcfg_pull_none>;
+        lcdc {
+            lcdc_ctl: lcdc-ctl {
+                rockchip,pins = <1 RK_PD0 1 &pcfg_pull_none>,
+                        <1 RK_PD1 1 &pcfg_pull_none>,
+                        <1 RK_PD2 1 &pcfg_pull_none>,
+                        <1 RK_PD3 1 &pcfg_pull_none>;
               };
           };
             sdmmc {
               sdmmc_clk: sdmmc-clk {
-                rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <6 RK_PC4 1 &pcfg_pull_none>;
               };
                 sdmmc_cmd: sdmmc-cmd {
-                rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up>;
+                rockchip,pins = <6 RK_PC5 1 &pcfg_pull_up>;
               };
   -            sdmmc_cd: sdmcc-cd {
-                rockchip,pins = <6 22 RK_FUNC_1 &pcfg_pull_up>;
+            sdmmc_cd: sdmmc-cd {
+                rockchip,pins = <6 RK_PC6 1 &pcfg_pull_up>;
               };
                 sdmmc_bus1: sdmmc-bus1 {
-                rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up>;
+                rockchip,pins = <6 RK_PC0 1 &pcfg_pull_up>;
               };
                 sdmmc_bus4: sdmmc-bus4 {
-                rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up>,
-                        <6 17 RK_FUNC_1 &pcfg_pull_up>,
-                        <6 18 RK_FUNC_1 &pcfg_pull_up>,
-                        <6 19 RK_FUNC_1 &pcfg_pull_up>;
+                rockchip,pins = <6 RK_PC0 1 &pcfg_pull_up>,
+                        <6 RK_PC1 1 &pcfg_pull_up>,
+                        <6 RK_PC2 1 &pcfg_pull_up>,
+                        <6 RK_PC3 1 &pcfg_pull_up>;
               };
           };
             sdio0 {
               sdio0_bus1: sdio0-bus1 {
-                rockchip,pins = <4 20 RK_FUNC_1 &pcfg_pull_up>;
+                rockchip,pins = <4 RK_PC4 1 &pcfg_pull_up>;
               };
                 sdio0_bus4: sdio0-bus4 {
-                rockchip,pins = <4 20 RK_FUNC_1 &pcfg_pull_up>,
-                        <4 21 RK_FUNC_1 &pcfg_pull_up>,
-                        <4 22 RK_FUNC_1 &pcfg_pull_up>,
-                        <4 23 RK_FUNC_1 &pcfg_pull_up>;
+                rockchip,pins = <4 RK_PC4 1 &pcfg_pull_up>,
+                        <4 RK_PC5 1 &pcfg_pull_up>,
+                        <4 RK_PC6 1 &pcfg_pull_up>,
+                        <4 RK_PC7 1 &pcfg_pull_up>;
               };
                 sdio0_cmd: sdio0-cmd {
-                rockchip,pins = <4 24 RK_FUNC_1 &pcfg_pull_up>;
+                rockchip,pins = <4 RK_PD0 1 &pcfg_pull_up>;
               };
                 sdio0_clk: sdio0-clk {
-                rockchip,pins = <4 25 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <4 RK_PD1 1 &pcfg_pull_none>;
               };
                 sdio0_cd: sdio0-cd {
-                rockchip,pins = <4 26 RK_FUNC_1 &pcfg_pull_up>;
+                rockchip,pins = <4 RK_PD2 1 &pcfg_pull_up>;
               };
                 sdio0_wp: sdio0-wp {
-                rockchip,pins = <4 27 RK_FUNC_1 &pcfg_pull_up>;
+                rockchip,pins = <4 RK_PD3 1 &pcfg_pull_up>;
               };
                 sdio0_pwr: sdio0-pwr {
-                rockchip,pins = <4 28 RK_FUNC_1 &pcfg_pull_up>;
+                rockchip,pins = <4 RK_PD4 1 &pcfg_pull_up>;
               };
                 sdio0_bkpwr: sdio0-bkpwr {
-                rockchip,pins = <4 29 RK_FUNC_1 &pcfg_pull_up>;
+                rockchip,pins = <4 RK_PD5 1 &pcfg_pull_up>;
               };
                 sdio0_int: sdio0-int {
-                rockchip,pins = <4 30 RK_FUNC_1 &pcfg_pull_up>;
+                rockchip,pins = <4 RK_PD6 1 &pcfg_pull_up>;
               };
           };
             sdio1 {
               sdio1_bus1: sdio1-bus1 {
-                rockchip,pins = <3 24 RK_FUNC_4 &pcfg_pull_up>;
+                rockchip,pins = <3 RK_PD0 4 &pcfg_pull_up>;
               };
                 sdio1_bus4: sdio1-bus4 {
-                rockchip,pins = <3 24 RK_FUNC_4 &pcfg_pull_up>,
-                        <3 25 RK_FUNC_4 &pcfg_pull_up>,
-                        <3 26 RK_FUNC_4 &pcfg_pull_up>,
-                        <3 27 RK_FUNC_4 &pcfg_pull_up>;
+                rockchip,pins = <3 RK_PD0 4 &pcfg_pull_up>,
+                        <3 RK_PD1 4 &pcfg_pull_up>,
+                        <3 RK_PD2 4 &pcfg_pull_up>,
+                        <3 RK_PD3 4 &pcfg_pull_up>;
               };
                 sdio1_cd: sdio1-cd {
-                rockchip,pins = <3 28 RK_FUNC_4 &pcfg_pull_up>;
+                rockchip,pins = <3 RK_PD4 4 &pcfg_pull_up>;
               };
                 sdio1_wp: sdio1-wp {
-                rockchip,pins = <3 29 RK_FUNC_4 &pcfg_pull_up>;
+                rockchip,pins = <3 RK_PD5 4 &pcfg_pull_up>;
               };
                 sdio1_bkpwr: sdio1-bkpwr {
-                rockchip,pins = <3 30 RK_FUNC_4 &pcfg_pull_up>;
+                rockchip,pins = <3 RK_PD6 4 &pcfg_pull_up>;
               };
                 sdio1_int: sdio1-int {
-                rockchip,pins = <3 31 RK_FUNC_4 &pcfg_pull_up>;
+                rockchip,pins = <3 RK_PD7 4 &pcfg_pull_up>;
               };
                 sdio1_cmd: sdio1-cmd {
-                rockchip,pins = <4 6 RK_FUNC_4 &pcfg_pull_up>;
+                rockchip,pins = <4 RK_PA6 4 &pcfg_pull_up>;
               };
                 sdio1_clk: sdio1-clk {
-                rockchip,pins = <4 7 RK_FUNC_4 &pcfg_pull_none>;
+                rockchip,pins = <4 RK_PA7 4 &pcfg_pull_none>;
               };
                 sdio1_pwr: sdio1-pwr {
-                rockchip,pins = <4 9 RK_FUNC_4 &pcfg_pull_up>;
+                rockchip,pins = <4 RK_PB1 4 &pcfg_pull_up>;
               };
           };
             emmc {
               emmc_clk: emmc-clk {
-                rockchip,pins = <3 18 RK_FUNC_2 &pcfg_pull_none>;
+                rockchip,pins = <3 RK_PC2 2 &pcfg_pull_none>;
               };
                 emmc_cmd: emmc-cmd {
-                rockchip,pins = <3 16 RK_FUNC_2 &pcfg_pull_up>;
+                rockchip,pins = <3 RK_PC0 2 &pcfg_pull_up>;
               };
                 emmc_pwr: emmc-pwr {
-                rockchip,pins = <3 9 RK_FUNC_2 &pcfg_pull_up>;
+                rockchip,pins = <3 RK_PB1 2 &pcfg_pull_up>;
               };
                 emmc_bus1: emmc-bus1 {
-                rockchip,pins = <3 0 RK_FUNC_2 &pcfg_pull_up>;
+                rockchip,pins = <3 RK_PA0 2 &pcfg_pull_up>;
               };
                 emmc_bus4: emmc-bus4 {
-                rockchip,pins = <3 0 RK_FUNC_2 &pcfg_pull_up>,
-                        <3 1 RK_FUNC_2 &pcfg_pull_up>,
-                        <3 2 RK_FUNC_2 &pcfg_pull_up>,
-                        <3 3 RK_FUNC_2 &pcfg_pull_up>;
+                rockchip,pins = <3 RK_PA0 2 &pcfg_pull_up>,
+                        <3 RK_PA1 2 &pcfg_pull_up>,
+                        <3 RK_PA2 2 &pcfg_pull_up>,
+                        <3 RK_PA3 2 &pcfg_pull_up>;
               };
                 emmc_bus8: emmc-bus8 {
-                rockchip,pins = <3 0 RK_FUNC_2 &pcfg_pull_up>,
-                        <3 1 RK_FUNC_2 &pcfg_pull_up>,
-                        <3 2 RK_FUNC_2 &pcfg_pull_up>,
-                        <3 3 RK_FUNC_2 &pcfg_pull_up>,
-                        <3 4 RK_FUNC_2 &pcfg_pull_up>,
-                        <3 5 RK_FUNC_2 &pcfg_pull_up>,
-                        <3 6 RK_FUNC_2 &pcfg_pull_up>,
-                        <3 7 RK_FUNC_2 &pcfg_pull_up>;
+                rockchip,pins = <3 RK_PA0 2 &pcfg_pull_up>,
+                        <3 RK_PA1 2 &pcfg_pull_up>,
+                        <3 RK_PA2 2 &pcfg_pull_up>,
+                        <3 RK_PA3 2 &pcfg_pull_up>,
+                        <3 RK_PA4 2 &pcfg_pull_up>,
+                        <3 RK_PA5 2 &pcfg_pull_up>,
+                        <3 RK_PA6 2 &pcfg_pull_up>,
+                        <3 RK_PA7 2 &pcfg_pull_up>;
               };
           };
             spi0 {
               spi0_clk: spi0-clk {
-                rockchip,pins = <5 12 RK_FUNC_1 &pcfg_pull_up>;
+                rockchip,pins = <5 RK_PB4 1 &pcfg_pull_up>;
               };
               spi0_cs0: spi0-cs0 {
-                rockchip,pins = <5 13 RK_FUNC_1 &pcfg_pull_up>;
+                rockchip,pins = <5 RK_PB5 1 &pcfg_pull_up>;
               };
               spi0_tx: spi0-tx {
-                rockchip,pins = <5 14 RK_FUNC_1 &pcfg_pull_up>;
+                rockchip,pins = <5 RK_PB6 1 &pcfg_pull_up>;
               };
               spi0_rx: spi0-rx {
-                rockchip,pins = <5 15 RK_FUNC_1 &pcfg_pull_up>;
+                rockchip,pins = <5 RK_PB7 1 &pcfg_pull_up>;
               };
               spi0_cs1: spi0-cs1 {
-                rockchip,pins = <5 16 RK_FUNC_1 &pcfg_pull_up>;
+                rockchip,pins = <5 RK_PC0 1 &pcfg_pull_up>;
               };
           };
           spi1 {
               spi1_clk: spi1-clk {
-                rockchip,pins = <7 12 RK_FUNC_2 &pcfg_pull_up>;
+                rockchip,pins = <7 RK_PB4 2 &pcfg_pull_up>;
               };
               spi1_cs0: spi1-cs0 {
-                rockchip,pins = <7 13 RK_FUNC_2 &pcfg_pull_up>;
+                rockchip,pins = <7 RK_PB5 2 &pcfg_pull_up>;
               };
               spi1_rx: spi1-rx {
-                rockchip,pins = <7 14 RK_FUNC_2 &pcfg_pull_up>;
+                rockchip,pins = <7 RK_PB6 2 &pcfg_pull_up>;
               };
               spi1_tx: spi1-tx {
-                rockchip,pins = <7 15 RK_FUNC_2 &pcfg_pull_up>;
+                rockchip,pins = <7 RK_PB7 2 &pcfg_pull_up>;
               };
           };
             spi2 {
               spi2_cs1: spi2-cs1 {
-                rockchip,pins = <8 3 RK_FUNC_1 &pcfg_pull_up>;
+                rockchip,pins = <8 RK_PA3 1 &pcfg_pull_up>;
               };
               spi2_clk: spi2-clk {
-                rockchip,pins = <8 6 RK_FUNC_1 &pcfg_pull_up>;
+                rockchip,pins = <8 RK_PA6 1 &pcfg_pull_up>;
               };
               spi2_cs0: spi2-cs0 {
-                rockchip,pins = <8 7 RK_FUNC_1 &pcfg_pull_up>;
+                rockchip,pins = <8 RK_PA7 1 &pcfg_pull_up>;
               };
               spi2_rx: spi2-rx {
-                rockchip,pins = <8 8 RK_FUNC_1 &pcfg_pull_up>;
+                rockchip,pins = <8 RK_PB0 1 &pcfg_pull_up>;
               };
               spi2_tx: spi2-tx {
-                rockchip,pins = <8 9 RK_FUNC_1 &pcfg_pull_up>;
+                rockchip,pins = <8 RK_PB1 1 &pcfg_pull_up>;
               };
           };
             uart0 {
               uart0_xfer: uart0-xfer {
-                rockchip,pins = <4 16 RK_FUNC_1 &pcfg_pull_up>,
-                        <4 17 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <4 RK_PC0 1 &pcfg_pull_up>,
+                        <4 RK_PC1 1 &pcfg_pull_none>;
               };
                 uart0_cts: uart0-cts {
-                rockchip,pins = <4 18 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <4 RK_PC2 1 &pcfg_pull_up>;
               };
                 uart0_rts: uart0-rts {
-                rockchip,pins = <4 19 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <4 RK_PC3 1 &pcfg_pull_none>;
               };
           };
             uart1 {
               uart1_xfer: uart1-xfer {
-                rockchip,pins = <5 8 RK_FUNC_1 &pcfg_pull_up>,
-                        <5 9 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <5 RK_PB0 1 &pcfg_pull_up>,
+                        <5 RK_PB1 1 &pcfg_pull_none>;
               };
                 uart1_cts: uart1-cts {
-                rockchip,pins = <5 10 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <5 RK_PB2 1 &pcfg_pull_up>;
               };
                 uart1_rts: uart1-rts {
-                rockchip,pins = <5 11 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <5 RK_PB3 1 &pcfg_pull_none>;
               };
           };
             uart2 {
               uart2_xfer: uart2-xfer {
-                rockchip,pins = <7 22 RK_FUNC_1 &pcfg_pull_up>,
-                        <7 23 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <7 RK_PC6 1 &pcfg_pull_up>,
+                        <7 RK_PC7 1 &pcfg_pull_none>;
               };
               /* no rts / cts for uart2 */
           };
             uart3 {
               uart3_xfer: uart3-xfer {
-                rockchip,pins = <7 7 RK_FUNC_1 &pcfg_pull_up>,
-                        <7 8 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <7 RK_PA7 1 &pcfg_pull_up>,
+                        <7 RK_PB0 1 &pcfg_pull_none>;
               };
                 uart3_cts: uart3-cts {
-                rockchip,pins = <7 9 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <7 RK_PB1 1 &pcfg_pull_up>;
               };
                 uart3_rts: uart3-rts {
-                rockchip,pins = <7 10 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <7 RK_PB2 1 &pcfg_pull_none>;
               };
           };
             uart4 {
               uart4_xfer: uart4-xfer {
-                rockchip,pins = <5 12 3 &pcfg_pull_up>,
-                        <5 13 3 &pcfg_pull_none>;
+                rockchip,pins = <5 RK_PB7 3 &pcfg_pull_up>,
+                        <5 RK_PB6 3 &pcfg_pull_none>;
               };
                 uart4_cts: uart4-cts {
-                rockchip,pins = <5 14 3 &pcfg_pull_none>;
+                rockchip,pins = <5 RK_PB4 3 &pcfg_pull_up>;
               };
                 uart4_rts: uart4-rts {
-                rockchip,pins = <5 15 3 &pcfg_pull_none>;
+                rockchip,pins = <5 RK_PB5 3 &pcfg_pull_none>;
               };
           };
             tsadc {
+            otp_pin: otp-pin {
+                rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
+            };
+
               otp_out: otp-out {
-                rockchip,pins = <0 10 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <0 RK_PB2 1 &pcfg_pull_none>;
               };
           };
             pwm0 {
               pwm0_pin: pwm0-pin {
-                rockchip,pins = <7 0 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <7 RK_PA0 1 &pcfg_pull_none>;
               };
           };
             pwm1 {
               pwm1_pin: pwm1-pin {
-                rockchip,pins = <7 1 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <7 RK_PA1 1 &pcfg_pull_none>;
               };
           };
             pwm2 {
               pwm2_pin: pwm2-pin {
-                rockchip,pins = <7 22 RK_FUNC_3 &pcfg_pull_none>;
+                rockchip,pins = <7 RK_PC6 3 &pcfg_pull_none>;
               };
           };
             pwm3 {
               pwm3_pin: pwm3-pin {
-                rockchip,pins = <7 23 RK_FUNC_3 &pcfg_pull_none>;
+                rockchip,pins = <7 RK_PC7 3 &pcfg_pull_none>;
               };
           };
             gmac {
               rgmii_pins: rgmii-pins {
-                rockchip,pins = <3 30 3 &pcfg_pull_none>,
-                        <3 31 3 &pcfg_pull_none>,
-                        <3 26 3 &pcfg_pull_none>,
-                        <3 27 3 &pcfg_pull_none>,
-                        <3 28 3 &pcfg_pull_none_12ma>,
-                        <3 29 3 &pcfg_pull_none_12ma>,
-                        <3 24 3 &pcfg_pull_none_12ma>,
-                        <3 25 3 &pcfg_pull_none_12ma>,
-                        <4 0 3 &pcfg_pull_none>,
-                        <4 5 3 &pcfg_pull_none>,
-                        <4 6 3 &pcfg_pull_none>,
-                        <4 9 3 &pcfg_pull_none_12ma>,
-                        <4 4 3 &pcfg_pull_none_12ma>,
-                        <4 1 3 &pcfg_pull_none>,
-                        <4 3 3 &pcfg_pull_none>;
+                rockchip,pins = <3 RK_PD6 3 &pcfg_pull_none>,
+                        <3 RK_PD7 3 &pcfg_pull_none>,
+                        <3 RK_PD2 3 &pcfg_pull_none>,
+                        <3 RK_PD3 3 &pcfg_pull_none>,
+                        <3 RK_PD4 3 &pcfg_pull_none_12ma>,
+                        <3 RK_PD5 3 &pcfg_pull_none_12ma>,
+                        <3 RK_PD0 3 &pcfg_pull_none_12ma>,
+                        <3 RK_PD1 3 &pcfg_pull_none_12ma>,
+                        <4 RK_PA0 3 &pcfg_pull_none>,
+                        <4 RK_PA5 3 &pcfg_pull_none>,
+                        <4 RK_PA6 3 &pcfg_pull_none>,
+                        <4 RK_PB1 3 &pcfg_pull_none_12ma>,
+                        <4 RK_PA4 3 &pcfg_pull_none_12ma>,
+                        <4 RK_PA1 3 &pcfg_pull_none>,
+                        <4 RK_PA3 3 &pcfg_pull_none>;
               };
                 rmii_pins: rmii-pins {
-                rockchip,pins = <3 30 3 &pcfg_pull_none>,
-                        <3 31 3 &pcfg_pull_none>,
-                        <3 28 3 &pcfg_pull_none>,
-                        <3 29 3 &pcfg_pull_none>,
-                        <4 0 3 &pcfg_pull_none>,
-                        <4 5 3 &pcfg_pull_none>,
-                        <4 4 3 &pcfg_pull_none>,
-                        <4 1 3 &pcfg_pull_none>,
-                        <4 2 3 &pcfg_pull_none>,
-                        <4 3 3 &pcfg_pull_none>;
+                rockchip,pins = <3 RK_PD6 3 &pcfg_pull_none>,
+                        <3 RK_PD7 3 &pcfg_pull_none>,
+                        <3 RK_PD4 3 &pcfg_pull_none>,
+                        <3 RK_PD5 3 &pcfg_pull_none>,
+                        <4 RK_PA0 3 &pcfg_pull_none>,
+                        <4 RK_PA5 3 &pcfg_pull_none>,
+                        <4 RK_PA4 3 &pcfg_pull_none>,
+                        <4 RK_PA1 3 &pcfg_pull_none>,
+                        <4 RK_PA2 3 &pcfg_pull_none>,
+                        <4 RK_PA3 3 &pcfg_pull_none>;
               };
           };
             spdif {
               spdif_tx: spdif-tx {
-                rockchip,pins = <RK_GPIO6 11 RK_FUNC_1 &pcfg_pull_none>;
+                rockchip,pins = <6 RK_PB3 1 &pcfg_pull_none>;
               };
           };
       };
-
-    power: power-controller {
-        compatible = "rockchip,rk3288-power-controller";
-        #power-domain-cells = <1>;
-        rockchip,pmu = <&pmu>;
-        #address-cells = <1>;
-        #size-cells = <0>;
-
-        pd_gpu {
-            reg = <RK3288_PD_GPU>;
-            clocks = <&cru ACLK_GPU>;
-        };
-
-        pd_hevc {
-            reg = <RK3288_PD_HEVC>;
-            clocks = <&cru ACLK_HEVC>,
-                 <&cru SCLK_HEVC_CABAC>,
-                 <&cru SCLK_HEVC_CORE>,
-                 <&cru HCLK_HEVC>;
-        };
-
-        pd_vio {
-            reg = <RK3288_PD_VIO>;
-            clocks = <&cru ACLK_IEP>,
-                 <&cru ACLK_ISP>,
-                 <&cru ACLK_RGA>,
-                 <&cru ACLK_VIP>,
-                 <&cru ACLK_VOP0>,
-                 <&cru ACLK_VOP1>,
-                 <&cru DCLK_VOP0>,
-                 <&cru DCLK_VOP1>,
-                 <&cru HCLK_IEP>,
-                 <&cru HCLK_ISP>,
-                 <&cru HCLK_RGA>,
-                 <&cru HCLK_VIP>,
-                 <&cru HCLK_VOP0>,
-                 <&cru HCLK_VOP1>,
-                 <&cru PCLK_EDP_CTRL>,
-                 <&cru PCLK_HDMI_CTRL>,
-                 <&cru PCLK_LVDS_PHY>,
-                 <&cru PCLK_MIPI_CSI>,
-                 <&cru PCLK_MIPI_DSI0>,
-                 <&cru PCLK_MIPI_DSI1>,
-                 <&cru SCLK_EDP_24M>,
-                 <&cru SCLK_EDP>,
-                 <&cru SCLK_HDMI_CEC>,
-                 <&cru SCLK_HDMI_HDCP>,
-                 <&cru SCLK_ISP_JPE>,
-                 <&cru SCLK_ISP>,
-                 <&cru SCLK_RGA>;
-        };
-
-        pd_video {
-            reg = <RK3288_PD_VIDEO>;
-            clocks = <&cru ACLK_VCODEC>,
-                 <&cru HCLK_VCODEC>;
-        };
-    };
   };
#19 lore raw

PATCH v3 10/12 arm: dts: rockchip: sync rk3288 DT boards from Linux

In reply to Johan Jonker

Sync rk3288 DT boards that have support both in
Linux 5.17 as in U-boot.

---

Change V3:
update
change reg size
delete more files

Changed V2:
update
change led labels

---
 arch/arm/dts/rk3288-firefly-u-boot.dtsi |   4 +-
 arch/arm/dts/rk3288-firefly.dts         |  17 +-
 arch/arm/dts/rk3288-firefly.dtsi        | 161 +++++--
 arch/arm/dts/rk3288-miqi-u-boot.dtsi    |   2 +-
 arch/arm/dts/rk3288-miqi.dts            | 431 ++++++++++++++++++-
 arch/arm/dts/rk3288-miqi.dtsi           | 418 ------------------
 arch/arm/dts/rk3288-phycore-rdk.dts     | 109 +++--
 arch/arm/dts/rk3288-phycore-som.dtsi    | 111 +----
 arch/arm/dts/rk3288-popmetal.dts        | 505 +++++++++++++++++++++-
 arch/arm/dts/rk3288-popmetal.dtsi       | 545 ------------------------
 arch/arm/dts/rk3288-rock2-som.dtsi      |  91 ++--
 arch/arm/dts/rk3288-rock2-square.dts    | 215 +++++++---
 arch/arm/dts/rk3288-tinker-s.dts        |   9 +-
 arch/arm/dts/rk3288-tinker.dts          |  30 +-
 arch/arm/dts/rk3288-tinker.dtsi         | 405 +++++++++---------
 15 files changed, 1554 insertions(+), 1499 deletions(-)
 delete mode 100644 arch/arm/dts/rk3288-miqi.dtsi
 delete mode 100644 arch/arm/dts/rk3288-popmetal.dtsi
arch/arm/dts/rk3288-firefly-u-boot.dtsi +2 -2
index cc84d7c4..c43d3281 100644
@@ -14,11 +14,11 @@
 	leds {
 		u-boot,dm-pre-reloc;
 
-		work {
+		work_led: led-0 {
 			u-boot,dm-pre-reloc;
 		};
 
-		power {
+		power_led: led-1 {
 			u-boot,dm-pre-reloc;
 		};
 	};
arch/arm/dts/rk3288-firefly.dts +4 -13
index 72982efd..313459da 100644
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+ OR X11
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2014, 2015 FUKAUMI Naoki <[email protected]>
  */
@@ -9,31 +9,22 @@
 / {
 	model = "Firefly-RK3288";
 	compatible = "firefly,firefly-rk3288", "rockchip,rk3288";
-
-	chosen {
-		stdout-path = &uart2;
-	};
 };
 
 &ir {
-	gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
+	gpios = <&gpio7 RK_PA0 GPIO_ACTIVE_LOW>;
 };
 
 &pinctrl {
 	act8846 {
 		pmic_vsel: pmic-vsel {
-			rockchip,pins = <7 14 RK_FUNC_GPIO &pcfg_output_low>;
+			rockchip,pins = <7 RK_PB6 RK_FUNC_GPIO &pcfg_output_low>;
 		};
 	};
 
 	ir {
 		ir_int: ir-int {
-			rockchip,pins = <7 0 RK_FUNC_GPIO &pcfg_pull_up>;
-		};
-	};
-	usb_host {
-		host_vbus_drv: host-vbus-drv {
-			rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <7 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
arch/arm/dts/rk3288-firefly.dtsi +122 -39

352 lines not on this page · raw message

arch/arm/dts/rk3288-miqi-u-boot.dtsi +1 -1
index 2a74fdd1..f2611aaa 100644
@@ -8,7 +8,7 @@
 	leds {
 		u-boot,dm-pre-reloc;
 
-		work {
+		work_led: led-0 {
 			u-boot,dm-pre-reloc;
 		};
 	};
arch/arm/dts/rk3288-miqi.dts +428 -3

442 lines not on this page · raw message

arch/arm/dts/rk3288-miqi.dtsi deleted +0 -418

418 lines not on this page · raw message

arch/arm/dts/rk3288-phycore-rdk.dts +51 -58

186 lines not on this page · raw message

arch/arm/dts/rk3288-phycore-som.dtsi +22 -89

202 lines not on this page · raw message

arch/arm/dts/rk3288-popmetal.dts +499 -6

519 lines not on this page · raw message

arch/arm/dts/rk3288-popmetal.dtsi deleted +0 -545

545 lines not on this page · raw message

arch/arm/dts/rk3288-rock2-som.dtsi +43 -48

159 lines not on this page · raw message

arch/arm/dts/rk3288-rock2-square.dts +161 -54

117 lines not on this page · raw message

arch/arm/dts/rk3288-tinker-s.dts +5 -4
index cc7ac5f8..970e1385 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/rk3288-tinker.dts +5 -25
index 8b1848c3..1e43527a 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/rk3288-tinker.dtsi +211 -194

405 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.20.1

Part of the diff is not shown here. View the raw message.