Skip to contentSkip to conversation

Initial support for Pinephone Pro

PATCH Superseded Peter Robinson 4 participants 11 messages Oct 25, 2022 – Jan 3, 2023

Subsystems (5)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover Initial support for Pinephone Pro

This adds initial support for the PINE64 Pinephone Pro. It's a rebase to upstream core rk3399 DT pieces, and the addition of the upstream PPP DT from 6.1-rc1 and the U-Boot pieces are based on my work on the Pinebook Pro.

Peter Robinson (3):
arm64: dts: rk3399: sync rk3399.dtsi from 6.1-rc1
arm64: dts: rk3399: Add upstream Pinephone Pro dts
rockchip: Add initial support for the PINE64 Pinephone Pro

 arch/arm/dts/Makefile                         |   1 +
 arch/arm/dts/rk3399-opp.dtsi                  |   6 +-
 arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi |  39 ++
 arch/arm/dts/rk3399-pinephone-pro.dts         | 398 ++++++++++++++++++
 arch/arm/dts/rk3399-u-boot.dtsi               |  36 +-
 arch/arm/dts/rk3399.dtsi                      | 200 ++++++++-
 arch/arm/mach-rockchip/rk3399/Kconfig         |   8 +
 board/pine64/pinephone-pro-rk3399/Kconfig     |  15 +
 board/pine64/pinephone-pro-rk3399/MAINTAINERS |   8 +
 board/pine64/pinephone-pro-rk3399/Makefile    |   1 +
 .../pinephone-pro-rk3399.c                    |  76 ++++
 configs/pinephone-pro-rk3399_defconfig        | 104 +++++
 drivers/clk/rockchip/clk_rk3399.c             |   2 +-
 include/configs/pinephone-pro-rk3399.h        |  19 +
 include/dt-bindings/clock/rk3399-cru.h        |  24 +-
 include/dt-bindings/power/rk3399-power.h      |   1 +
 16 files changed, 875 insertions(+), 63 deletions(-)
 create mode 100644 arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3399-pinephone-pro.dts
 create mode 100644 board/pine64/pinephone-pro-rk3399/Kconfig
 create mode 100644 board/pine64/pinephone-pro-rk3399/MAINTAINERS
 create mode 100644 board/pine64/pinephone-pro-rk3399/Makefile
 create mode 100644 board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c
 create mode 100644 configs/pinephone-pro-rk3399_defconfig
 create mode 100644 include/configs/pinephone-pro-rk3399.h
Signature · 1 line
2.38.1
#1 lore raw

PATCH 1/3 arm64: dts: rk3399: sync rk3399.dtsi from 6.1-rc1

Sync rk3399.dtsi and associated bindings includes. Fix up building of clk/rockchip/clk_rk3399.c for the changes as well as adjusting the rk3399-u-boot.dtsi for the new upstream pieces.

---
 arch/arm/dts/rk3399-opp.dtsi             |   6 +-
 arch/arm/dts/rk3399-u-boot.dtsi          |  36 ++--
 arch/arm/dts/rk3399.dtsi                 | 200 ++++++++++++++++++++---
 drivers/clk/rockchip/clk_rk3399.c        |   2 +-
 include/dt-bindings/clock/rk3399-cru.h   |  24 +--
 include/dt-bindings/power/rk3399-power.h |   1 +
 6 files changed, 206 insertions(+), 63 deletions(-)
arch/arm/dts/rk3399-opp.dtsi +3 -3
index da41cd81ebb..fee5e711127 100644
@@ -4,7 +4,7 @@
  */
 
 / {
-	cluster0_opp: opp-table0 {
+	cluster0_opp: opp-table-0 {
 		compatible = "operating-points-v2";
 		opp-shared;
 
@@ -35,7 +35,7 @@
 		};
 	};
 
-	cluster1_opp: opp-table1 {
+	cluster1_opp: opp-table-1 {
 		compatible = "operating-points-v2";
 		opp-shared;
 
@@ -74,7 +74,7 @@
 		};
 	};
 
-	gpu_opp_table: opp-table2 {
+	gpu_opp_table: opp-table-2 {
 		compatible = "operating-points-v2";
 
 		opp00 {
arch/arm/dts/rk3399-u-boot.dtsi +10 -26
index 3c1a15fe51b..2fa8f25a3e1 100644
@@ -20,38 +20,12 @@
 		reg = <0x0 0xff620000 0x0 0x100>;
 	};
 
-	dfi: dfi@ff630000 {
-		u-boot,dm-pre-reloc;
-		reg = <0x00 0xff630000 0x00 0x4000>;
-		compatible = "rockchip,rk3399-dfi";
-		rockchip,pmu = <&pmugrf>;
-		clocks = <&cru PCLK_DDR_MON>;
-		clock-names = "pclk_ddr_mon";
-	};
-
 	rng: rng@ff8b8000 {
 		compatible = "rockchip,cryptov1-rng";
 		reg = <0x0 0xff8b8000 0x0 0x1000>;
 		status = "okay";
 	};
 
-	dmc: dmc {
-		u-boot,dm-pre-reloc;
-		compatible = "rockchip,rk3399-dmc";
-		devfreq-events = <&dfi>;
-		interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH 0>;
-		clocks = <&cru SCLK_DDRCLK>;
-		clock-names = "dmc_clk";
-		reg = <0x0 0xffa80000 0x0 0x0800
-		       0x0 0xffa80800 0x0 0x1800
-		       0x0 0xffa82000 0x0 0x2000
-		       0x0 0xffa84000 0x0 0x1000
-		       0x0 0xffa88000 0x0 0x0800
-		       0x0 0xffa88800 0x0 0x1800
-		       0x0 0xffa8a000 0x0 0x2000
-		       0x0 0xffa8c000 0x0 0x1000>;
-	};
-
 	pmusgrf: syscon@ff330000 {
 		u-boot,dm-pre-reloc;
 		compatible = "rockchip,rk3399-pmusgrf", "syscon";
@@ -88,6 +62,16 @@
 	u-boot,dm-pre-reloc;
 };
 
+&dfi {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+};
+
+&dmc {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+};
+
 &emmc_phy {
 	u-boot,dm-pre-reloc;
 };
arch/arm/dts/rk3399.dtsi +178 -22

400 lines not on this page · raw message

drivers/clk/rockchip/clk_rk3399.c +1 -1
index 97bf1c6e15b..e968ddf894b 100644
@@ -1049,7 +1049,7 @@ static ulong rk3399_clk_set_rate(struct clk *clk, ulong rate)
 		 * return 0 to satisfy clk_set_defaults during device probe.
 		 */
 		return 0;
-	case SCLK_DDRCLK:
+	case SCLK_TESTCLKOUT2:
 		ret = rk3399_ddr_set_clk(priv->cru, rate);
 		break;
 	case PCLK_EFUSE1024NS:
include/dt-bindings/clock/rk3399-cru.h +13 -11
index 211faf8fa89..44e0a319f07 100644
@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (c) 2016 Rockchip Electronics Co. Ltd.
+ * Author: Xing Zheng <[email protected]>
  */
 
 #ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3399_H
@@ -121,16 +122,17 @@
 #define SCLK_DPHY_RX0_CFG		165
 #define SCLK_RMII_SRC			166
 #define SCLK_PCIEPHY_REF100M		167
-#define SCLK_USBPHY0_480M_SRC		168
-#define SCLK_USBPHY1_480M_SRC		169
-#define SCLK_DDRCLK			170
-#define SCLK_TESTOUT2			171
+#define SCLK_DDRC			168
+#define SCLK_TESTCLKOUT1		169
+#define SCLK_TESTCLKOUT2		170
 
 #define DCLK_VOP0			180
 #define DCLK_VOP1			181
 #define DCLK_VOP0_DIV			182
 #define DCLK_VOP1_DIV			183
 #define DCLK_M0_PERILP			184
+#define DCLK_VOP0_FRAC			185
+#define DCLK_VOP1_FRAC			186
 
 #define FCLK_CM0S			190
 
@@ -592,13 +594,13 @@
 #define SRST_P_SPI0			214
 #define SRST_P_SPI1			215
 #define SRST_P_SPI2			216
-#define SRST_P_SPI4			217
-#define SRST_P_SPI5			218
+#define SRST_P_SPI3			217
+#define SRST_P_SPI4			218
 #define SRST_SPI0			219
 #define SRST_SPI1			220
 #define SRST_SPI2			221
-#define SRST_SPI4			222
-#define SRST_SPI5			223
+#define SRST_SPI3			222
+#define SRST_SPI4			223
 
 /* cru_softrst_con14 */
 #define SRST_I2S0_8CH			224
@@ -720,8 +722,8 @@
 #define SRST_H_CM0S_NOC			3
 #define SRST_DBG_CM0S			4
 #define SRST_PO_CM0S			5
-#define SRST_P_SPI3			6
-#define SRST_SPI3			7
+#define SRST_P_SPI6			6
+#define SRST_SPI6			7
 #define SRST_P_TIMER_0_1		8
 #define SRST_P_TIMER_0			9
 #define SRST_P_TIMER_1			10
include/dt-bindings/power/rk3399-power.h +1 -0
index 168b3bfbd6f..aedd8b180fe 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DT_BINDINGS_POWER_RK3399_POWER_H__
 #define __DT_BINDINGS_POWER_RK3399_POWER_H__
 
Signature · 1 line
2.38.1
Reviewed-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] arm64: dts: rk3399: sync rk3399.dtsi from 6.1-rc1

Quoted 5 lines · Peter Robinson

Sync rk3399.dtsi and associated bindings includes. Fix up building of clk/rockchip/clk_rk3399.c for the changes as well as adjusting the rk3399-u-boot.dtsi for the new upstream pieces.

Thanks,
- Kever

Quoted 621 lines
---
  arch/arm/dts/rk3399-opp.dtsi             |   6 +-
  arch/arm/dts/rk3399-u-boot.dtsi          |  36 ++--
  arch/arm/dts/rk3399.dtsi                 | 200 ++++++++++++++++++++---
  drivers/clk/rockchip/clk_rk3399.c        |   2 +-
  include/dt-bindings/clock/rk3399-cru.h   |  24 +--
  include/dt-bindings/power/rk3399-power.h |   1 +
  6 files changed, 206 insertions(+), 63 deletions(-)
arch/arm/dts/rk3399-opp.dtsi +3 -3
index da41cd81ebb..fee5e711127 100644
@@ -4,7 +4,7 @@
   */
 
  / {
-	cluster0_opp: opp-table0 {
+	cluster0_opp: opp-table-0 {
  		compatible = "operating-points-v2";
  		opp-shared;
 
@@ -35,7 +35,7 @@
  		};
  	};
 
-	cluster1_opp: opp-table1 {
+	cluster1_opp: opp-table-1 {
  		compatible = "operating-points-v2";
  		opp-shared;
 
@@ -74,7 +74,7 @@
  		};
  	};
 
-	gpu_opp_table: opp-table2 {
+	gpu_opp_table: opp-table-2 {
  		compatible = "operating-points-v2";
 
  		opp00 {
arch/arm/dts/rk3399-u-boot.dtsi +10 -26
index 3c1a15fe51b..2fa8f25a3e1 100644
@@ -20,38 +20,12 @@
  		reg = <0x0 0xff620000 0x0 0x100>;
  	};
 
-	dfi: dfi@ff630000 {
-		u-boot,dm-pre-reloc;
-		reg = <0x00 0xff630000 0x00 0x4000>;
-		compatible = "rockchip,rk3399-dfi";
-		rockchip,pmu = <&pmugrf>;
-		clocks = <&cru PCLK_DDR_MON>;
-		clock-names = "pclk_ddr_mon";
-	};
-
  	rng: rng@ff8b8000 {
  		compatible = "rockchip,cryptov1-rng";
  		reg = <0x0 0xff8b8000 0x0 0x1000>;
  		status = "okay";
  	};
 
-	dmc: dmc {
-		u-boot,dm-pre-reloc;
-		compatible = "rockchip,rk3399-dmc";
-		devfreq-events = <&dfi>;
-		interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH 0>;
-		clocks = <&cru SCLK_DDRCLK>;
-		clock-names = "dmc_clk";
-		reg = <0x0 0xffa80000 0x0 0x0800
-		       0x0 0xffa80800 0x0 0x1800
-		       0x0 0xffa82000 0x0 0x2000
-		       0x0 0xffa84000 0x0 0x1000
-		       0x0 0xffa88000 0x0 0x0800
-		       0x0 0xffa88800 0x0 0x1800
-		       0x0 0xffa8a000 0x0 0x2000
-		       0x0 0xffa8c000 0x0 0x1000>;
-	};
-
  	pmusgrf: syscon@ff330000 {
  		u-boot,dm-pre-reloc;
  		compatible = "rockchip,rk3399-pmusgrf", "syscon";
@@ -88,6 +62,16 @@
  	u-boot,dm-pre-reloc;
  };
 
+&dfi {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+};
+
+&dmc {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+};
+
  &emmc_phy {
  	u-boot,dm-pre-reloc;
  };
arch/arm/dts/rk3399.dtsi +178 -22
index 3871c7fd83b..92c2207e686 100644
@@ -124,6 +124,12 @@
  			#cooling-cells = <2>; /* min followed by max */
  			dynamic-power-coefficient = <436>;
  			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
+
+			thermal-idle {
+				#cooling-cells = <2>;
+				duration-us = <10000>;
+				exit-latency-us = <500>;
+			};
  		};
 
  		cpu_b1: cpu@101 {
@@ -136,6 +142,12 @@
  			#cooling-cells = <2>; /* min followed by max */
  			dynamic-power-coefficient = <436>;
  			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
+
+			thermal-idle {
+				#cooling-cells = <2>;
+				duration-us = <10000>;
+				exit-latency-us = <500>;
+			};
  		};
 
  		idle-states {
@@ -166,6 +178,15 @@
  		ports = <&vopl_out>, <&vopb_out>;
  	};
 
+	dmc: memory-controller {
+		compatible = "rockchip,rk3399-dmc";
+		rockchip,pmu = <&pmugrf>;
+		devfreq-events = <&dfi>;
+		clocks = <&cru SCLK_DDRC>;
+		clock-names = "dmc_clk";
+		status = "disabled";
+	};
+
  	pmu_a53 {
  		compatible = "arm,cortex-a53-pmu";
  		interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW &ppi_cluster0>;
@@ -361,6 +382,54 @@
  		status = "disabled";
  	};
 
+	debug@fe430000 {
+		compatible = "arm,coresight-cpu-debug", "arm,primecell";
+		reg = <0 0xfe430000 0 0x1000>;
+		clocks = <&cru PCLK_COREDBG_L>;
+		clock-names = "apb_pclk";
+		cpu = <&cpu_l0>;
+	};
+
+	debug@fe432000 {
+		compatible = "arm,coresight-cpu-debug", "arm,primecell";
+		reg = <0 0xfe432000 0 0x1000>;
+		clocks = <&cru PCLK_COREDBG_L>;
+		clock-names = "apb_pclk";
+		cpu = <&cpu_l1>;
+	};
+
+	debug@fe434000 {
+		compatible = "arm,coresight-cpu-debug", "arm,primecell";
+		reg = <0 0xfe434000 0 0x1000>;
+		clocks = <&cru PCLK_COREDBG_L>;
+		clock-names = "apb_pclk";
+		cpu = <&cpu_l2>;
+	};
+
+	debug@fe436000 {
+		compatible = "arm,coresight-cpu-debug", "arm,primecell";
+		reg = <0 0xfe436000 0 0x1000>;
+		clocks = <&cru PCLK_COREDBG_L>;
+		clock-names = "apb_pclk";
+		cpu = <&cpu_l3>;
+	};
+
+	debug@fe610000 {
+		compatible = "arm,coresight-cpu-debug", "arm,primecell";
+		reg = <0 0xfe610000 0 0x1000>;
+		clocks = <&cru PCLK_COREDBG_B>;
+		clock-names = "apb_pclk";
+		cpu = <&cpu_b0>;
+	};
+
+	debug@fe710000 {
+		compatible = "arm,coresight-cpu-debug", "arm,primecell";
+		reg = <0 0xfe710000 0 0x1000>;
+		clocks = <&cru PCLK_COREDBG_B>;
+		clock-names = "apb_pclk";
+		cpu = <&cpu_b1>;
+	};
+
  	usbdrd3_0: usb@fe800000 {
  		compatible = "rockchip,rk3399-dwc3";
  		#address-cells = <2>;
@@ -1235,6 +1304,16 @@
  		status = "disabled";
  	};
 
+	dfi: dfi@ff630000 {
+		reg = <0x00 0xff630000 0x00 0x4000>;
+		compatible = "rockchip,rk3399-dfi";
+		rockchip,pmu = <&pmugrf>;
+		interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH 0>;
+		clocks = <&cru PCLK_DDR_MON>;
+		clock-names = "pclk_ddr_mon";
+		status = "disabled";
+	};
+
  	vpu: video-codec@ff650000 {
  		compatible = "rockchip,rk3399-vpu";
  		reg = <0x0 0xff650000 0x0 0x800>;
@@ -1251,7 +1330,6 @@
  		compatible = "rockchip,iommu";
  		reg = <0x0 0xff650800 0x0 0x40>;
  		interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH 0>;
-		interrupt-names = "vpu_mmu";
  		clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
  		clock-names = "aclk", "iface";
  		#iommu-cells = <0>;
@@ -1273,7 +1351,6 @@
  		compatible = "rockchip,iommu";
  		reg = <0x0 0xff660480 0x0 0x40>, <0x0 0xff6604c0 0x0 0x40>;
  		interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH 0>;
-		interrupt-names = "vdec_mmu";
  		clocks = <&cru ACLK_VDU>, <&cru HCLK_VDU>;
  		clock-names = "aclk", "iface";
  		power-domains = <&power RK3399_PD_VDU>;
@@ -1284,7 +1361,6 @@
  		compatible = "rockchip,iommu";
  		reg = <0x0 0xff670800 0x0 0x40>;
  		interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH 0>;
-		interrupt-names = "iep_mmu";
  		clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>;
  		clock-names = "aclk", "iface";
  		#iommu-cells = <0>;
@@ -1356,9 +1432,11 @@
  		clock-names = "apb_pclk";
  	};
 
-	pmucru: pmu-clock-controller@ff750000 {
+	pmucru: clock-controller@ff750000 {
  		compatible = "rockchip,rk3399-pmucru";
  		reg = <0x0 0xff750000 0x0 0x1000>;
+		clocks = <&xin24m>;
+		clock-names = "xin24m";
  		rockchip,grf = <&pmugrf>;
  		#clock-cells = <1>;
  		#reset-cells = <1>;
@@ -1369,6 +1447,8 @@
  	cru: clock-controller@ff760000 {
  		compatible = "rockchip,rk3399-cru";
  		reg = <0x0 0xff760000 0x0 0x1000>;
+		clocks = <&xin24m>;
+		clock-names = "xin24m";
  		rockchip,grf = <&grf>;
  		#clock-cells = <1>;
  		#reset-cells = <1>;
@@ -1382,7 +1462,8 @@
  			<&cru HCLK_PERILP1>, <&cru PCLK_PERILP1>,
  			<&cru ACLK_VIO>, <&cru ACLK_HDCP>,
  			<&cru ACLK_GIC_PRE>,
-			<&cru PCLK_DDR>;
+			<&cru PCLK_DDR>,
+			<&cru ACLK_VDU>;
  		assigned-clock-rates =
  			 <594000000>,  <800000000>,
  			<1000000000>,
@@ -1393,7 +1474,8 @@
  			 <100000000>,   <50000000>,
  			 <400000000>, <400000000>,
  			 <200000000>,
-			 <200000000>;
+			 <200000000>,
+			 <400000000>;
  	};
 
  	grf: syscon@ff770000 {
@@ -1477,6 +1559,7 @@
  			reg = <0xf780 0x24>;
  			clocks = <&sdhci>;
  			clock-names = "emmcclk";
+			drive-impedance-ohm = <50>;
  			#phy-cells = <0>;
  			status = "disabled";
  		};
@@ -1487,7 +1570,6 @@
  			clock-names = "refclk";
  			#phy-cells = <1>;
  			resets = <&cru SRST_PCIEPHY>;
-			drive-impedance-ohm = <50>;
  			reset-names = "phy";
  			status = "disabled";
  		};
@@ -1582,8 +1664,9 @@
  		dma-names = "tx", "rx";
  		clock-names = "i2s_clk", "i2s_hclk";
  		clocks = <&cru SCLK_I2S0_8CH>, <&cru HCLK_I2S0_8CH>;
-		pinctrl-names = "default";
+		pinctrl-names = "bclk_on", "bclk_off";
  		pinctrl-0 = <&i2s0_8ch_bus>;
+		pinctrl-1 = <&i2s0_8ch_bus_bclk_off>;
  		power-domains = <&power RK3399_PD_SDIOAUDIO>;
  		#sound-dai-cells = <0>;
  		status = "disabled";
@@ -1619,7 +1702,7 @@
 
  	vopl: vop@ff8f0000 {
  		compatible = "rockchip,rk3399-vop-lit";
-		reg = <0x0 0xff8f0000 0x0 0x3efc>;
+		reg = <0x0 0xff8f0000 0x0 0x2000>, <0x0 0xff8f2000 0x0 0x400>;
  		interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH 0>;
  		assigned-clocks = <&cru ACLK_VOP1>, <&cru HCLK_VOP1>;
  		assigned-clock-rates = <400000000>, <100000000>;
@@ -1666,7 +1749,6 @@
  		compatible = "rockchip,iommu";
  		reg = <0x0 0xff8f3f00 0x0 0x100>;
  		interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH 0>;
-		interrupt-names = "vopl_mmu";
  		clocks = <&cru ACLK_VOP1>, <&cru HCLK_VOP1>;
  		clock-names = "aclk", "iface";
  		power-domains = <&power RK3399_PD_VOPL>;
@@ -1676,7 +1758,7 @@
 
  	vopb: vop@ff900000 {
  		compatible = "rockchip,rk3399-vop-big";
-		reg = <0x0 0xff900000 0x0 0x3efc>;
+		reg = <0x0 0xff900000 0x0 0x2000>, <0x0 0xff902000 0x0 0x1000>;
  		interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH 0>;
  		assigned-clocks = <&cru ACLK_VOP0>, <&cru HCLK_VOP0>;
  		assigned-clock-rates = <400000000>, <100000000>;
@@ -1723,7 +1805,6 @@
  		compatible = "rockchip,iommu";
  		reg = <0x0 0xff903f00 0x0 0x100>;
  		interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH 0>;
-		interrupt-names = "vopb_mmu";
  		clocks = <&cru ACLK_VOP0>, <&cru HCLK_VOP0>;
  		clock-names = "aclk", "iface";
  		power-domains = <&power RK3399_PD_VOPB>;
@@ -1761,7 +1842,6 @@
  		compatible = "rockchip,iommu";
  		reg = <0x0 0xff914000 0x0 0x100>, <0x0 0xff915000 0x0 0x100>;
  		interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH 0>;
-		interrupt-names = "isp0_mmu";
  		clocks = <&cru ACLK_ISP0_WRAPPER>, <&cru HCLK_ISP0_WRAPPER>;
  		clock-names = "aclk", "iface";
  		#iommu-cells = <0>;
@@ -1769,11 +1849,36 @@
  		rockchip,disable-mmu-reset;
  	};
 
+	isp1: isp1@ff920000 {
+		compatible = "rockchip,rk3399-cif-isp";
+		reg = <0x0 0xff920000 0x0 0x4000>;
+		interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH 0>;
+		clocks = <&cru SCLK_ISP1>,
+			 <&cru ACLK_ISP1_WRAPPER>,
+			 <&cru HCLK_ISP1_WRAPPER>;
+		clock-names = "isp", "aclk", "hclk";
+		iommus = <&isp1_mmu>;
+		phys = <&mipi_dsi1>;
+		phy-names = "dphy";
+		power-domains = <&power RK3399_PD_ISP1>;
+		status = "disabled";
+
+		ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port@0 {
+				reg = <0>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+			};
+		};
+	};
+
  	isp1_mmu: iommu@ff924000 {
  		compatible = "rockchip,iommu";
  		reg = <0x0 0xff924000 0x0 0x100>, <0x0 0xff925000 0x0 0x100>;
  		interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH 0>;
-		interrupt-names = "isp1_mmu";
  		clocks = <&cru ACLK_ISP1_WRAPPER>, <&cru HCLK_ISP1_WRAPPER>;
  		clock-names = "aclk", "iface";
  		#iommu-cells = <0>;
@@ -1802,10 +1907,10 @@
  		interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH 0>;
  		clocks = <&cru PCLK_HDMI_CTRL>,
  			 <&cru SCLK_HDMI_SFR>,
-			 <&cru PLL_VPLL>,
+			 <&cru SCLK_HDMI_CEC>,
  			 <&cru PCLK_VIO_GRF>,
-			 <&cru SCLK_HDMI_CEC>;
-		clock-names = "iahb", "isfr", "vpll", "grf", "cec";
+			 <&cru PLL_VPLL>;
+		clock-names = "iahb", "isfr", "cec", "grf", "ref";
  		power-domains = <&power RK3399_PD_HDCP>;
  		reg-io-width = <4>;
  		rockchip,grf = <&grf>;
@@ -1878,6 +1983,7 @@
  		rockchip,grf = <&grf>;
  		#address-cells = <1>;
  		#size-cells = <0>;
+		#phy-cells = <0>;
  		status = "disabled";
 
  		ports {
@@ -1958,7 +2064,7 @@
  		#size-cells = <2>;
  		ranges;
 
-		gpio0: gpio0@ff720000 {
+		gpio0: gpio@ff720000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0x0 0xff720000 0x0 0x100>;
  			clocks = <&pmucru PCLK_GPIO0_PMU>;
@@ -1971,7 +2077,7 @@
  			#interrupt-cells = <0x2>;
  		};
 
-		gpio1: gpio1@ff730000 {
+		gpio1: gpio@ff730000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0x0 0xff730000 0x0 0x100>;
  			clocks = <&pmucru PCLK_GPIO1_PMU>;
@@ -1984,7 +2090,7 @@
  			#interrupt-cells = <0x2>;
  		};
 
-		gpio2: gpio2@ff780000 {
+		gpio2: gpio@ff780000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0x0 0xff780000 0x0 0x100>;
  			clocks = <&cru PCLK_GPIO2>;
@@ -1997,7 +2103,7 @@
  			#interrupt-cells = <0x2>;
  		};
 
-		gpio3: gpio3@ff788000 {
+		gpio3: gpio@ff788000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0x0 0xff788000 0x0 0x100>;
  			clocks = <&cru PCLK_GPIO3>;
@@ -2010,7 +2116,7 @@
  			#interrupt-cells = <0x2>;
  		};
 
-		gpio4: gpio4@ff790000 {
+		gpio4: gpio@ff790000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0x0 0xff790000 0x0 0x100>;
  			clocks = <&cru PCLK_GPIO4>;
@@ -2108,12 +2214,40 @@
  			output-low;
  		};
 
+		pcfg_input_enable: pcfg-input-enable {
+			input-enable;
+		};
+
+		pcfg_input_pull_up: pcfg-input-pull-up {
+			input-enable;
+			bias-pull-up;
+			drive-strength = <2>;
+		};
+
+		pcfg_input_pull_down: pcfg-input-pull-down {
+			input-enable;
+			bias-pull-down;
+			drive-strength = <2>;
+		};
+
  		clock {
  			clk_32k: clk-32k {
  				rockchip,pins = <0 RK_PA0 2 &pcfg_pull_none>;
  			};
  		};
 
+		cif {
+			cif_clkin: cif-clkin {
+				rockchip,pins =
+					<2 RK_PB2 3 &pcfg_pull_none>;
+			};
+
+			cif_clkouta: cif-clkouta {
+				rockchip,pins =
+					<2 RK_PB3 3 &pcfg_pull_none>;
+			};
+		};
+
  		edp {
  			edp_hpd: edp-hpd {
  				rockchip,pins =
@@ -2276,6 +2410,19 @@
  					<3 RK_PD7 1 &pcfg_pull_none>,
  					<4 RK_PA0 1 &pcfg_pull_none>;
  			};
+
+			i2s0_8ch_bus_bclk_off: i2s0-8ch-bus-bclk-off {
+				rockchip,pins =
+					<3 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>,
+					<3 RK_PD1 1 &pcfg_pull_none>,
+					<3 RK_PD2 1 &pcfg_pull_none>,
+					<3 RK_PD3 1 &pcfg_pull_none>,
+					<3 RK_PD4 1 &pcfg_pull_none>,
+					<3 RK_PD5 1 &pcfg_pull_none>,
+					<3 RK_PD6 1 &pcfg_pull_none>,
+					<3 RK_PD7 1 &pcfg_pull_none>,
+					<4 RK_PA0 1 &pcfg_pull_none>;
+			};
  		};
 
  		i2s1 {
@@ -2287,6 +2434,15 @@
  					<4 RK_PA6 1 &pcfg_pull_none>,
  					<4 RK_PA7 1 &pcfg_pull_none>;
  			};
+
+			i2s1_2ch_bus_bclk_off: i2s1-2ch-bus-bclk-off {
+				rockchip,pins =
+					<4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>,
+					<4 RK_PA4 1 &pcfg_pull_none>,
+					<4 RK_PA5 1 &pcfg_pull_none>,
+					<4 RK_PA6 1 &pcfg_pull_none>,
+					<4 RK_PA7 1 &pcfg_pull_none>;
+			};
  		};
 
  		sdio0 {
drivers/clk/rockchip/clk_rk3399.c +1 -1
index 97bf1c6e15b..e968ddf894b 100644
@@ -1049,7 +1049,7 @@ static ulong rk3399_clk_set_rate(struct clk *clk, ulong rate)
  		 * return 0 to satisfy clk_set_defaults during device probe.
  		 */
  		return 0;
-	case SCLK_DDRCLK:
+	case SCLK_TESTCLKOUT2:
  		ret = rk3399_ddr_set_clk(priv->cru, rate);
  		break;
  	case PCLK_EFUSE1024NS:
include/dt-bindings/clock/rk3399-cru.h +13 -11
index 211faf8fa89..44e0a319f07 100644
@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
  /*
   * Copyright (c) 2016 Rockchip Electronics Co. Ltd.
+ * Author: Xing Zheng <[email protected]>
   */
 
  #ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3399_H
@@ -121,16 +122,17 @@
  #define SCLK_DPHY_RX0_CFG		165
  #define SCLK_RMII_SRC			166
  #define SCLK_PCIEPHY_REF100M		167
-#define SCLK_USBPHY0_480M_SRC		168
-#define SCLK_USBPHY1_480M_SRC		169
-#define SCLK_DDRCLK			170
-#define SCLK_TESTOUT2			171
+#define SCLK_DDRC			168
+#define SCLK_TESTCLKOUT1		169
+#define SCLK_TESTCLKOUT2		170
 
  #define DCLK_VOP0			180
  #define DCLK_VOP1			181
  #define DCLK_VOP0_DIV			182
  #define DCLK_VOP1_DIV			183
  #define DCLK_M0_PERILP			184
+#define DCLK_VOP0_FRAC			185
+#define DCLK_VOP1_FRAC			186
 
  #define FCLK_CM0S			190
 
@@ -592,13 +594,13 @@
  #define SRST_P_SPI0			214
  #define SRST_P_SPI1			215
  #define SRST_P_SPI2			216
-#define SRST_P_SPI4			217
-#define SRST_P_SPI5			218
+#define SRST_P_SPI3			217
+#define SRST_P_SPI4			218
  #define SRST_SPI0			219
  #define SRST_SPI1			220
  #define SRST_SPI2			221
-#define SRST_SPI4			222
-#define SRST_SPI5			223
+#define SRST_SPI3			222
+#define SRST_SPI4			223
 
  /* cru_softrst_con14 */
  #define SRST_I2S0_8CH			224
@@ -720,8 +722,8 @@
  #define SRST_H_CM0S_NOC			3
  #define SRST_DBG_CM0S			4
  #define SRST_PO_CM0S			5
-#define SRST_P_SPI3			6
-#define SRST_SPI3			7
+#define SRST_P_SPI6			6
+#define SRST_SPI6			7
  #define SRST_P_TIMER_0_1		8
  #define SRST_P_TIMER_0			9
  #define SRST_P_TIMER_1			10
include/dt-bindings/power/rk3399-power.h +1 -0
index 168b3bfbd6f..aedd8b180fe 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
  #ifndef __DT_BINDINGS_POWER_RK3399_POWER_H__
  #define __DT_BINDINGS_POWER_RK3399_POWER_H__
 
#3 lore raw

Re: [PATCH 1/3] arm64: dts: rk3399: sync rk3399.dtsi from 6.1-rc1

In reply to Peter Robinson

Hi Peter,

Quoted 419 lines · Peter Robinson

Sync rk3399.dtsi and associated bindings includes. Fix up building of clk/rockchip/clk_rk3399.c for the changes as well as adjusting the rk3399-u-boot.dtsi for the new upstream pieces.

---
  arch/arm/dts/rk3399-opp.dtsi             |   6 +-
  arch/arm/dts/rk3399-u-boot.dtsi          |  36 ++--
  arch/arm/dts/rk3399.dtsi                 | 200 ++++++++++++++++++++---
  drivers/clk/rockchip/clk_rk3399.c        |   2 +-
  include/dt-bindings/clock/rk3399-cru.h   |  24 +--
  include/dt-bindings/power/rk3399-power.h |   1 +
  6 files changed, 206 insertions(+), 63 deletions(-)
arch/arm/dts/rk3399-opp.dtsi +3 -3
index da41cd81ebb..fee5e711127 100644
@@ -4,7 +4,7 @@
   */
 
  / {
-	cluster0_opp: opp-table0 {
+	cluster0_opp: opp-table-0 {
  		compatible = "operating-points-v2";
  		opp-shared;
 
@@ -35,7 +35,7 @@
  		};
  	};
 
-	cluster1_opp: opp-table1 {
+	cluster1_opp: opp-table-1 {
  		compatible = "operating-points-v2";
  		opp-shared;
 
@@ -74,7 +74,7 @@
  		};
  	};
 
-	gpu_opp_table: opp-table2 {
+	gpu_opp_table: opp-table-2 {
  		compatible = "operating-points-v2";
 
  		opp00 {
arch/arm/dts/rk3399-u-boot.dtsi +10 -26
index 3c1a15fe51b..2fa8f25a3e1 100644
@@ -20,38 +20,12 @@
  		reg = <0x0 0xff620000 0x0 0x100>;
  	};
 
-	dfi: dfi@ff630000 {
-		u-boot,dm-pre-reloc;
-		reg = <0x00 0xff630000 0x00 0x4000>;
-		compatible = "rockchip,rk3399-dfi";
-		rockchip,pmu = <&pmugrf>;
-		clocks = <&cru PCLK_DDR_MON>;
-		clock-names = "pclk_ddr_mon";
-	};
-
  	rng: rng@ff8b8000 {
  		compatible = "rockchip,cryptov1-rng";
  		reg = <0x0 0xff8b8000 0x0 0x1000>;
  		status = "okay";
  	};
 
-	dmc: dmc {
-		u-boot,dm-pre-reloc;
-		compatible = "rockchip,rk3399-dmc";
-		devfreq-events = <&dfi>;
-		interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH 0>;
-		clocks = <&cru SCLK_DDRCLK>;
-		clock-names = "dmc_clk";
-		reg = <0x0 0xffa80000 0x0 0x0800
-		       0x0 0xffa80800 0x0 0x1800
-		       0x0 0xffa82000 0x0 0x2000
-		       0x0 0xffa84000 0x0 0x1000
-		       0x0 0xffa88000 0x0 0x0800
-		       0x0 0xffa88800 0x0 0x1800
-		       0x0 0xffa8a000 0x0 0x2000
-		       0x0 0xffa8c000 0x0 0x1000>;
-	};
-
  	pmusgrf: syscon@ff330000 {
  		u-boot,dm-pre-reloc;
  		compatible = "rockchip,rk3399-pmusgrf", "syscon";
@@ -88,6 +62,16 @@
  	u-boot,dm-pre-reloc;
  };
 
+&dfi {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+};
+
+&dmc {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+};
+
  &emmc_phy {
  	u-boot,dm-pre-reloc;
  };
arch/arm/dts/rk3399.dtsi +123 -17
index 3871c7fd83b..92c2207e686 100644
@@ -124,6 +124,12 @@
  			#cooling-cells = <2>; /* min followed by max */
  			dynamic-power-coefficient = <436>;
  			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
+
+			thermal-idle {
+				#cooling-cells = <2>;
+				duration-us = <10000>;
+				exit-latency-us = <500>;
+			};
  		};
 
  		cpu_b1: cpu@101 {
@@ -136,6 +142,12 @@
  			#cooling-cells = <2>; /* min followed by max */
  			dynamic-power-coefficient = <436>;
  			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
+
+			thermal-idle {
+				#cooling-cells = <2>;
+				duration-us = <10000>;
+				exit-latency-us = <500>;
+			};
  		};
 
  		idle-states {
@@ -166,6 +178,15 @@
  		ports = <&vopl_out>, <&vopb_out>;
  	};
 
+	dmc: memory-controller {
+		compatible = "rockchip,rk3399-dmc";
+		rockchip,pmu = <&pmugrf>;
+		devfreq-events = <&dfi>;
+		clocks = <&cru SCLK_DDRC>;
+		clock-names = "dmc_clk";
+		status = "disabled";
+	};
+
  	pmu_a53 {
  		compatible = "arm,cortex-a53-pmu";
  		interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW &ppi_cluster0>;
@@ -361,6 +382,54 @@
  		status = "disabled";
  	};
 
+	debug@fe430000 {
+		compatible = "arm,coresight-cpu-debug", "arm,primecell";
+		reg = <0 0xfe430000 0 0x1000>;
+		clocks = <&cru PCLK_COREDBG_L>;
+		clock-names = "apb_pclk";
+		cpu = <&cpu_l0>;
+	};
+
+	debug@fe432000 {
+		compatible = "arm,coresight-cpu-debug", "arm,primecell";
+		reg = <0 0xfe432000 0 0x1000>;
+		clocks = <&cru PCLK_COREDBG_L>;
+		clock-names = "apb_pclk";
+		cpu = <&cpu_l1>;
+	};
+
+	debug@fe434000 {
+		compatible = "arm,coresight-cpu-debug", "arm,primecell";
+		reg = <0 0xfe434000 0 0x1000>;
+		clocks = <&cru PCLK_COREDBG_L>;
+		clock-names = "apb_pclk";
+		cpu = <&cpu_l2>;
+	};
+
+	debug@fe436000 {
+		compatible = "arm,coresight-cpu-debug", "arm,primecell";
+		reg = <0 0xfe436000 0 0x1000>;
+		clocks = <&cru PCLK_COREDBG_L>;
+		clock-names = "apb_pclk";
+		cpu = <&cpu_l3>;
+	};
+
+	debug@fe610000 {
+		compatible = "arm,coresight-cpu-debug", "arm,primecell";
+		reg = <0 0xfe610000 0 0x1000>;
+		clocks = <&cru PCLK_COREDBG_B>;
+		clock-names = "apb_pclk";
+		cpu = <&cpu_b0>;
+	};
+
+	debug@fe710000 {
+		compatible = "arm,coresight-cpu-debug", "arm,primecell";
+		reg = <0 0xfe710000 0 0x1000>;
+		clocks = <&cru PCLK_COREDBG_B>;
+		clock-names = "apb_pclk";
+		cpu = <&cpu_b1>;
+	};
+
  	usbdrd3_0: usb@fe800000 {
  		compatible = "rockchip,rk3399-dwc3";
  		#address-cells = <2>;
@@ -1235,6 +1304,16 @@
  		status = "disabled";
  	};
 
+	dfi: dfi@ff630000 {
+		reg = <0x00 0xff630000 0x00 0x4000>;
+		compatible = "rockchip,rk3399-dfi";
+		rockchip,pmu = <&pmugrf>;
+		interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH 0>;
+		clocks = <&cru PCLK_DDR_MON>;
+		clock-names = "pclk_ddr_mon";
+		status = "disabled";
+	};
+
  	vpu: video-codec@ff650000 {
  		compatible = "rockchip,rk3399-vpu";
  		reg = <0x0 0xff650000 0x0 0x800>;
@@ -1251,7 +1330,6 @@
  		compatible = "rockchip,iommu";
  		reg = <0x0 0xff650800 0x0 0x40>;
  		interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH 0>;
-		interrupt-names = "vpu_mmu";
  		clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
  		clock-names = "aclk", "iface";
  		#iommu-cells = <0>;
@@ -1273,7 +1351,6 @@
  		compatible = "rockchip,iommu";
  		reg = <0x0 0xff660480 0x0 0x40>, <0x0 0xff6604c0 0x0 0x40>;
  		interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH 0>;
-		interrupt-names = "vdec_mmu";
  		clocks = <&cru ACLK_VDU>, <&cru HCLK_VDU>;
  		clock-names = "aclk", "iface";
  		power-domains = <&power RK3399_PD_VDU>;
@@ -1284,7 +1361,6 @@
  		compatible = "rockchip,iommu";
  		reg = <0x0 0xff670800 0x0 0x40>;
  		interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH 0>;
-		interrupt-names = "iep_mmu";
  		clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>;
  		clock-names = "aclk", "iface";
  		#iommu-cells = <0>;
@@ -1356,9 +1432,11 @@
  		clock-names = "apb_pclk";
  	};
 
-	pmucru: pmu-clock-controller@ff750000 {
+	pmucru: clock-controller@ff750000 {
  		compatible = "rockchip,rk3399-pmucru";
  		reg = <0x0 0xff750000 0x0 0x1000>;
+		clocks = <&xin24m>;
+		clock-names = "xin24m";
  		rockchip,grf = <&pmugrf>;
  		#clock-cells = <1>;
  		#reset-cells = <1>;
@@ -1369,6 +1447,8 @@
  	cru: clock-controller@ff760000 {
  		compatible = "rockchip,rk3399-cru";
  		reg = <0x0 0xff760000 0x0 0x1000>;
+		clocks = <&xin24m>;
+		clock-names = "xin24m";
  		rockchip,grf = <&grf>;
  		#clock-cells = <1>;
  		#reset-cells = <1>;
@@ -1382,7 +1462,8 @@
  			<&cru HCLK_PERILP1>, <&cru PCLK_PERILP1>,
  			<&cru ACLK_VIO>, <&cru ACLK_HDCP>,
  			<&cru ACLK_GIC_PRE>,
-			<&cru PCLK_DDR>;
+			<&cru PCLK_DDR>,
+			<&cru ACLK_VDU>;
  		assigned-clock-rates =
  			 <594000000>,  <800000000>,
  			<1000000000>,
@@ -1393,7 +1474,8 @@
  			 <100000000>,   <50000000>,
  			 <400000000>, <400000000>,
  			 <200000000>,
-			 <200000000>;
+			 <200000000>,
+			 <400000000>;
  	};
 
  	grf: syscon@ff770000 {
@@ -1477,6 +1559,7 @@
  			reg = <0xf780 0x24>;
  			clocks = <&sdhci>;
  			clock-names = "emmcclk";
+			drive-impedance-ohm = <50>;
  			#phy-cells = <0>;
  			status = "disabled";
  		};
@@ -1487,7 +1570,6 @@
  			clock-names = "refclk";
  			#phy-cells = <1>;
  			resets = <&cru SRST_PCIEPHY>;
-			drive-impedance-ohm = <50>;
  			reset-names = "phy";
  			status = "disabled";
  		};
@@ -1582,8 +1664,9 @@
  		dma-names = "tx", "rx";
  		clock-names = "i2s_clk", "i2s_hclk";
  		clocks = <&cru SCLK_I2S0_8CH>, <&cru HCLK_I2S0_8CH>;
-		pinctrl-names = "default";
+		pinctrl-names = "bclk_on", "bclk_off";
  		pinctrl-0 = <&i2s0_8ch_bus>;
+		pinctrl-1 = <&i2s0_8ch_bus_bclk_off>;
  		power-domains = <&power RK3399_PD_SDIOAUDIO>;
  		#sound-dai-cells = <0>;
  		status = "disabled";
@@ -1619,7 +1702,7 @@
 
  	vopl: vop@ff8f0000 {
  		compatible = "rockchip,rk3399-vop-lit";
-		reg = <0x0 0xff8f0000 0x0 0x3efc>;
+		reg = <0x0 0xff8f0000 0x0 0x2000>, <0x0 0xff8f2000 0x0 0x400>;
  		interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH 0>;
  		assigned-clocks = <&cru ACLK_VOP1>, <&cru HCLK_VOP1>;
  		assigned-clock-rates = <400000000>, <100000000>;
@@ -1666,7 +1749,6 @@
  		compatible = "rockchip,iommu";
  		reg = <0x0 0xff8f3f00 0x0 0x100>;
  		interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH 0>;
-		interrupt-names = "vopl_mmu";
  		clocks = <&cru ACLK_VOP1>, <&cru HCLK_VOP1>;
  		clock-names = "aclk", "iface";
  		power-domains = <&power RK3399_PD_VOPL>;
@@ -1676,7 +1758,7 @@
 
  	vopb: vop@ff900000 {
  		compatible = "rockchip,rk3399-vop-big";
-		reg = <0x0 0xff900000 0x0 0x3efc>;
+		reg = <0x0 0xff900000 0x0 0x2000>, <0x0 0xff902000 0x0 0x1000>;
  		interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH 0>;
  		assigned-clocks = <&cru ACLK_VOP0>, <&cru HCLK_VOP0>;
  		assigned-clock-rates = <400000000>, <100000000>;
@@ -1723,7 +1805,6 @@
  		compatible = "rockchip,iommu";
  		reg = <0x0 0xff903f00 0x0 0x100>;
  		interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH 0>;
-		interrupt-names = "vopb_mmu";
  		clocks = <&cru ACLK_VOP0>, <&cru HCLK_VOP0>;
  		clock-names = "aclk", "iface";
  		power-domains = <&power RK3399_PD_VOPB>;
@@ -1761,7 +1842,6 @@
  		compatible = "rockchip,iommu";
  		reg = <0x0 0xff914000 0x0 0x100>, <0x0 0xff915000 0x0 0x100>;
  		interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH 0>;
-		interrupt-names = "isp0_mmu";
  		clocks = <&cru ACLK_ISP0_WRAPPER>, <&cru HCLK_ISP0_WRAPPER>;
  		clock-names = "aclk", "iface";
  		#iommu-cells = <0>;
@@ -1769,11 +1849,36 @@
  		rockchip,disable-mmu-reset;
  	};
 
+	isp1: isp1@ff920000 {
+		compatible = "rockchip,rk3399-cif-isp";
+		reg = <0x0 0xff920000 0x0 0x4000>;
+		interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH 0>;
+		clocks = <&cru SCLK_ISP1>,
+			 <&cru ACLK_ISP1_WRAPPER>,
+			 <&cru HCLK_ISP1_WRAPPER>;
+		clock-names = "isp", "aclk", "hclk";
+		iommus = <&isp1_mmu>;
+		phys = <&mipi_dsi1>;
+		phy-names = "dphy";
+		power-domains = <&power RK3399_PD_ISP1>;
+		status = "disabled";
+
+		ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port@0 {
+				reg = <0>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+			};
+		};
+	};
+
  	isp1_mmu: iommu@ff924000 {
  		compatible = "rockchip,iommu";
  		reg = <0x0 0xff924000 0x0 0x100>, <0x0 0xff925000 0x0 0x100>;
  		interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH 0>;
-		interrupt-names = "isp1_mmu";
  		clocks = <&cru ACLK_ISP1_WRAPPER>, <&cru HCLK_ISP1_WRAPPER>;
  		clock-names = "aclk", "iface";
  		#iommu-cells = <0>;
@@ -1802,10 +1907,10 @@
  		interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH 0>;
  		clocks = <&cru PCLK_HDMI_CTRL>,
  			 <&cru SCLK_HDMI_SFR>,
-			 <&cru PLL_VPLL>,
+			 <&cru SCLK_HDMI_CEC>,
  			 <&cru PCLK_VIO_GRF>,
-			 <&cru SCLK_HDMI_CEC>;
-		clock-names = "iahb", "isfr", "vpll", "grf", "cec";
+			 <&cru PLL_VPLL>;
+		clock-names = "iahb", "isfr", "cec", "grf", "ref";
  		power-domains = <&power RK3399_PD_HDCP>;
  		reg-io-width = <4>;
  		rockchip,grf = <&grf>;
@@ -1878,6 +1983,7 @@
  		rockchip,grf = <&grf>;
  		#address-cells = <1>;
  		#size-cells = <0>;
+		#phy-cells = <0>;
  		status = "disabled";
 
  		ports {

arch/arm/dts/rk3399.dtsi line 2067

Quoted 5 lines
arch/arm/dts/rk3399.dtsi +1 -1
@@ -1958,7 +2064,7 @@
  		#size-cells = <2>;
  		ranges;
 
-		gpio0: gpio0@ff720000 {
+		gpio0: gpio@ff720000 {

Thanks for looking at this update, I myself was playing with this for all Rockchip devices but it's really not that easy to do unfortunately.

Please note that this will break the gpio driver, c.f. the logic here:
https://source.denx.de/u-boot/u-boot/-/blob/master/drivers/gpio/rk_gpio.c#L154-L157

Please DO NOT use the logic used in the kernel, it's broken and works by chance and will not work in U-Boot.

I'm tempted to add a new DT property like:
rockchip,gpio-controller = <0>;
in gpio0,
rockchip,gpio-controller = <1>;
in gpio1, etc....

I don't think U-boot cares too much about DT backward compatibility so this wouldn't be much of a problem. It's a different issue in the Linux kernel but that's not the place to discuss this :)

Cheers,
Quentin

Quoted 202 lines
arch/arm/dts/rk3399.dtsi +54 -4
  			compatible = "rockchip,gpio-bank";
  			reg = <0x0 0xff720000 0x0 0x100>;
  			clocks = <&pmucru PCLK_GPIO0_PMU>;
@@ -1971,7 +2077,7 @@
  			#interrupt-cells = <0x2>;
  		};
 
-		gpio1: gpio1@ff730000 {
+		gpio1: gpio@ff730000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0x0 0xff730000 0x0 0x100>;
  			clocks = <&pmucru PCLK_GPIO1_PMU>;
@@ -1984,7 +2090,7 @@
  			#interrupt-cells = <0x2>;
  		};
 
-		gpio2: gpio2@ff780000 {
+		gpio2: gpio@ff780000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0x0 0xff780000 0x0 0x100>;
  			clocks = <&cru PCLK_GPIO2>;
@@ -1997,7 +2103,7 @@
  			#interrupt-cells = <0x2>;
  		};
 
-		gpio3: gpio3@ff788000 {
+		gpio3: gpio@ff788000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0x0 0xff788000 0x0 0x100>;
  			clocks = <&cru PCLK_GPIO3>;
@@ -2010,7 +2116,7 @@
  			#interrupt-cells = <0x2>;
  		};
 
-		gpio4: gpio4@ff790000 {
+		gpio4: gpio@ff790000 {
  			compatible = "rockchip,gpio-bank";
  			reg = <0x0 0xff790000 0x0 0x100>;
  			clocks = <&cru PCLK_GPIO4>;
@@ -2108,12 +2214,40 @@
  			output-low;
  		};
 
+		pcfg_input_enable: pcfg-input-enable {
+			input-enable;
+		};
+
+		pcfg_input_pull_up: pcfg-input-pull-up {
+			input-enable;
+			bias-pull-up;
+			drive-strength = <2>;
+		};
+
+		pcfg_input_pull_down: pcfg-input-pull-down {
+			input-enable;
+			bias-pull-down;
+			drive-strength = <2>;
+		};
+
  		clock {
  			clk_32k: clk-32k {
  				rockchip,pins = <0 RK_PA0 2 &pcfg_pull_none>;
  			};
  		};
 
+		cif {
+			cif_clkin: cif-clkin {
+				rockchip,pins =
+					<2 RK_PB2 3 &pcfg_pull_none>;
+			};
+
+			cif_clkouta: cif-clkouta {
+				rockchip,pins =
+					<2 RK_PB3 3 &pcfg_pull_none>;
+			};
+		};
+
  		edp {
  			edp_hpd: edp-hpd {
  				rockchip,pins =
@@ -2276,6 +2410,19 @@
  					<3 RK_PD7 1 &pcfg_pull_none>,
  					<4 RK_PA0 1 &pcfg_pull_none>;
  			};
+
+			i2s0_8ch_bus_bclk_off: i2s0-8ch-bus-bclk-off {
+				rockchip,pins =
+					<3 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>,
+					<3 RK_PD1 1 &pcfg_pull_none>,
+					<3 RK_PD2 1 &pcfg_pull_none>,
+					<3 RK_PD3 1 &pcfg_pull_none>,
+					<3 RK_PD4 1 &pcfg_pull_none>,
+					<3 RK_PD5 1 &pcfg_pull_none>,
+					<3 RK_PD6 1 &pcfg_pull_none>,
+					<3 RK_PD7 1 &pcfg_pull_none>,
+					<4 RK_PA0 1 &pcfg_pull_none>;
+			};
  		};
 
  		i2s1 {
@@ -2287,6 +2434,15 @@
  					<4 RK_PA6 1 &pcfg_pull_none>,
  					<4 RK_PA7 1 &pcfg_pull_none>;
  			};
+
+			i2s1_2ch_bus_bclk_off: i2s1-2ch-bus-bclk-off {
+				rockchip,pins =
+					<4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>,
+					<4 RK_PA4 1 &pcfg_pull_none>,
+					<4 RK_PA5 1 &pcfg_pull_none>,
+					<4 RK_PA6 1 &pcfg_pull_none>,
+					<4 RK_PA7 1 &pcfg_pull_none>;
+			};
  		};
 
  		sdio0 {
drivers/clk/rockchip/clk_rk3399.c +1 -1
index 97bf1c6e15b..e968ddf894b 100644
@@ -1049,7 +1049,7 @@ static ulong rk3399_clk_set_rate(struct clk *clk, ulong rate)
  		 * return 0 to satisfy clk_set_defaults during device probe.
  		 */
  		return 0;
-	case SCLK_DDRCLK:
+	case SCLK_TESTCLKOUT2:
  		ret = rk3399_ddr_set_clk(priv->cru, rate);
  		break;
  	case PCLK_EFUSE1024NS:
include/dt-bindings/clock/rk3399-cru.h +13 -11
index 211faf8fa89..44e0a319f07 100644
@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
  /*
   * Copyright (c) 2016 Rockchip Electronics Co. Ltd.
+ * Author: Xing Zheng <[email protected]>
   */
 
  #ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3399_H
@@ -121,16 +122,17 @@
  #define SCLK_DPHY_RX0_CFG		165
  #define SCLK_RMII_SRC			166
  #define SCLK_PCIEPHY_REF100M		167
-#define SCLK_USBPHY0_480M_SRC		168
-#define SCLK_USBPHY1_480M_SRC		169
-#define SCLK_DDRCLK			170
-#define SCLK_TESTOUT2			171
+#define SCLK_DDRC			168
+#define SCLK_TESTCLKOUT1		169
+#define SCLK_TESTCLKOUT2		170
 
  #define DCLK_VOP0			180
  #define DCLK_VOP1			181
  #define DCLK_VOP0_DIV			182
  #define DCLK_VOP1_DIV			183
  #define DCLK_M0_PERILP			184
+#define DCLK_VOP0_FRAC			185
+#define DCLK_VOP1_FRAC			186
 
  #define FCLK_CM0S			190
 
@@ -592,13 +594,13 @@
  #define SRST_P_SPI0			214
  #define SRST_P_SPI1			215
  #define SRST_P_SPI2			216
-#define SRST_P_SPI4			217
-#define SRST_P_SPI5			218
+#define SRST_P_SPI3			217
+#define SRST_P_SPI4			218
  #define SRST_SPI0			219
  #define SRST_SPI1			220
  #define SRST_SPI2			221
-#define SRST_SPI4			222
-#define SRST_SPI5			223
+#define SRST_SPI3			222
+#define SRST_SPI4			223
 
  /* cru_softrst_con14 */
  #define SRST_I2S0_8CH			224
@@ -720,8 +722,8 @@
  #define SRST_H_CM0S_NOC			3
  #define SRST_DBG_CM0S			4
  #define SRST_PO_CM0S			5
-#define SRST_P_SPI3			6
-#define SRST_SPI3			7
+#define SRST_P_SPI6			6
+#define SRST_SPI6			7
  #define SRST_P_TIMER_0_1		8
  #define SRST_P_TIMER_0			9
  #define SRST_P_TIMER_1			10
include/dt-bindings/power/rk3399-power.h +1 -0
index 168b3bfbd6f..aedd8b180fe 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
  #ifndef __DT_BINDINGS_POWER_RK3399_POWER_H__
  #define __DT_BINDINGS_POWER_RK3399_POWER_H__
 
#4 lore raw

Re: [PATCH 1/3] arm64: dts: rk3399: sync rk3399.dtsi from 6.1-rc1

Hi Quentin,

Quoted 423 lines · Peter Robinson
Quoted 422 lines

Sync rk3399.dtsi and associated bindings includes. Fix up building of clk/rockchip/clk_rk3399.c for the changes as well as adjusting the rk3399-u-boot.dtsi for the new upstream pieces.

---
  arch/arm/dts/rk3399-opp.dtsi             |   6 +-
  arch/arm/dts/rk3399-u-boot.dtsi          |  36 ++--
  arch/arm/dts/rk3399.dtsi                 | 200 ++++++++++++++++++++---
  drivers/clk/rockchip/clk_rk3399.c        |   2 +-
  include/dt-bindings/clock/rk3399-cru.h   |  24 +--
  include/dt-bindings/power/rk3399-power.h |   1 +
  6 files changed, 206 insertions(+), 63 deletions(-)
arch/arm/dts/rk3399-opp.dtsi +3 -3
index da41cd81ebb..fee5e711127 100644
@@ -4,7 +4,7 @@
   */
 
  / {
-     cluster0_opp: opp-table0 {
+     cluster0_opp: opp-table-0 {
              compatible = "operating-points-v2";
              opp-shared;
 
@@ -35,7 +35,7 @@
              };
      };
 
-     cluster1_opp: opp-table1 {
+     cluster1_opp: opp-table-1 {
              compatible = "operating-points-v2";
              opp-shared;
 
@@ -74,7 +74,7 @@
              };
      };
 
-     gpu_opp_table: opp-table2 {
+     gpu_opp_table: opp-table-2 {
              compatible = "operating-points-v2";
 
              opp00 {
arch/arm/dts/rk3399-u-boot.dtsi +10 -26
index 3c1a15fe51b..2fa8f25a3e1 100644
@@ -20,38 +20,12 @@
              reg = <0x0 0xff620000 0x0 0x100>;
      };
 
-     dfi: dfi@ff630000 {
-             u-boot,dm-pre-reloc;
-             reg = <0x00 0xff630000 0x00 0x4000>;
-             compatible = "rockchip,rk3399-dfi";
-             rockchip,pmu = <&pmugrf>;
-             clocks = <&cru PCLK_DDR_MON>;
-             clock-names = "pclk_ddr_mon";
-     };
-
      rng: rng@ff8b8000 {
              compatible = "rockchip,cryptov1-rng";
              reg = <0x0 0xff8b8000 0x0 0x1000>;
              status = "okay";
      };
 
-     dmc: dmc {
-             u-boot,dm-pre-reloc;
-             compatible = "rockchip,rk3399-dmc";
-             devfreq-events = <&dfi>;
-             interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH 0>;
-             clocks = <&cru SCLK_DDRCLK>;
-             clock-names = "dmc_clk";
-             reg = <0x0 0xffa80000 0x0 0x0800
-                    0x0 0xffa80800 0x0 0x1800
-                    0x0 0xffa82000 0x0 0x2000
-                    0x0 0xffa84000 0x0 0x1000
-                    0x0 0xffa88000 0x0 0x0800
-                    0x0 0xffa88800 0x0 0x1800
-                    0x0 0xffa8a000 0x0 0x2000
-                    0x0 0xffa8c000 0x0 0x1000>;
-     };
-
      pmusgrf: syscon@ff330000 {
              u-boot,dm-pre-reloc;
              compatible = "rockchip,rk3399-pmusgrf", "syscon";
@@ -88,6 +62,16 @@
      u-boot,dm-pre-reloc;
  };
 
+&dfi {
+     u-boot,dm-pre-reloc;
+     status = "okay";
+};
+
+&dmc {
+     u-boot,dm-pre-reloc;
+     status = "okay";
+};
+
  &emmc_phy {
      u-boot,dm-pre-reloc;
  };
arch/arm/dts/rk3399.dtsi +123 -17
index 3871c7fd83b..92c2207e686 100644
@@ -124,6 +124,12 @@
                      #cooling-cells = <2>; /* min followed by max */
                      dynamic-power-coefficient = <436>;
                      cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
+
+                     thermal-idle {
+                             #cooling-cells = <2>;
+                             duration-us = <10000>;
+                             exit-latency-us = <500>;
+                     };
              };
 
              cpu_b1: cpu@101 {
@@ -136,6 +142,12 @@
                      #cooling-cells = <2>; /* min followed by max */
                      dynamic-power-coefficient = <436>;
                      cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
+
+                     thermal-idle {
+                             #cooling-cells = <2>;
+                             duration-us = <10000>;
+                             exit-latency-us = <500>;
+                     };
              };
 
              idle-states {
@@ -166,6 +178,15 @@
              ports = <&vopl_out>, <&vopb_out>;
      };
 
+     dmc: memory-controller {
+             compatible = "rockchip,rk3399-dmc";
+             rockchip,pmu = <&pmugrf>;
+             devfreq-events = <&dfi>;
+             clocks = <&cru SCLK_DDRC>;
+             clock-names = "dmc_clk";
+             status = "disabled";
+     };
+
      pmu_a53 {
              compatible = "arm,cortex-a53-pmu";
              interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW &ppi_cluster0>;
@@ -361,6 +382,54 @@
              status = "disabled";
      };
 
+     debug@fe430000 {
+             compatible = "arm,coresight-cpu-debug", "arm,primecell";
+             reg = <0 0xfe430000 0 0x1000>;
+             clocks = <&cru PCLK_COREDBG_L>;
+             clock-names = "apb_pclk";
+             cpu = <&cpu_l0>;
+     };
+
+     debug@fe432000 {
+             compatible = "arm,coresight-cpu-debug", "arm,primecell";
+             reg = <0 0xfe432000 0 0x1000>;
+             clocks = <&cru PCLK_COREDBG_L>;
+             clock-names = "apb_pclk";
+             cpu = <&cpu_l1>;
+     };
+
+     debug@fe434000 {
+             compatible = "arm,coresight-cpu-debug", "arm,primecell";
+             reg = <0 0xfe434000 0 0x1000>;
+             clocks = <&cru PCLK_COREDBG_L>;
+             clock-names = "apb_pclk";
+             cpu = <&cpu_l2>;
+     };
+
+     debug@fe436000 {
+             compatible = "arm,coresight-cpu-debug", "arm,primecell";
+             reg = <0 0xfe436000 0 0x1000>;
+             clocks = <&cru PCLK_COREDBG_L>;
+             clock-names = "apb_pclk";
+             cpu = <&cpu_l3>;
+     };
+
+     debug@fe610000 {
+             compatible = "arm,coresight-cpu-debug", "arm,primecell";
+             reg = <0 0xfe610000 0 0x1000>;
+             clocks = <&cru PCLK_COREDBG_B>;
+             clock-names = "apb_pclk";
+             cpu = <&cpu_b0>;
+     };
+
+     debug@fe710000 {
+             compatible = "arm,coresight-cpu-debug", "arm,primecell";
+             reg = <0 0xfe710000 0 0x1000>;
+             clocks = <&cru PCLK_COREDBG_B>;
+             clock-names = "apb_pclk";
+             cpu = <&cpu_b1>;
+     };
+
      usbdrd3_0: usb@fe800000 {
              compatible = "rockchip,rk3399-dwc3";
              #address-cells = <2>;
@@ -1235,6 +1304,16 @@
              status = "disabled";
      };
 
+     dfi: dfi@ff630000 {
+             reg = <0x00 0xff630000 0x00 0x4000>;
+             compatible = "rockchip,rk3399-dfi";
+             rockchip,pmu = <&pmugrf>;
+             interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH 0>;
+             clocks = <&cru PCLK_DDR_MON>;
+             clock-names = "pclk_ddr_mon";
+             status = "disabled";
+     };
+
      vpu: video-codec@ff650000 {
              compatible = "rockchip,rk3399-vpu";
              reg = <0x0 0xff650000 0x0 0x800>;
@@ -1251,7 +1330,6 @@
              compatible = "rockchip,iommu";
              reg = <0x0 0xff650800 0x0 0x40>;
              interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH 0>;
-             interrupt-names = "vpu_mmu";
              clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
              clock-names = "aclk", "iface";
              #iommu-cells = <0>;
@@ -1273,7 +1351,6 @@
              compatible = "rockchip,iommu";
              reg = <0x0 0xff660480 0x0 0x40>, <0x0 0xff6604c0 0x0 0x40>;
              interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH 0>;
-             interrupt-names = "vdec_mmu";
              clocks = <&cru ACLK_VDU>, <&cru HCLK_VDU>;
              clock-names = "aclk", "iface";
              power-domains = <&power RK3399_PD_VDU>;
@@ -1284,7 +1361,6 @@
              compatible = "rockchip,iommu";
              reg = <0x0 0xff670800 0x0 0x40>;
              interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH 0>;
-             interrupt-names = "iep_mmu";
              clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>;
              clock-names = "aclk", "iface";
              #iommu-cells = <0>;
@@ -1356,9 +1432,11 @@
              clock-names = "apb_pclk";
      };
 
-     pmucru: pmu-clock-controller@ff750000 {
+     pmucru: clock-controller@ff750000 {
              compatible = "rockchip,rk3399-pmucru";
              reg = <0x0 0xff750000 0x0 0x1000>;
+             clocks = <&xin24m>;
+             clock-names = "xin24m";
              rockchip,grf = <&pmugrf>;
              #clock-cells = <1>;
              #reset-cells = <1>;
@@ -1369,6 +1447,8 @@
      cru: clock-controller@ff760000 {
              compatible = "rockchip,rk3399-cru";
              reg = <0x0 0xff760000 0x0 0x1000>;
+             clocks = <&xin24m>;
+             clock-names = "xin24m";
              rockchip,grf = <&grf>;
              #clock-cells = <1>;
              #reset-cells = <1>;
@@ -1382,7 +1462,8 @@
                      <&cru HCLK_PERILP1>, <&cru PCLK_PERILP1>,
                      <&cru ACLK_VIO>, <&cru ACLK_HDCP>,
                      <&cru ACLK_GIC_PRE>,
-                     <&cru PCLK_DDR>;
+                     <&cru PCLK_DDR>,
+                     <&cru ACLK_VDU>;
              assigned-clock-rates =
                       <594000000>,  <800000000>,
                      <1000000000>,
@@ -1393,7 +1474,8 @@
                       <100000000>,   <50000000>,
                       <400000000>, <400000000>,
                       <200000000>,
-                      <200000000>;
+                      <200000000>,
+                      <400000000>;
      };
 
      grf: syscon@ff770000 {
@@ -1477,6 +1559,7 @@
                      reg = <0xf780 0x24>;
                      clocks = <&sdhci>;
                      clock-names = "emmcclk";
+                     drive-impedance-ohm = <50>;
                      #phy-cells = <0>;
                      status = "disabled";
              };
@@ -1487,7 +1570,6 @@
                      clock-names = "refclk";
                      #phy-cells = <1>;
                      resets = <&cru SRST_PCIEPHY>;
-                     drive-impedance-ohm = <50>;
                      reset-names = "phy";
                      status = "disabled";
              };
@@ -1582,8 +1664,9 @@
              dma-names = "tx", "rx";
              clock-names = "i2s_clk", "i2s_hclk";
              clocks = <&cru SCLK_I2S0_8CH>, <&cru HCLK_I2S0_8CH>;
-             pinctrl-names = "default";
+             pinctrl-names = "bclk_on", "bclk_off";
              pinctrl-0 = <&i2s0_8ch_bus>;
+             pinctrl-1 = <&i2s0_8ch_bus_bclk_off>;
              power-domains = <&power RK3399_PD_SDIOAUDIO>;
              #sound-dai-cells = <0>;
              status = "disabled";
@@ -1619,7 +1702,7 @@
 
      vopl: vop@ff8f0000 {
              compatible = "rockchip,rk3399-vop-lit";
-             reg = <0x0 0xff8f0000 0x0 0x3efc>;
+             reg = <0x0 0xff8f0000 0x0 0x2000>, <0x0 0xff8f2000 0x0 0x400>;
              interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH 0>;
              assigned-clocks = <&cru ACLK_VOP1>, <&cru HCLK_VOP1>;
              assigned-clock-rates = <400000000>, <100000000>;
@@ -1666,7 +1749,6 @@
              compatible = "rockchip,iommu";
              reg = <0x0 0xff8f3f00 0x0 0x100>;
              interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH 0>;
-             interrupt-names = "vopl_mmu";
              clocks = <&cru ACLK_VOP1>, <&cru HCLK_VOP1>;
              clock-names = "aclk", "iface";
              power-domains = <&power RK3399_PD_VOPL>;
@@ -1676,7 +1758,7 @@
 
      vopb: vop@ff900000 {
              compatible = "rockchip,rk3399-vop-big";
-             reg = <0x0 0xff900000 0x0 0x3efc>;
+             reg = <0x0 0xff900000 0x0 0x2000>, <0x0 0xff902000 0x0 0x1000>;
              interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH 0>;
              assigned-clocks = <&cru ACLK_VOP0>, <&cru HCLK_VOP0>;
              assigned-clock-rates = <400000000>, <100000000>;
@@ -1723,7 +1805,6 @@
              compatible = "rockchip,iommu";
              reg = <0x0 0xff903f00 0x0 0x100>;
              interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH 0>;
-             interrupt-names = "vopb_mmu";
              clocks = <&cru ACLK_VOP0>, <&cru HCLK_VOP0>;
              clock-names = "aclk", "iface";
              power-domains = <&power RK3399_PD_VOPB>;
@@ -1761,7 +1842,6 @@
              compatible = "rockchip,iommu";
              reg = <0x0 0xff914000 0x0 0x100>, <0x0 0xff915000 0x0 0x100>;
              interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH 0>;
-             interrupt-names = "isp0_mmu";
              clocks = <&cru ACLK_ISP0_WRAPPER>, <&cru HCLK_ISP0_WRAPPER>;
              clock-names = "aclk", "iface";
              #iommu-cells = <0>;
@@ -1769,11 +1849,36 @@
              rockchip,disable-mmu-reset;
      };
 
+     isp1: isp1@ff920000 {
+             compatible = "rockchip,rk3399-cif-isp";
+             reg = <0x0 0xff920000 0x0 0x4000>;
+             interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH 0>;
+             clocks = <&cru SCLK_ISP1>,
+                      <&cru ACLK_ISP1_WRAPPER>,
+                      <&cru HCLK_ISP1_WRAPPER>;
+             clock-names = "isp", "aclk", "hclk";
+             iommus = <&isp1_mmu>;
+             phys = <&mipi_dsi1>;
+             phy-names = "dphy";
+             power-domains = <&power RK3399_PD_ISP1>;
+             status = "disabled";
+
+             ports {
+                     #address-cells = <1>;
+                     #size-cells = <0>;
+
+                     port@0 {
+                             reg = <0>;
+                             #address-cells = <1>;
+                             #size-cells = <0>;
+                     };
+             };
+     };
+
      isp1_mmu: iommu@ff924000 {
              compatible = "rockchip,iommu";
              reg = <0x0 0xff924000 0x0 0x100>, <0x0 0xff925000 0x0 0x100>;
              interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH 0>;
-             interrupt-names = "isp1_mmu";
              clocks = <&cru ACLK_ISP1_WRAPPER>, <&cru HCLK_ISP1_WRAPPER>;
              clock-names = "aclk", "iface";
              #iommu-cells = <0>;
@@ -1802,10 +1907,10 @@
              interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH 0>;
              clocks = <&cru PCLK_HDMI_CTRL>,
                       <&cru SCLK_HDMI_SFR>,
-                      <&cru PLL_VPLL>,
+                      <&cru SCLK_HDMI_CEC>,
                       <&cru PCLK_VIO_GRF>,
-                      <&cru SCLK_HDMI_CEC>;
-             clock-names = "iahb", "isfr", "vpll", "grf", "cec";
+                      <&cru PLL_VPLL>;
+             clock-names = "iahb", "isfr", "cec", "grf", "ref";
              power-domains = <&power RK3399_PD_HDCP>;
              reg-io-width = <4>;
              rockchip,grf = <&grf>;
@@ -1878,6 +1983,7 @@
              rockchip,grf = <&grf>;
              #address-cells = <1>;
              #size-cells = <0>;
+             #phy-cells = <0>;
              status = "disabled";
 
              ports {
@@ -1958,7 +2064,7 @@
              #size-cells = <2>;
              ranges;
 
Quoted 8 lines

arch/arm/dts/rk3399.dtsi line 2067

Quoted 2 lines
arch/arm/dts/rk3399.dtsi +1 -1
-             gpio0: gpio0@ff720000 {
+             gpio0: gpio@ff720000 {

Thanks for looking at this update, I myself was playing with this for all Rockchip devices but it's really not that easy to do unfortunately.

Please note that this will break the gpio driver, c.f. the logic here:
https://source.denx.de/u-boot/u-boot/-/blob/master/drivers/gpio/rk_gpio.c#L154-L157

If you check v2 of this patch series I've currnently dropped this patch for now.

Quoted 9 lines

Please DO NOT use the logic used in the kernel, it's broken and works by chance and will not work in U-Boot.

I'm tempted to add a new DT property like:
rockchip,gpio-controller = <0>;
in gpio0,
rockchip,gpio-controller = <1>;
in gpio1, etc....

Quoted 3 lines

I don't think U-boot cares too much about DT backward compatibility so this wouldn't be much of a problem. It's a different issue in the Linux kernel but that's not the place to discuss this :)

Well we do because for a SystemReady IR platform the firmware provides the DT and that's not a differnt DT to the one used in U-Boot.

So what ever that gets added in U-Boot needs to go upstream else it will just end up in a world of pain. Ultimately one way or the other this problem is going to have to be solved in U-Boot too.

Kever: what's the Rockchip plan here to sort this out?

Quoted 202 lines
Quoted 202 lines
arch/arm/dts/rk3399.dtsi +54 -4
                      compatible = "rockchip,gpio-bank";
                      reg = <0x0 0xff720000 0x0 0x100>;
                      clocks = <&pmucru PCLK_GPIO0_PMU>;
@@ -1971,7 +2077,7 @@
                      #interrupt-cells = <0x2>;
              };
 
-             gpio1: gpio1@ff730000 {
+             gpio1: gpio@ff730000 {
                      compatible = "rockchip,gpio-bank";
                      reg = <0x0 0xff730000 0x0 0x100>;
                      clocks = <&pmucru PCLK_GPIO1_PMU>;
@@ -1984,7 +2090,7 @@
                      #interrupt-cells = <0x2>;
              };
 
-             gpio2: gpio2@ff780000 {
+             gpio2: gpio@ff780000 {
                      compatible = "rockchip,gpio-bank";
                      reg = <0x0 0xff780000 0x0 0x100>;
                      clocks = <&cru PCLK_GPIO2>;
@@ -1997,7 +2103,7 @@
                      #interrupt-cells = <0x2>;
              };
 
-             gpio3: gpio3@ff788000 {
+             gpio3: gpio@ff788000 {
                      compatible = "rockchip,gpio-bank";
                      reg = <0x0 0xff788000 0x0 0x100>;
                      clocks = <&cru PCLK_GPIO3>;
@@ -2010,7 +2116,7 @@
                      #interrupt-cells = <0x2>;
              };
 
-             gpio4: gpio4@ff790000 {
+             gpio4: gpio@ff790000 {
                      compatible = "rockchip,gpio-bank";
                      reg = <0x0 0xff790000 0x0 0x100>;
                      clocks = <&cru PCLK_GPIO4>;
@@ -2108,12 +2214,40 @@
                      output-low;
              };
 
+             pcfg_input_enable: pcfg-input-enable {
+                     input-enable;
+             };
+
+             pcfg_input_pull_up: pcfg-input-pull-up {
+                     input-enable;
+                     bias-pull-up;
+                     drive-strength = <2>;
+             };
+
+             pcfg_input_pull_down: pcfg-input-pull-down {
+                     input-enable;
+                     bias-pull-down;
+                     drive-strength = <2>;
+             };
+
              clock {
                      clk_32k: clk-32k {
                              rockchip,pins = <0 RK_PA0 2 &pcfg_pull_none>;
                      };
              };
 
+             cif {
+                     cif_clkin: cif-clkin {
+                             rockchip,pins =
+                                     <2 RK_PB2 3 &pcfg_pull_none>;
+                     };
+
+                     cif_clkouta: cif-clkouta {
+                             rockchip,pins =
+                                     <2 RK_PB3 3 &pcfg_pull_none>;
+                     };
+             };
+
              edp {
                      edp_hpd: edp-hpd {
                              rockchip,pins =
@@ -2276,6 +2410,19 @@
                                      <3 RK_PD7 1 &pcfg_pull_none>,
                                      <4 RK_PA0 1 &pcfg_pull_none>;
                      };
+
+                     i2s0_8ch_bus_bclk_off: i2s0-8ch-bus-bclk-off {
+                             rockchip,pins =
+                                     <3 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>,
+                                     <3 RK_PD1 1 &pcfg_pull_none>,
+                                     <3 RK_PD2 1 &pcfg_pull_none>,
+                                     <3 RK_PD3 1 &pcfg_pull_none>,
+                                     <3 RK_PD4 1 &pcfg_pull_none>,
+                                     <3 RK_PD5 1 &pcfg_pull_none>,
+                                     <3 RK_PD6 1 &pcfg_pull_none>,
+                                     <3 RK_PD7 1 &pcfg_pull_none>,
+                                     <4 RK_PA0 1 &pcfg_pull_none>;
+                     };
              };
 
              i2s1 {
@@ -2287,6 +2434,15 @@
                                      <4 RK_PA6 1 &pcfg_pull_none>,
                                      <4 RK_PA7 1 &pcfg_pull_none>;
                      };
+
+                     i2s1_2ch_bus_bclk_off: i2s1-2ch-bus-bclk-off {
+                             rockchip,pins =
+                                     <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>,
+                                     <4 RK_PA4 1 &pcfg_pull_none>,
+                                     <4 RK_PA5 1 &pcfg_pull_none>,
+                                     <4 RK_PA6 1 &pcfg_pull_none>,
+                                     <4 RK_PA7 1 &pcfg_pull_none>;
+                     };
              };
 
              sdio0 {
drivers/clk/rockchip/clk_rk3399.c +1 -1
index 97bf1c6e15b..e968ddf894b 100644
@@ -1049,7 +1049,7 @@ static ulong rk3399_clk_set_rate(struct clk *clk, ulong rate)
               * return 0 to satisfy clk_set_defaults during device probe.
               */
              return 0;
-     case SCLK_DDRCLK:
+     case SCLK_TESTCLKOUT2:
              ret = rk3399_ddr_set_clk(priv->cru, rate);
              break;
      case PCLK_EFUSE1024NS:
include/dt-bindings/clock/rk3399-cru.h +13 -11
index 211faf8fa89..44e0a319f07 100644
@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
  /*
   * Copyright (c) 2016 Rockchip Electronics Co. Ltd.
+ * Author: Xing Zheng <[email protected]>
   */
 
  #ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3399_H
@@ -121,16 +122,17 @@
  #define SCLK_DPHY_RX0_CFG           165
  #define SCLK_RMII_SRC                       166
  #define SCLK_PCIEPHY_REF100M                167
-#define SCLK_USBPHY0_480M_SRC                168
-#define SCLK_USBPHY1_480M_SRC                169
-#define SCLK_DDRCLK                  170
-#define SCLK_TESTOUT2                        171
+#define SCLK_DDRC                    168
+#define SCLK_TESTCLKOUT1             169
+#define SCLK_TESTCLKOUT2             170
 
  #define DCLK_VOP0                   180
  #define DCLK_VOP1                   181
  #define DCLK_VOP0_DIV                       182
  #define DCLK_VOP1_DIV                       183
  #define DCLK_M0_PERILP                      184
+#define DCLK_VOP0_FRAC                       185
+#define DCLK_VOP1_FRAC                       186
 
  #define FCLK_CM0S                   190
 
@@ -592,13 +594,13 @@
  #define SRST_P_SPI0                 214
  #define SRST_P_SPI1                 215
  #define SRST_P_SPI2                 216
-#define SRST_P_SPI4                  217
-#define SRST_P_SPI5                  218
+#define SRST_P_SPI3                  217
+#define SRST_P_SPI4                  218
  #define SRST_SPI0                   219
  #define SRST_SPI1                   220
  #define SRST_SPI2                   221
-#define SRST_SPI4                    222
-#define SRST_SPI5                    223
+#define SRST_SPI3                    222
+#define SRST_SPI4                    223
 
  /* cru_softrst_con14 */
  #define SRST_I2S0_8CH                       224
@@ -720,8 +722,8 @@
  #define SRST_H_CM0S_NOC                     3
  #define SRST_DBG_CM0S                       4
  #define SRST_PO_CM0S                        5
-#define SRST_P_SPI3                  6
-#define SRST_SPI3                    7
+#define SRST_P_SPI6                  6
+#define SRST_SPI6                    7
  #define SRST_P_TIMER_0_1            8
  #define SRST_P_TIMER_0                      9
  #define SRST_P_TIMER_1                      10
include/dt-bindings/power/rk3399-power.h +1 -0
index 168b3bfbd6f..aedd8b180fe 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
  #ifndef __DT_BINDINGS_POWER_RK3399_POWER_H__
  #define __DT_BINDINGS_POWER_RK3399_POWER_H__
 
#5 lore raw

Re: [PATCH 1/3] arm64: dts: rk3399: sync rk3399.dtsi from 6.1-rc1

Quoted 450 lines · Peter Robinson

Hi Quentin,

Quoted 423 lines · Peter Robinson
Quoted 422 lines

Sync rk3399.dtsi and associated bindings includes. Fix up building of clk/rockchip/clk_rk3399.c for the changes as well as adjusting the rk3399-u-boot.dtsi for the new upstream pieces.

---
  arch/arm/dts/rk3399-opp.dtsi             |   6 +-
  arch/arm/dts/rk3399-u-boot.dtsi          |  36 ++--
  arch/arm/dts/rk3399.dtsi                 | 200 ++++++++++++++++++++---
  drivers/clk/rockchip/clk_rk3399.c        |   2 +-
  include/dt-bindings/clock/rk3399-cru.h   |  24 +--
  include/dt-bindings/power/rk3399-power.h |   1 +
  6 files changed, 206 insertions(+), 63 deletions(-)
arch/arm/dts/rk3399-opp.dtsi +3 -3
index da41cd81ebb..fee5e711127 100644
@@ -4,7 +4,7 @@
   */
 
  / {
-     cluster0_opp: opp-table0 {
+     cluster0_opp: opp-table-0 {
              compatible = "operating-points-v2";
              opp-shared;
 
@@ -35,7 +35,7 @@
              };
      };
 
-     cluster1_opp: opp-table1 {
+     cluster1_opp: opp-table-1 {
              compatible = "operating-points-v2";
              opp-shared;
 
@@ -74,7 +74,7 @@
              };
      };
 
-     gpu_opp_table: opp-table2 {
+     gpu_opp_table: opp-table-2 {
              compatible = "operating-points-v2";
 
              opp00 {
arch/arm/dts/rk3399-u-boot.dtsi +10 -26
index 3c1a15fe51b..2fa8f25a3e1 100644
@@ -20,38 +20,12 @@
              reg = <0x0 0xff620000 0x0 0x100>;
      };
 
-     dfi: dfi@ff630000 {
-             u-boot,dm-pre-reloc;
-             reg = <0x00 0xff630000 0x00 0x4000>;
-             compatible = "rockchip,rk3399-dfi";
-             rockchip,pmu = <&pmugrf>;
-             clocks = <&cru PCLK_DDR_MON>;
-             clock-names = "pclk_ddr_mon";
-     };
-
      rng: rng@ff8b8000 {
              compatible = "rockchip,cryptov1-rng";
              reg = <0x0 0xff8b8000 0x0 0x1000>;
              status = "okay";
      };
 
-     dmc: dmc {
-             u-boot,dm-pre-reloc;
-             compatible = "rockchip,rk3399-dmc";
-             devfreq-events = <&dfi>;
-             interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH 0>;
-             clocks = <&cru SCLK_DDRCLK>;
-             clock-names = "dmc_clk";
-             reg = <0x0 0xffa80000 0x0 0x0800
-                    0x0 0xffa80800 0x0 0x1800
-                    0x0 0xffa82000 0x0 0x2000
-                    0x0 0xffa84000 0x0 0x1000
-                    0x0 0xffa88000 0x0 0x0800
-                    0x0 0xffa88800 0x0 0x1800
-                    0x0 0xffa8a000 0x0 0x2000
-                    0x0 0xffa8c000 0x0 0x1000>;
-     };
-
      pmusgrf: syscon@ff330000 {
              u-boot,dm-pre-reloc;
              compatible = "rockchip,rk3399-pmusgrf", "syscon";
@@ -88,6 +62,16 @@
      u-boot,dm-pre-reloc;
  };
 
+&dfi {
+     u-boot,dm-pre-reloc;
+     status = "okay";
+};
+
+&dmc {
+     u-boot,dm-pre-reloc;
+     status = "okay";
+};
+
  &emmc_phy {
      u-boot,dm-pre-reloc;
  };
arch/arm/dts/rk3399.dtsi +123 -17
index 3871c7fd83b..92c2207e686 100644
@@ -124,6 +124,12 @@
                      #cooling-cells = <2>; /* min followed by max */
                      dynamic-power-coefficient = <436>;
                      cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
+
+                     thermal-idle {
+                             #cooling-cells = <2>;
+                             duration-us = <10000>;
+                             exit-latency-us = <500>;
+                     };
              };
 
              cpu_b1: cpu@101 {
@@ -136,6 +142,12 @@
                      #cooling-cells = <2>; /* min followed by max */
                      dynamic-power-coefficient = <436>;
                      cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
+
+                     thermal-idle {
+                             #cooling-cells = <2>;
+                             duration-us = <10000>;
+                             exit-latency-us = <500>;
+                     };
              };
 
              idle-states {
@@ -166,6 +178,15 @@
              ports = <&vopl_out>, <&vopb_out>;
      };
 
+     dmc: memory-controller {
+             compatible = "rockchip,rk3399-dmc";
+             rockchip,pmu = <&pmugrf>;
+             devfreq-events = <&dfi>;
+             clocks = <&cru SCLK_DDRC>;
+             clock-names = "dmc_clk";
+             status = "disabled";
+     };
+
      pmu_a53 {
              compatible = "arm,cortex-a53-pmu";
              interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW &ppi_cluster0>;
@@ -361,6 +382,54 @@
              status = "disabled";
      };
 
+     debug@fe430000 {
+             compatible = "arm,coresight-cpu-debug", "arm,primecell";
+             reg = <0 0xfe430000 0 0x1000>;
+             clocks = <&cru PCLK_COREDBG_L>;
+             clock-names = "apb_pclk";
+             cpu = <&cpu_l0>;
+     };
+
+     debug@fe432000 {
+             compatible = "arm,coresight-cpu-debug", "arm,primecell";
+             reg = <0 0xfe432000 0 0x1000>;
+             clocks = <&cru PCLK_COREDBG_L>;
+             clock-names = "apb_pclk";
+             cpu = <&cpu_l1>;
+     };
+
+     debug@fe434000 {
+             compatible = "arm,coresight-cpu-debug", "arm,primecell";
+             reg = <0 0xfe434000 0 0x1000>;
+             clocks = <&cru PCLK_COREDBG_L>;
+             clock-names = "apb_pclk";
+             cpu = <&cpu_l2>;
+     };
+
+     debug@fe436000 {
+             compatible = "arm,coresight-cpu-debug", "arm,primecell";
+             reg = <0 0xfe436000 0 0x1000>;
+             clocks = <&cru PCLK_COREDBG_L>;
+             clock-names = "apb_pclk";
+             cpu = <&cpu_l3>;
+     };
+
+     debug@fe610000 {
+             compatible = "arm,coresight-cpu-debug", "arm,primecell";
+             reg = <0 0xfe610000 0 0x1000>;
+             clocks = <&cru PCLK_COREDBG_B>;
+             clock-names = "apb_pclk";
+             cpu = <&cpu_b0>;
+     };
+
+     debug@fe710000 {
+             compatible = "arm,coresight-cpu-debug", "arm,primecell";
+             reg = <0 0xfe710000 0 0x1000>;
+             clocks = <&cru PCLK_COREDBG_B>;
+             clock-names = "apb_pclk";
+             cpu = <&cpu_b1>;
+     };
+
      usbdrd3_0: usb@fe800000 {
              compatible = "rockchip,rk3399-dwc3";
              #address-cells = <2>;
@@ -1235,6 +1304,16 @@
              status = "disabled";
      };
 
+     dfi: dfi@ff630000 {
+             reg = <0x00 0xff630000 0x00 0x4000>;
+             compatible = "rockchip,rk3399-dfi";
+             rockchip,pmu = <&pmugrf>;
+             interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH 0>;
+             clocks = <&cru PCLK_DDR_MON>;
+             clock-names = "pclk_ddr_mon";
+             status = "disabled";
+     };
+
      vpu: video-codec@ff650000 {
              compatible = "rockchip,rk3399-vpu";
              reg = <0x0 0xff650000 0x0 0x800>;
@@ -1251,7 +1330,6 @@
              compatible = "rockchip,iommu";
              reg = <0x0 0xff650800 0x0 0x40>;
              interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH 0>;
-             interrupt-names = "vpu_mmu";
              clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
              clock-names = "aclk", "iface";
              #iommu-cells = <0>;
@@ -1273,7 +1351,6 @@
              compatible = "rockchip,iommu";
              reg = <0x0 0xff660480 0x0 0x40>, <0x0 0xff6604c0 0x0 0x40>;
              interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH 0>;
-             interrupt-names = "vdec_mmu";
              clocks = <&cru ACLK_VDU>, <&cru HCLK_VDU>;
              clock-names = "aclk", "iface";
              power-domains = <&power RK3399_PD_VDU>;
@@ -1284,7 +1361,6 @@
              compatible = "rockchip,iommu";
              reg = <0x0 0xff670800 0x0 0x40>;
              interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH 0>;
-             interrupt-names = "iep_mmu";
              clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>;
              clock-names = "aclk", "iface";
              #iommu-cells = <0>;
@@ -1356,9 +1432,11 @@
              clock-names = "apb_pclk";
      };
 
-     pmucru: pmu-clock-controller@ff750000 {
+     pmucru: clock-controller@ff750000 {
              compatible = "rockchip,rk3399-pmucru";
              reg = <0x0 0xff750000 0x0 0x1000>;
+             clocks = <&xin24m>;
+             clock-names = "xin24m";
              rockchip,grf = <&pmugrf>;
              #clock-cells = <1>;
              #reset-cells = <1>;
@@ -1369,6 +1447,8 @@
      cru: clock-controller@ff760000 {
              compatible = "rockchip,rk3399-cru";
              reg = <0x0 0xff760000 0x0 0x1000>;
+             clocks = <&xin24m>;
+             clock-names = "xin24m";
              rockchip,grf = <&grf>;
              #clock-cells = <1>;
              #reset-cells = <1>;
@@ -1382,7 +1462,8 @@
                      <&cru HCLK_PERILP1>, <&cru PCLK_PERILP1>,
                      <&cru ACLK_VIO>, <&cru ACLK_HDCP>,
                      <&cru ACLK_GIC_PRE>,
-                     <&cru PCLK_DDR>;
+                     <&cru PCLK_DDR>,
+                     <&cru ACLK_VDU>;
              assigned-clock-rates =
                       <594000000>,  <800000000>,
                      <1000000000>,
@@ -1393,7 +1474,8 @@
                       <100000000>,   <50000000>,
                       <400000000>, <400000000>,
                       <200000000>,
-                      <200000000>;
+                      <200000000>,
+                      <400000000>;
      };
 
      grf: syscon@ff770000 {
@@ -1477,6 +1559,7 @@
                      reg = <0xf780 0x24>;
                      clocks = <&sdhci>;
                      clock-names = "emmcclk";
+                     drive-impedance-ohm = <50>;
                      #phy-cells = <0>;
                      status = "disabled";
              };
@@ -1487,7 +1570,6 @@
                      clock-names = "refclk";
                      #phy-cells = <1>;
                      resets = <&cru SRST_PCIEPHY>;
-                     drive-impedance-ohm = <50>;
                      reset-names = "phy";
                      status = "disabled";
              };
@@ -1582,8 +1664,9 @@
              dma-names = "tx", "rx";
              clock-names = "i2s_clk", "i2s_hclk";
              clocks = <&cru SCLK_I2S0_8CH>, <&cru HCLK_I2S0_8CH>;
-             pinctrl-names = "default";
+             pinctrl-names = "bclk_on", "bclk_off";
              pinctrl-0 = <&i2s0_8ch_bus>;
+             pinctrl-1 = <&i2s0_8ch_bus_bclk_off>;
              power-domains = <&power RK3399_PD_SDIOAUDIO>;
              #sound-dai-cells = <0>;
              status = "disabled";
@@ -1619,7 +1702,7 @@
 
      vopl: vop@ff8f0000 {
              compatible = "rockchip,rk3399-vop-lit";
-             reg = <0x0 0xff8f0000 0x0 0x3efc>;
+             reg = <0x0 0xff8f0000 0x0 0x2000>, <0x0 0xff8f2000 0x0 0x400>;
              interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH 0>;
              assigned-clocks = <&cru ACLK_VOP1>, <&cru HCLK_VOP1>;
              assigned-clock-rates = <400000000>, <100000000>;
@@ -1666,7 +1749,6 @@
              compatible = "rockchip,iommu";
              reg = <0x0 0xff8f3f00 0x0 0x100>;
              interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH 0>;
-             interrupt-names = "vopl_mmu";
              clocks = <&cru ACLK_VOP1>, <&cru HCLK_VOP1>;
              clock-names = "aclk", "iface";
              power-domains = <&power RK3399_PD_VOPL>;
@@ -1676,7 +1758,7 @@
 
      vopb: vop@ff900000 {
              compatible = "rockchip,rk3399-vop-big";
-             reg = <0x0 0xff900000 0x0 0x3efc>;
+             reg = <0x0 0xff900000 0x0 0x2000>, <0x0 0xff902000 0x0 0x1000>;
              interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH 0>;
              assigned-clocks = <&cru ACLK_VOP0>, <&cru HCLK_VOP0>;
              assigned-clock-rates = <400000000>, <100000000>;
@@ -1723,7 +1805,6 @@
              compatible = "rockchip,iommu";
              reg = <0x0 0xff903f00 0x0 0x100>;
              interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH 0>;
-             interrupt-names = "vopb_mmu";
              clocks = <&cru ACLK_VOP0>, <&cru HCLK_VOP0>;
              clock-names = "aclk", "iface";
              power-domains = <&power RK3399_PD_VOPB>;
@@ -1761,7 +1842,6 @@
              compatible = "rockchip,iommu";
              reg = <0x0 0xff914000 0x0 0x100>, <0x0 0xff915000 0x0 0x100>;
              interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH 0>;
-             interrupt-names = "isp0_mmu";
              clocks = <&cru ACLK_ISP0_WRAPPER>, <&cru HCLK_ISP0_WRAPPER>;
              clock-names = "aclk", "iface";
              #iommu-cells = <0>;
@@ -1769,11 +1849,36 @@
              rockchip,disable-mmu-reset;
      };
 
+     isp1: isp1@ff920000 {
+             compatible = "rockchip,rk3399-cif-isp";
+             reg = <0x0 0xff920000 0x0 0x4000>;
+             interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH 0>;
+             clocks = <&cru SCLK_ISP1>,
+                      <&cru ACLK_ISP1_WRAPPER>,
+                      <&cru HCLK_ISP1_WRAPPER>;
+             clock-names = "isp", "aclk", "hclk";
+             iommus = <&isp1_mmu>;
+             phys = <&mipi_dsi1>;
+             phy-names = "dphy";
+             power-domains = <&power RK3399_PD_ISP1>;
+             status = "disabled";
+
+             ports {
+                     #address-cells = <1>;
+                     #size-cells = <0>;
+
+                     port@0 {
+                             reg = <0>;
+                             #address-cells = <1>;
+                             #size-cells = <0>;
+                     };
+             };
+     };
+
      isp1_mmu: iommu@ff924000 {
              compatible = "rockchip,iommu";
              reg = <0x0 0xff924000 0x0 0x100>, <0x0 0xff925000 0x0 0x100>;
              interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH 0>;
-             interrupt-names = "isp1_mmu";
              clocks = <&cru ACLK_ISP1_WRAPPER>, <&cru HCLK_ISP1_WRAPPER>;
              clock-names = "aclk", "iface";
              #iommu-cells = <0>;
@@ -1802,10 +1907,10 @@
              interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH 0>;
              clocks = <&cru PCLK_HDMI_CTRL>,
                       <&cru SCLK_HDMI_SFR>,
-                      <&cru PLL_VPLL>,
+                      <&cru SCLK_HDMI_CEC>,
                       <&cru PCLK_VIO_GRF>,
-                      <&cru SCLK_HDMI_CEC>;
-             clock-names = "iahb", "isfr", "vpll", "grf", "cec";
+                      <&cru PLL_VPLL>;
+             clock-names = "iahb", "isfr", "cec", "grf", "ref";
              power-domains = <&power RK3399_PD_HDCP>;
              reg-io-width = <4>;
              rockchip,grf = <&grf>;
@@ -1878,6 +1983,7 @@
              rockchip,grf = <&grf>;
              #address-cells = <1>;
              #size-cells = <0>;
+             #phy-cells = <0>;
              status = "disabled";
 
              ports {
@@ -1958,7 +2064,7 @@
              #size-cells = <2>;
              ranges;
 
Quoted 8 lines

arch/arm/dts/rk3399.dtsi line 2067

Quoted 2 lines
arch/arm/dts/rk3399.dtsi +1 -1
-             gpio0: gpio0@ff720000 {
+             gpio0: gpio@ff720000 {

Thanks for looking at this update, I myself was playing with this for all Rockchip devices but it's really not that easy to do unfortunately.

Please note that this will break the gpio driver, c.f. the logic here:
https://source.denx.de/u-boot/u-boot/-/blob/master/drivers/gpio/rk_gpio.c#L154-L157

If you check v2 of this patch series I've currnently dropped this patch for now.

Quoted 9 lines

Please DO NOT use the logic used in the kernel, it's broken and works by chance and will not work in U-Boot.

I'm tempted to add a new DT property like:
rockchip,gpio-controller = <0>;
in gpio0,
rockchip,gpio-controller = <1>;
in gpio1, etc....

Quoted 3 lines

I don't think U-boot cares too much about DT backward compatibility so this wouldn't be much of a problem. It's a different issue in the Linux kernel but that's not the place to discuss this :)

Quoted 8 lines

Well we do because for a SystemReady IR platform the firmware provides the DT and that's not a differnt DT to the one used in U-Boot.

So what ever that gets added in U-Boot needs to go upstream else it will just end up in a world of pain. Ultimately one way or the other this problem is going to have to be solved in U-Boot too.

Kever: what's the Rockchip plan here to sort this out?

If the issue is to maintain Linux DT in U-Boot, then here is my suggestion (following the same in Allwinner as well) - Sync the DT from Linux and maintain them in -u-boot.dtsi if the specific bindings are unsupported or not working at the moment in U-Boot. In the long-run these -u-boot.dtsi specific stuff is gone if the driver is well supported.

Jagan.

#6 lore raw

Re: [PATCH 1/3] arm64: dts: rk3399: sync rk3399.dtsi from 6.1-rc1

In reply to Peter Robinson

Hi Peter,

Quoted 3 lines · Peter Robinson

Hi Quentin,

Quoted 1 line · Peter Robinson

[...]

Quoted 24 lines
Quoted 8 lines

arch/arm/dts/rk3399.dtsi line 2067

Quoted 2 lines
arch/arm/dts/rk3399.dtsi +1 -1
-             gpio0: gpio0@ff720000 {
+             gpio0: gpio@ff720000 {

Thanks for looking at this update, I myself was playing with this for all Rockchip devices but it's really not that easy to do unfortunately.

Please note that this will break the gpio driver, c.f. the logic here:
https://urldefense.com/v3/__https://source.denx.de/u-boot/u-boot/-/blob/master/drivers/gpio/rk_gpio.c*L154-L157__;Iw!!OOPJP91ZZw!hLFFb5olGCLZCouGdY-bivknYF7_oYLhWwjT1EpkCC38BLNtmJodAnbrmQD2y7-74oP8jX4ToE6scPcAvFHMWJgfvKQORGtO5g$

If you check v2 of this patch series I've currnently dropped this patch for now.

Quoted 9 lines

Please DO NOT use the logic used in the kernel, it's broken and works by chance and will not work in U-Boot.

I'm tempted to add a new DT property like:
rockchip,gpio-controller = <0>;
in gpio0,
rockchip,gpio-controller = <1>;
in gpio1, etc....

Quoted 3 lines

I don't think U-boot cares too much about DT backward compatibility so this wouldn't be much of a problem. It's a different issue in the Linux kernel but that's not the place to discuss this :)

Quoted 7 lines

Well we do because for a SystemReady IR platform the firmware provides the DT and that's not a differnt DT to the one used in U-Boot.

So what ever that gets added in U-Boot needs to go upstream else it will just end up in a world of pain. Ultimately one way or the other this problem is going to have to be solved in U-Boot too.

I guess that's what Simon was working on in the last few months? c.f. https://lore.kernel.org/u-boot/[email protected]/

Is the plan to get rid of those -u-boot.dtsi and have those properties replaced with the ones specified in the link above, directly in DTS in the Linux kernel? Otherwise I'm quite curious on how you plan to achieve this for SystemReady IR platforms? Or are you using U-Boot's DT for the kernel?

For now, like Jagan suggested, we could have those U-Boot-specific properties in the -u-boot.dtsi, if there's a need for a new DT property (which the kernel probably won't go for since that would break backward compatibility).

Another thought I had was to just check the register address of the gpio controller and do the mapping in the driver directly. Not nice, but the most straightforward fix I think.

Quoted 2 lines

Kever: what's the Rockchip plan here to sort this out?

I've notified Heiko about the shortcomings of the kernel implementation but unless the probe order of the gpio controllers in the pinctrl node is not stable or someone specifies gpio aliases which aren't matching the same numbering scheme as the SoC GPIO controllers, there is no hurry to fix it.

Cheers,
Quentin

#7 lore raw

PATCH 2/3 arm64: dts: rk3399: Add upstream Pinephone Pro dts

In reply to Peter Robinson

Initial support for the PinePhone Pro has now landed upstream in Linux 6.1 RC1 so sync the dts from upstream for initial support.

---
 arch/arm/dts/Makefile                 |   1 +
 arch/arm/dts/rk3399-pinephone-pro.dts | 398 ++++++++++++++++++++++++++
 2 files changed, 399 insertions(+)
 create mode 100644 arch/arm/dts/rk3399-pinephone-pro.dts
arch/arm/dts/Makefile +1 -0
index 965895bc2a3..624c4f997c3 100644
@@ -153,6 +153,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
 	rk3399-nanopi-r4s.dtb \
 	rk3399-orangepi.dtb \
 	rk3399-pinebook-pro.dtb \
+	rk3399-pinephone-pro.dtb \
 	rk3399-puma-haikou.dtb \
 	rk3399-roc-pc.dtb \
 	rk3399-roc-pc-mezzanine.dtb \
arch/arm/dts/rk3399-pinephone-pro.dts new file +398 -0

398 lines not on this page · raw message

Signature · 1 line
2.38.1
Reviewed-by on v1 2/3
#8 lore raw

Re: [PATCH 2/3] arm64: dts: rk3399: Add upstream Pinephone Pro dts

Quoted 4 lines · Peter Robinson

Initial support for the PinePhone Pro has now landed upstream in Linux 6.1 RC1 so sync the dts from upstream for initial support.

Thanks,
- Kever

Quoted 422 lines
---
  arch/arm/dts/Makefile                 |   1 +
  arch/arm/dts/rk3399-pinephone-pro.dts | 398 ++++++++++++++++++++++++++
  2 files changed, 399 insertions(+)

create mode 100644 arch/arm/dts/rk3399-pinephone-pro.dts

arch/arm/dts/Makefile +1 -0
index 965895bc2a3..624c4f997c3 100644
@@ -153,6 +153,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
  	rk3399-nanopi-r4s.dtb \
  	rk3399-orangepi.dtb \
  	rk3399-pinebook-pro.dtb \
+	rk3399-pinephone-pro.dtb \
  	rk3399-puma-haikou.dtb \
  	rk3399-roc-pc.dtb \
  	rk3399-roc-pc-mezzanine.dtb \
arch/arm/dts/rk3399-pinephone-pro.dts new file +398 -0
new file mode 100644
index 00000000000..2e058c31502
@@ -0,0 +1,398 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2020 Martijn Braam <[email protected]>
+ * Copyright (c) 2021 Kamil Trzciński <[email protected]>
+ */
+
+/*
+ * PinePhone Pro datasheet:
+ * https://files.pine64.org/doc/PinePhonePro/PinephonePro-Schematic-V1.0-20211127.pdf
+ */
+
+/dts-v1/;
+#include <dt-bindings/input/linux-event-codes.h>
+#include "rk3399.dtsi"
+#include "rk3399-opp.dtsi"
+
+/ {
+	model = "Pine64 PinePhonePro";
+	compatible = "pine64,pinephone-pro", "rockchip,rk3399";
+	chassis-type = "handset";
+
+	aliases {
+		mmc0 = &sdio0;
+		mmc1 = &sdmmc;
+		mmc2 = &sdhci;
+	};
+
+	chosen {
+		stdout-path = "serial2:115200n8";
+	};
+
+	gpio-keys {
+		compatible = "gpio-keys";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pwrbtn_pin>;
+
+		key-power {
+			debounce-interval = <20>;
+			gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
+			label = "Power";
+			linux,code = <KEY_POWER>;
+			wakeup-source;
+		};
+	};
+
+	vcc_sys: vcc-sys-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc_sys";
+		regulator-always-on;
+		regulator-boot-on;
+	};
+
+	vcc3v3_sys: vcc3v3-sys-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc3v3_sys";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		vin-supply = <&vcc_sys>;
+	};
+
+	vcca1v8_s3: vcc1v8-s3-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcca1v8_s3";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		vin-supply = <&vcc3v3_sys>;
+		regulator-always-on;
+		regulator-boot-on;
+	};
+
+	vcc1v8_codec: vcc1v8-codec-regulator {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&vcc1v8_codec_en>;
+		regulator-name = "vcc1v8_codec";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		vin-supply = <&vcc3v3_sys>;
+	};
+};
+
+&cpu_l0 {
+	cpu-supply = <&vdd_cpu_l>;
+};
+
+&cpu_l1 {
+	cpu-supply = <&vdd_cpu_l>;
+};
+
+&cpu_l2 {
+	cpu-supply = <&vdd_cpu_l>;
+};
+
+&cpu_l3 {
+	cpu-supply = <&vdd_cpu_l>;
+};
+
+&cpu_b0 {
+	cpu-supply = <&vdd_cpu_b>;
+};
+
+&cpu_b1 {
+	cpu-supply = <&vdd_cpu_b>;
+};
+
+&emmc_phy {
+	status = "okay";
+};
+
+&i2c0 {
+	clock-frequency = <400000>;
+	i2c-scl-rising-time-ns = <168>;
+	i2c-scl-falling-time-ns = <4>;
+	status = "okay";
+
+	rk818: pmic@1c {
+		compatible = "rockchip,rk818";
+		reg = <0x1c>;
+		interrupt-parent = <&gpio1>;
+		interrupts = <RK_PC5 IRQ_TYPE_LEVEL_LOW>;
+		#clock-cells = <1>;
+		clock-output-names = "xin32k", "rk808-clkout2";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pmic_int_l>;
+		rockchip,system-power-controller;
+		wakeup-source;
+
+		vcc1-supply = <&vcc_sys>;
+		vcc2-supply = <&vcc_sys>;
+		vcc3-supply = <&vcc_sys>;
+		vcc4-supply = <&vcc_sys>;
+		vcc6-supply = <&vcc_sys>;
+		vcc7-supply = <&vcc3v3_sys>;
+		vcc8-supply = <&vcc_sys>;
+		vcc9-supply = <&vcc3v3_sys>;
+
+		regulators {
+			vdd_cpu_l: DCDC_REG1 {
+				regulator-name = "vdd_cpu_l";
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <875000>;
+				regulator-max-microvolt = <975000>;
+				regulator-ramp-delay = <6001>;
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vdd_center: DCDC_REG2 {
+				regulator-name = "vdd_center";
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <800000>;
+				regulator-max-microvolt = <1000000>;
+				regulator-ramp-delay = <6001>;
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vcc_ddr: DCDC_REG3 {
+				regulator-name = "vcc_ddr";
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+				};
+			};
+
+			vcc_1v8: DCDC_REG4 {
+				regulator-name = "vcc_1v8";
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+				};
+			};
+
+			vcca3v0_codec: LDO_REG1 {
+				regulator-name = "vcca3v0_codec";
+				regulator-min-microvolt = <3000000>;
+				regulator-max-microvolt = <3000000>;
+			};
+
+			vcc3v0_touch: LDO_REG2 {
+				regulator-name = "vcc3v0_touch";
+				regulator-min-microvolt = <3000000>;
+				regulator-max-microvolt = <3000000>;
+			};
+
+			vcca1v8_codec: LDO_REG3 {
+				regulator-name = "vcca1v8_codec";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+			};
+
+			rk818_pwr_on: LDO_REG4 {
+				regulator-name = "rk818_pwr_on";
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+				};
+			};
+
+			vcc_3v0: LDO_REG5 {
+				regulator-name = "vcc_3v0";
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <3000000>;
+				regulator-max-microvolt = <3000000>;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+				};
+			};
+
+			vcc_1v5: LDO_REG6 {
+				regulator-name = "vcc_1v5";
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1500000>;
+				regulator-max-microvolt = <1500000>;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+				};
+			};
+
+			vcc1v8_dvp: LDO_REG7 {
+				regulator-name = "vcc1v8_dvp";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+			};
+
+			vcc3v3_s3: LDO_REG8 {
+				regulator-name = "vcc3v3_s3";
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vccio_sd: LDO_REG9 {
+				regulator-name = "vccio_sd";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <3300000>;
+			};
+
+			vcc3v3_s0: SWITCH_REG {
+				regulator-name = "vcc3v3_s0";
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+				};
+			};
+		};
+	};
+
+	vdd_cpu_b: regulator@40 {
+		compatible = "silergy,syr827";
+		reg = <0x40>;
+		fcs,suspend-voltage-selector = <1>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&vsel1_pin>;
+		regulator-name = "vdd_cpu_b";
+		regulator-min-microvolt = <875000>;
+		regulator-max-microvolt = <1150000>;
+		regulator-ramp-delay = <1000>;
+		regulator-always-on;
+		regulator-boot-on;
+
+		regulator-state-mem {
+			regulator-off-in-suspend;
+		};
+	};
+
+	vdd_gpu: regulator@41 {
+		compatible = "silergy,syr828";
+		reg = <0x41>;
+		fcs,suspend-voltage-selector = <1>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&vsel2_pin>;
+		regulator-name = "vdd_gpu";
+		regulator-min-microvolt = <875000>;
+		regulator-max-microvolt = <975000>;
+		regulator-ramp-delay = <1000>;
+		regulator-always-on;
+		regulator-boot-on;
+
+		regulator-state-mem {
+			regulator-off-in-suspend;
+		};
+	};
+};
+
+&cluster0_opp {
+	opp04 {
+		status = "disabled";
+	};
+
+	opp05 {
+		status = "disabled";
+	};
+};
+
+&cluster1_opp {
+	opp06 {
+		opp-hz = /bits/ 64 <1500000000>;
+		opp-microvolt = <1100000 1100000 1150000>;
+	};
+
+	opp07 {
+		status = "disabled";
+	};
+};
+
+&io_domains {
+	bt656-supply = <&vcc1v8_dvp>;
+	audio-supply = <&vcca1v8_codec>;
+	sdmmc-supply = <&vccio_sd>;
+	gpio1830-supply = <&vcc_3v0>;
+	status = "okay";
+};
+
+&pmu_io_domains {
+	pmu1830-supply = <&vcc_1v8>;
+	status = "okay";
+};
+
+&pinctrl {
+	buttons {
+		pwrbtn_pin: pwrbtn-pin {
+			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
+	pmic {
+		pmic_int_l: pmic-int-l {
+			rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
+		vsel1_pin: vsel1-pin {
+			rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
+		};
+
+		vsel2_pin: vsel2-pin {
+			rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
+		};
+	};
+
+	sound {
+		vcc1v8_codec_en: vcc1v8-codec-en {
+			rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_down>;
+		};
+	};
+};
+
+&sdmmc {
+	bus-width = <4>;
+	cap-sd-highspeed;
+	cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
+	disable-wp;
+	max-frequency = <150000000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
+	vmmc-supply = <&vcc3v3_sys>;
+	vqmmc-supply = <&vccio_sd>;
+	status = "okay";
+};
+
+&sdhci {
+	bus-width = <8>;
+	mmc-hs200-1_8v;
+	non-removable;
+	status = "okay";
+};
+
+&tsadc {
+	rockchip,hw-tshut-mode = <1>;
+	rockchip,hw-tshut-polarity = <1>;
+	status = "okay";
+};
+
+&uart2 {
+	status = "okay";
+};
#9 lore raw

PATCH 3/3 rockchip: Add initial support for the PINE64 Pinephone Pro

In reply to Peter Robinson

The Pinephone Pro is another device by PINE64. It's closely related to the Pinebook Pro of which this initial support is derived from.

Specification:
- A variant of the Rockchip RK3399
- A 6 inch 720*1440 DSI display
- Front and rear cameras
- Type-C interface with alt mode display (DP 1.2) and PD charging
- 4GB LPDDR4 RAM
- 128GB eMMC
- mSD card slot
- An AP6255 module for 802.11ac WiFi and Bluetooth 5
- Quectel EG25-G 4G/LTE modem

---
 arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi |  39 +++++++
 arch/arm/mach-rockchip/rk3399/Kconfig         |   8 ++
 board/pine64/pinephone-pro-rk3399/Kconfig     |  15 +++
 board/pine64/pinephone-pro-rk3399/MAINTAINERS |   8 ++
 board/pine64/pinephone-pro-rk3399/Makefile    |   1 +
 .../pinephone-pro-rk3399.c                    |  76 +++++++++++++
 configs/pinephone-pro-rk3399_defconfig        | 104 ++++++++++++++++++
 include/configs/pinephone-pro-rk3399.h        |  19 ++++
 8 files changed, 270 insertions(+)
 create mode 100644 arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
 create mode 100644 board/pine64/pinephone-pro-rk3399/Kconfig
 create mode 100644 board/pine64/pinephone-pro-rk3399/MAINTAINERS
 create mode 100644 board/pine64/pinephone-pro-rk3399/Makefile
 create mode 100644 board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c
 create mode 100644 configs/pinephone-pro-rk3399_defconfig
 create mode 100644 include/configs/pinephone-pro-rk3399.h
arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi new file +39 -0
new file mode 100644
index 00000000000..c9f1f4af635
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2022 Peter Robinson <pbrobinson at gmail.com>
+ */
+
+#include "rk3399-u-boot.dtsi"
+#include "rk3399-sdram-lpddr4-100.dtsi"
+
+/ {
+	chosen {
+		u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
+	};
+
+	config {
+		u-boot,spl-payload-offset = <0x60000>; /* @ 384KB */
+	};
+};
+
+&i2c0 {
+	u-boot,dm-pre-reloc;
+};
+
+&rk818 {
+	u-boot,dm-pre-reloc;
+};
+
+&rng {
+	status = "okay";
+};
+
+&sdhci {
+	max-frequency = <25000000>;
+	u-boot,dm-pre-reloc;
+};
+
+&sdmmc {
+	max-frequency = <20000000>;
+	u-boot,dm-pre-reloc;
+};
arch/arm/mach-rockchip/rk3399/Kconfig +8 -0
index b48feeb3466..d01063ac98b 100644
@@ -39,6 +39,13 @@ config TARGET_PINEBOOK_PRO_RK3399
 	  with 4Gb RAM, onboard eMMC, USB-C, a USB3 and USB2 port,
 	  1920*1080 screen and all the usual laptop features.
 
+config TARGET_PINEPHONE_PRO_RK3399
+	bool "PinePhone Pro"
+	help
+	  PinePhone Pro is a phone based on a variant of the Rockchip
+	  rk3399 SoC with 4Gb RAM, onboard eMMC, USB-C, headphone jack,
+	  720x1440 screen and a Quectel 4G/LTE modem.
+
 config TARGET_PUMA_RK3399
 	bool "Theobroma Systems RK3399-Q7 (Puma)"
 	help
@@ -165,6 +172,7 @@ endif # BOOTCOUNT_LIMIT
 source "board/firefly/roc-pc-rk3399/Kconfig"
 source "board/google/gru/Kconfig"
 source "board/pine64/pinebook-pro-rk3399/Kconfig"
+source "board/pine64/pinephone-pro-rk3399/Kconfig"
 source "board/pine64/rockpro64_rk3399/Kconfig"
 source "board/rockchip/evb_rk3399/Kconfig"
 source "board/theobroma-systems/puma_rk3399/Kconfig"
board/pine64/pinephone-pro-rk3399/Kconfig new file +15 -0
new file mode 100644
index 00000000000..13d6465ae6e
@@ -0,0 +1,15 @@
+if TARGET_PINEPHONE_PRO_RK3399
+
+config SYS_BOARD
+	default "pinephone-pro-rk3399"
+
+config SYS_VENDOR
+	default "pine64"
+
+config SYS_CONFIG_NAME
+	default "pinephone-pro-rk3399"
+
+config BOARD_SPECIFIC_OPTIONS
+	def_bool y
+
+endif
board/pine64/pinephone-pro-rk3399/MAINTAINERS new file +8 -0
new file mode 100644
index 00000000000..c923ff1be32
@@ -0,0 +1,8 @@
+PINEPHONE_PRO
+M:	Peter Robinson <[email protected]>
+S:	Maintained
+F:	board/pine64/rk3399-pinephone-pro/
+F:	include/configs/rk3399-pinephone-pro.h
+F:	arch/arm/dts/rk3399-pinephone-pro.dts
+F:	arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
+F:	configs/pinephone-pro-rk3399_defconfig
board/pine64/pinephone-pro-rk3399/Makefile new file +1 -0
new file mode 100644
index 00000000000..8d9203053e5
@@ -0,0 +1 @@
+obj-y	+= pinephone-pro-rk3399.o
board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c new file +76 -0

76 lines not on this page · raw message

configs/pinephone-pro-rk3399_defconfig new file +104 -0

104 lines not on this page · raw message

include/configs/pinephone-pro-rk3399.h new file +19 -0
new file mode 100644
index 00000000000..78017d6bcc3
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) 2016 Rockchip Electronics Co., Ltd
+ * Copyright (C) 2022 Peter Robinson <pbrobinson at gmail.com>
+ */
+
+#ifndef __PINEPHONE_PRO_RK3399_H
+#define __PINEPHONE_PRO_RK3399_H
+
+#define ROCKCHIP_DEVICE_SETTINGS \
+		"stdin=serial,usbkbd\0" \
+		"stdout=serial,vidconsole\0" \
+		"stderr=serial,vidconsole\0"
+
+#include <configs/rk3399_common.h>
+
+#define SDRAM_BANK_SIZE			(2UL << 30)
+
+#endif
Signature · 1 line
2.38.1
Reviewed-by on v1 3/3
#10 lore raw

Re: [PATCH 3/3] rockchip: Add initial support for the PINE64 Pinephone Pro

Quoted 14 lines · Peter Robinson

The Pinephone Pro is another device by PINE64. It's closely related to the Pinebook Pro of which this initial support is derived from.

Specification:
- A variant of the Rockchip RK3399
- A 6 inch 720*1440 DSI display
- Front and rear cameras
- Type-C interface with alt mode display (DP 1.2) and PD charging
- 4GB LPDDR4 RAM
- 128GB eMMC
- mSD card slot
- An AP6255 module for 802.11ac WiFi and Bluetooth 5
- Quectel EG25-G 4G/LTE modem

Quoted 1 line

Thanks,
- Kever

Quoted 348 lines
---
  arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi |  39 +++++++
  arch/arm/mach-rockchip/rk3399/Kconfig         |   8 ++
  board/pine64/pinephone-pro-rk3399/Kconfig     |  15 +++
  board/pine64/pinephone-pro-rk3399/MAINTAINERS |   8 ++
  board/pine64/pinephone-pro-rk3399/Makefile    |   1 +
  .../pinephone-pro-rk3399.c                    |  76 +++++++++++++
  configs/pinephone-pro-rk3399_defconfig        | 104 ++++++++++++++++++
  include/configs/pinephone-pro-rk3399.h        |  19 ++++
  8 files changed, 270 insertions(+)

create mode 100644 arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi create mode 100644 board/pine64/pinephone-pro-rk3399/Kconfig create mode 100644 board/pine64/pinephone-pro-rk3399/MAINTAINERS create mode 100644 board/pine64/pinephone-pro-rk3399/Makefile create mode 100644 board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c create mode 100644 configs/pinephone-pro-rk3399_defconfig create mode 100644 include/configs/pinephone-pro-rk3399.h

arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi new file +39 -0
new file mode 100644
index 00000000000..c9f1f4af635
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2022 Peter Robinson <pbrobinson at gmail.com>
+ */
+
+#include "rk3399-u-boot.dtsi"
+#include "rk3399-sdram-lpddr4-100.dtsi"
+
+/ {
+	chosen {
+		u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
+	};
+
+	config {
+		u-boot,spl-payload-offset = <0x60000>; /* @ 384KB */
+	};
+};
+
+&i2c0 {
+	u-boot,dm-pre-reloc;
+};
+
+&rk818 {
+	u-boot,dm-pre-reloc;
+};
+
+&rng {
+	status = "okay";
+};
+
+&sdhci {
+	max-frequency = <25000000>;
+	u-boot,dm-pre-reloc;
+};
+
+&sdmmc {
+	max-frequency = <20000000>;
+	u-boot,dm-pre-reloc;
+};
arch/arm/mach-rockchip/rk3399/Kconfig +8 -0
index b48feeb3466..d01063ac98b 100644
@@ -39,6 +39,13 @@ config TARGET_PINEBOOK_PRO_RK3399
  	  with 4Gb RAM, onboard eMMC, USB-C, a USB3 and USB2 port,
  	  1920*1080 screen and all the usual laptop features.
 
+config TARGET_PINEPHONE_PRO_RK3399
+	bool "PinePhone Pro"
+	help
+	  PinePhone Pro is a phone based on a variant of the Rockchip
+	  rk3399 SoC with 4Gb RAM, onboard eMMC, USB-C, headphone jack,
+	  720x1440 screen and a Quectel 4G/LTE modem.
+
  config TARGET_PUMA_RK3399
  	bool "Theobroma Systems RK3399-Q7 (Puma)"
  	help
@@ -165,6 +172,7 @@ endif # BOOTCOUNT_LIMIT
  source "board/firefly/roc-pc-rk3399/Kconfig"
  source "board/google/gru/Kconfig"
  source "board/pine64/pinebook-pro-rk3399/Kconfig"
+source "board/pine64/pinephone-pro-rk3399/Kconfig"
  source "board/pine64/rockpro64_rk3399/Kconfig"
  source "board/rockchip/evb_rk3399/Kconfig"
  source "board/theobroma-systems/puma_rk3399/Kconfig"
board/pine64/pinephone-pro-rk3399/Kconfig new file +15 -0
new file mode 100644
index 00000000000..13d6465ae6e
@@ -0,0 +1,15 @@
+if TARGET_PINEPHONE_PRO_RK3399
+
+config SYS_BOARD
+	default "pinephone-pro-rk3399"
+
+config SYS_VENDOR
+	default "pine64"
+
+config SYS_CONFIG_NAME
+	default "pinephone-pro-rk3399"
+
+config BOARD_SPECIFIC_OPTIONS
+	def_bool y
+
+endif
board/pine64/pinephone-pro-rk3399/MAINTAINERS new file +8 -0
new file mode 100644
index 00000000000..c923ff1be32
@@ -0,0 +1,8 @@
+PINEPHONE_PRO
+M:	Peter Robinson <[email protected]>
+S:	Maintained
+F:	board/pine64/rk3399-pinephone-pro/
+F:	include/configs/rk3399-pinephone-pro.h
+F:	arch/arm/dts/rk3399-pinephone-pro.dts
+F:	arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
+F:	configs/pinephone-pro-rk3399_defconfig
board/pine64/pinephone-pro-rk3399/Makefile new file +1 -0
new file mode 100644
index 00000000000..8d9203053e5
@@ -0,0 +1 @@
+obj-y	+= pinephone-pro-rk3399.o
board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c new file +76 -0
new file mode 100644
index 00000000000..eb639cd0d07
@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * (C) Copyright 2016 Rockchip Electronics Co., Ltd
+ * (C) Copyright 2022 Peter Robinson <pbrobinson at gmail.com>
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <init.h>
+#include <syscon.h>
+#include <asm/io.h>
+#include <asm/arch-rockchip/clock.h>
+#include <asm/arch-rockchip/grf_rk3399.h>
+#include <asm/arch-rockchip/hardware.h>
+#include <asm/arch-rockchip/misc.h>
+#include <power/regulator.h>
+
+#define GRF_IO_VSEL_BT565_SHIFT 0
+#define PMUGRF_CON0_VSEL_SHIFT 8
+
+#ifndef CONFIG_SPL_BUILD
+int board_early_init_f(void)
+{
+	struct udevice *regulator;
+	int ret;
+
+	ret = regulator_get_by_platname("vcc5v0_usb", &regulator);
+	if (ret) {
+		pr_debug("%s vcc5v0_usb init fail! ret %d\n", __func__, ret);
+		goto out;
+	}
+
+	ret = regulator_set_enable(regulator, true);
+	if (ret)
+		pr_debug("%s vcc5v0-host-en-gpio set fail! ret %d\n", __func__, ret);
+
+out:
+	return 0;
+}
+#endif
+
+#ifdef CONFIG_MISC_INIT_R
+static void setup_iodomain(void)
+{
+	struct rk3399_grf_regs *grf =
+	   syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
+	struct rk3399_pmugrf_regs *pmugrf =
+	   syscon_get_first_range(ROCKCHIP_SYSCON_PMUGRF);
+
+	/* BT565 is in 1.8v domain */
+	rk_setreg(&grf->io_vsel, 1 << GRF_IO_VSEL_BT565_SHIFT);
+
+	/* Set GPIO1 1.8v/3.0v source select to PMU1830_VOL */
+	rk_setreg(&pmugrf->soc_con0, 1 << PMUGRF_CON0_VSEL_SHIFT);
+}
+
+int misc_init_r(void)
+{
+	const u32 cpuid_offset = 0x7;
+	const u32 cpuid_length = 0x10;
+	u8 cpuid[cpuid_length];
+	int ret;
+
+	setup_iodomain();
+
+	ret = rockchip_cpuid_from_efuse(cpuid_offset, cpuid_length, cpuid);
+	if (ret)
+		return ret;
+
+	ret = rockchip_cpuid_set(cpuid, cpuid_length);
+	if (ret)
+		return ret;
+
+	return ret;
+}
+#endif
configs/pinephone-pro-rk3399_defconfig new file +104 -0
new file mode 100644
index 00000000000..0082d3aec39
@@ -0,0 +1,104 @@
+CONFIG_ARM=y
+CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_SYS_TEXT_BASE=0x00200000
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_ENV_SIZE=0x8000
+CONFIG_ENV_OFFSET=0x3F8000
+CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinephone-pro"
+CONFIG_ROCKCHIP_RK3399=y
+CONFIG_TARGET_PINEPHONE_PRO_RK3399=y
+CONFIG_DEBUG_UART_BASE=0xFF1A0000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI=y
+CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
+CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-pinephone-pro.dtb"
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_MISC_INIT_R=y
+CONFIG_SPL_MAX_SIZE=0x2e000
+CONFIG_SPL_PAD_TO=0x7f8000
+CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
+CONFIG_SPL_BSS_START_ADDR=0x400000
+CONFIG_SPL_BSS_MAX_SIZE=0x2000
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
+CONFIG_SPL_STACK=0x400000
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
+CONFIG_SPL_SPI_LOAD=y
+CONFIG_TPL=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_PCI=y
+CONFIG_CMD_USB=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_TIME=y
+CONFIG_CMD_PMIC=y
+CONFIG_CMD_REGULATOR=y
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_ROCKCHIP_GPIO=y
+CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_DM_KEYBOARD=y
+CONFIG_LED=y
+CONFIG_LED_GPIO=y
+CONFIG_MISC=y
+CONFIG_ROCKCHIP_EFUSE=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_SDMA=y
+CONFIG_MMC_SDHCI_ROCKCHIP=y
+CONFIG_SF_DEFAULT_BUS=1
+CONFIG_SF_DEFAULT_SPEED=20000000
+CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
+CONFIG_PHY_ROCKCHIP_TYPEC=y
+CONFIG_DM_PMIC_FAN53555=y
+CONFIG_PMIC_RK8XX=y
+CONFIG_REGULATOR_PWM=y
+CONFIG_REGULATOR_RK8XX=y
+CONFIG_PWM_ROCKCHIP=y
+CONFIG_RAM_RK3399_LPDDR4=y
+CONFIG_DM_RESET=y
+CONFIG_DM_RNG=y
+CONFIG_RNG_ROCKCHIP=y
+CONFIG_BAUDRATE=1500000
+CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_ROCKCHIP_SPI=y
+CONFIG_SYSRESET=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_GENERIC=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GENERIC=y
+CONFIG_USB_KEYBOARD=y
+CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
+CONFIG_USB_HOST_ETHER=y
+CONFIG_USB_ETHER_ASIX=y
+CONFIG_USB_ETHER_RTL8152=y
+CONFIG_DM_VIDEO=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_EDP=y
+CONFIG_SPL_TINY_MEMSET=y
+CONFIG_ERRNO_STR=y
include/configs/pinephone-pro-rk3399.h new file +19 -0
new file mode 100644
index 00000000000..78017d6bcc3
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) 2016 Rockchip Electronics Co., Ltd
+ * Copyright (C) 2022 Peter Robinson <pbrobinson at gmail.com>
+ */
+
+#ifndef __PINEPHONE_PRO_RK3399_H
+#define __PINEPHONE_PRO_RK3399_H
+
+#define ROCKCHIP_DEVICE_SETTINGS \
+		"stdin=serial,usbkbd\0" \
+		"stdout=serial,vidconsole\0" \
+		"stderr=serial,vidconsole\0"
+
+#include <configs/rk3399_common.h>
+
+#define SDRAM_BANK_SIZE			(2UL << 30)
+
+#endif