Skip to contentSkip to conversation

rockchip: ROCKPi N8/N10 hardware enablement

PATCH In review Jagan Teki 2 participants 18 messages Jul 21, 2020 – Jul 22, 2020

Subsystems (2)
lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

v2 cover rockchip: ROCKPi N8/N10 hardware enablement

Series enable hardware enablement on ROCKPi N8/N10 boards.

- USB 3.0 Host
- USB 2.0 Host
- USB 3.0 Gadget
- USB 2.0 Gadget
- HDMI Out
- PCIe

Note: dts patches are Synced from linux-next and few from mailing list.

Jagan Teki (8):
ARM: dts: rockchip: Sync ROCKPi N8/N10 dts(i) from Linux
ARM: dts: rockchip: Add usb host0 ohci node for rk3288
ARM: dts: rockchip: Add USB for RockPI N8/N10
arm: dts: rockchip: Add HDMI out for RockPI N8/N10
arm64: dts: rockchip: Add PCIe for RockPI N10
rockchip: rock-pi-n10: Enable PCI/NVME
arm64: dts: rockchip: Add u-boot,spl-boot-order for ROCKPi N10
rockchip: rock-p-n8/n10: Disable RAM_ROCKCHIP_DEBUG

Suniel Mahesh (4):
arm: dts: rockchip: Sync rk3288 dtsi from linux
rockchip: rock-pi-n10: Enable on board devices
rockchip: evb_rk3288: Add console settings
rockchip: rock-pi-n8: Enable on board devices

 arch/arm/dts/rk3288-rock-pi-n8.dts            |   2 +-
 arch/arm/dts/rk3288-vmarc-som.dtsi            | 132 +++++++-----
 arch/arm/dts/rk3288.dtsi                      |  17 +-
 .../arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi |   6 +
 arch/arm/dts/rk3399pro-rock-pi-n10.dts        |   6 +-
 arch/arm/dts/rk3399pro-vmarc-som.dtsi         | 201 ++++++++++++++----
 .../dts/rockchip-radxa-dalang-carrier.dtsi    |  95 ++++++---
 configs/rock-pi-n10-rk3399pro_defconfig       |  25 +++
 configs/rock-pi-n8-rk3288_defconfig           |  17 ++
 include/configs/evb_rk3288.h                  |   6 +-
 10 files changed, 379 insertions(+), 128 deletions(-)
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH v2 1/12 ARM: dts: rockchip: Sync ROCKPi N8/N10 dts(i) from Linux

Sync ROCKPi N8/N10 dts(i) changes from Linux.

commit <afd9eb880414> ("ARM: dts: rockchip: Add Radxa Rock Pi N8 initial support")

---
Changes for v2:
- collect kerver r-b

 arch/arm/dts/rk3288-rock-pi-n8.dts            |  2 +-
 arch/arm/dts/rk3288-vmarc-som.dtsi            | 80 ++++++-----------
 arch/arm/dts/rk3399pro-rock-pi-n10.dts        |  6 +-
 arch/arm/dts/rk3399pro-vmarc-som.dtsi         | 87 +++++++++----------
 .../dts/rockchip-radxa-dalang-carrier.dtsi    | 65 +++++++-------
 5 files changed, 104 insertions(+), 136 deletions(-)
arch/arm/dts/rk3288-rock-pi-n8.dts +1 -1
index c8637a50c1..c9894a60e7 100644
@@ -7,8 +7,8 @@
 
 /dts-v1/;
 #include "rk3288.dtsi"
-#include "rk3288-vmarc-som.dtsi"
 #include <rockchip-radxa-dalang-carrier.dtsi>
+#include "rk3288-vmarc-som.dtsi"
 
 / {
 	model = "Radxa ROCK Pi N8";
arch/arm/dts/rk3288-vmarc-som.dtsi +26 -54

260 lines not on this page · raw message

arch/arm/dts/rk3399pro-rock-pi-n10.dts +5 -1
index 6ac2d4d721..bf026786fa 100644
@@ -8,11 +8,15 @@
 /dts-v1/;
 #include "rk3399.dtsi"
 #include "rk3399-opp.dtsi"
-#include "rk3399pro-vmarc-som.dtsi"
 #include <rockchip-radxa-dalang-carrier.dtsi>
+#include "rk3399pro-vmarc-som.dtsi"
 
 / {
 	model = "Radxa ROCK Pi N10";
 	compatible = "radxa,rockpi-n10", "vamrs,rk3399pro-vmarc-som",
 		     "rockchip,rk3399pro";
+
+	chosen {
+		stdout-path = "serial2:1500000n8";
+	};
 };
arch/arm/dts/rk3399pro-vmarc-som.dtsi +40 -47

122 lines not on this page · raw message

arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi +32 -33

80 lines not on this page · raw message

Signature · 1 line
2.25.1
author
#2 lore raw

PATCH v2 2/12 arm: dts: rockchip: Sync rk3288 dtsi from linux

In reply to Jagan Teki

From: Suniel Mahesh <[email protected]>

This sync has changes required to use HDMI CEC pin in U-Boot.

Sync dts from linux v5.8-rc5 commit:

	"ARM: dts: rockchip: define the two possible rk3288 CEC pins"
	(sha1: 838980dd04e994bf81cf104fa01ae60802146b39)

---
Changes for v2:
- collect kerver r-b

 arch/arm/dts/rk3288.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm/dts/rk3288.dtsi +6 -0
index 866fc08215..18b372db3a 100644
@@ -1085,6 +1085,12 @@
 			#interrupt-cells = <2>;
 		};
 
+		hdmi {
+			hdmi_cec_c0: hdmi-cec-c0 {
+				rockchip,pins = <7 RK_PC0 2 &pcfg_pull_none>;
+			};
+		};
+
 		pcfg_pull_up: pcfg-pull-up {
 			bias-pull-up;
 		};
Signature · 1 line
2.25.1
author
#3 lore raw

PATCH v2 3/12 ARM: dts: rockchip: Add usb host0 ohci node for rk3288

In reply to Jagan Teki

rk3288 and rk3288w have a usb host0 ohci controller.

Although rk3288 ohci doesn't actually work on hardware, but rk3288w ohci can work well.

So add usb host0 ohci node in rk3288 dtsi and the quirk in ohci platform driver will disable ohci on rk3288.

---
Changes for v2:
- none

 arch/arm/dts/rk3288.dtsi | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
arch/arm/dts/rk3288.dtsi +10 -1
index 18b372db3a..22bb06cec5 100644
@@ -431,7 +431,16 @@
 		status = "disabled";
 	};
 
-	/* NOTE: ohci@ff520000 doesn't actually work on hardware */
+	/* NOTE: doesn't work on RK3288, but fixed on RK3288W */
+	usb_host0_ohci: usb@ff520000 {
+		compatible = "generic-ohci";
+		reg = <0x0 0xff520000 0x0 0x100>;
+		interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru HCLK_USBHOST0>;
+		phys = <&usbphy1>;
+		phy-names = "usb";
+		status = "disabled";
+	};
 
 	usb_host1: usb@ff540000 {
 		compatible = "rockchip,rk3288-usb", "rockchip,rk3066-usb",
Signature · 1 line
2.25.1
Reviewed-by on v2 3/12
#4 lore raw

Re: [PATCH v2 03/12] ARM: dts: rockchip: Add usb host0 ohci node for rk3288

Quoted 9 lines · Jagan Teki

rk3288 and rk3288w have a usb host0 ohci controller.

Although rk3288 ohci doesn't actually work on hardware, but rk3288w ohci can work well.

So add usb host0 ohci node in rk3288 dtsi and the quirk in ohci platform driver will disable ohci on rk3288.

Thanks,
- Kever

Quoted 29 lines

---
Changes for v2:
- none

  arch/arm/dts/rk3288.dtsi | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
arch/arm/dts/rk3288.dtsi +10 -1
index 18b372db3a..22bb06cec5 100644
@@ -431,7 +431,16 @@
  		status = "disabled";
  	};
 
-	/* NOTE: ohci@ff520000 doesn't actually work on hardware */
+	/* NOTE: doesn't work on RK3288, but fixed on RK3288W */
+	usb_host0_ohci: usb@ff520000 {
+		compatible = "generic-ohci";
+		reg = <0x0 0xff520000 0x0 0x100>;
+		interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru HCLK_USBHOST0>;
+		phys = <&usbphy1>;
+		phy-names = "usb";
+		status = "disabled";
+	};
 
  	usb_host1: usb@ff540000 {
  		compatible = "rockchip,rk3288-usb", "rockchip,rk3066-usb",
author
#5 lore raw

PATCH v2 4/12 ARM: dts: rockchip: Add USB for RockPI N8/N10

In reply to Jagan Teki

Radxa dalang carrier board has 2x USB 2.0 and 1x USB 3.0 ports.

This patch adds support to enable all these USB ports for N10 and N8 combinations SBCs.

Note that the USB 3.0 port on RockPI N8 combination works as USB 2.0 OTG since it is driven from RK3288.

---
Changes for v2:
- none

 arch/arm/dts/rk3288-vmarc-som.dtsi            | 42 ++++++++++
 arch/arm/dts/rk3399pro-vmarc-som.dtsi         | 78 +++++++++++++++++++
 .../dts/rockchip-radxa-dalang-carrier.dtsi    | 18 +++++
 3 files changed, 138 insertions(+)
arch/arm/dts/rk3288-vmarc-som.dtsi +42 -0
index 7a9fd40e5b..72a503e50d 100644
@@ -258,4 +258,46 @@
 			rockchip,pins = <6 RK_PC5 1 &pcfg_pull_up_drv_8ma>;
 		};
 	};
+
+	vbus_host {
+		usb1_en_oc: usb1-en-oc {
+			rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
+	vbus_typec {
+		usb0_en_oc: usb0-en-oc {
+			rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+};
+
+&usbphy {
+	status = "okay";
+};
+
+&usb_host0_ehci {
+	status = "okay";
+};
+
+&usb_host0_ohci {
+	status = "okay";
+};
+
+&usb_host1 {
+	status = "okay";
+};
+
+&usb_otg {
+	status = "okay";
+};
+
+&vbus_host {
+	enable-active-high;
+	gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; /* USB1_EN_OC# */
+};
+
+&vbus_typec {
+	enable-active-high;
+	gpio = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; /* USB0_EN_OC# */
 };
arch/arm/dts/rk3399pro-vmarc-som.dtsi +78 -0

92 lines not on this page · raw message

arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi +18 -0
index 450e5bb5af..d2b6ead148 100644
@@ -33,6 +33,24 @@
 		regulator-max-microvolt = <5000000>;
 		vin-supply = <&vcc12v_dcin>;
 	};
+
+	vbus_host: vbus-host {
+		compatible = "regulator-fixed";
+		pinctrl-names = "default";
+		pinctrl-0 = <&usb1_en_oc>;
+		regulator-name = "vbus_host"; /* HOST-5V */
+		regulator-always-on;
+		vin-supply = <&vcc5v0_sys>;
+	};
+
+	vbus_typec: vbus-typec {
+		compatible = "regulator-fixed";
+		pinctrl-names = "default";
+		pinctrl-0 = <&usb0_en_oc>;
+		regulator-name = "vbus_typec";
+		regulator-always-on;
+		vin-supply = <&vcc5v0_sys>;
+	};
 };
 
 &gmac {
Signature · 1 line
2.25.1
Reviewed-by on v2 4/12
#6 lore raw

Re: [PATCH v2 04/12] ARM: dts: rockchip: Add USB for RockPI N8/N10

Quoted 10 lines · Jagan Teki

Radxa dalang carrier board has 2x USB 2.0 and 1x USB 3.0 ports.

This patch adds support to enable all these USB ports for N10 and N8 combinations SBCs.

Note that the USB 3.0 port on RockPI N8 combination works as USB 2.0 OTG since it is driven from RK3288.

Thanks,
- Kever

Quoted 187 lines

---
Changes for v2:
- none

  arch/arm/dts/rk3288-vmarc-som.dtsi            | 42 ++++++++++
  arch/arm/dts/rk3399pro-vmarc-som.dtsi         | 78 +++++++++++++++++++
  .../dts/rockchip-radxa-dalang-carrier.dtsi    | 18 +++++
  3 files changed, 138 insertions(+)
arch/arm/dts/rk3288-vmarc-som.dtsi +42 -0
index 7a9fd40e5b..72a503e50d 100644
@@ -258,4 +258,46 @@
  			rockchip,pins = <6 RK_PC5 1 &pcfg_pull_up_drv_8ma>;
  		};
  	};
+
+	vbus_host {
+		usb1_en_oc: usb1-en-oc {
+			rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
+	vbus_typec {
+		usb0_en_oc: usb0-en-oc {
+			rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+};
+
+&usbphy {
+	status = "okay";
+};
+
+&usb_host0_ehci {
+	status = "okay";
+};
+
+&usb_host0_ohci {
+	status = "okay";
+};
+
+&usb_host1 {
+	status = "okay";
+};
+
+&usb_otg {
+	status = "okay";
+};
+
+&vbus_host {
+	enable-active-high;
+	gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; /* USB1_EN_OC# */
+};
+
+&vbus_typec {
+	enable-active-high;
+	gpio = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; /* USB0_EN_OC# */
  };
arch/arm/dts/rk3399pro-vmarc-som.dtsi +78 -0
index 37ed95d5f7..111d6cf9a4 100644
@@ -304,6 +304,18 @@
  			rockchip,pins = <1 RK_PC2 0 &pcfg_pull_up>;
  		};
  	};
+
+	vbus_host {
+		usb1_en_oc: usb1-en-oc {
+			rockchip,pins = <4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
+	vbus_typec {
+		usb0_en_oc: usb0-en-oc {
+			rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
  };
 
  &pmu_io_domains {
@@ -324,8 +336,74 @@
  	max-frequency = <150000000>;
  };
 
+&tcphy0 {
+	status = "okay";
+};
+
  &tsadc {
  	rockchip,hw-tshut-mode = <1>;
  	rockchip,hw-tshut-polarity = <1>;
  	status = "okay";
  };
+
+&u2phy0 {
+	status = "okay";
+
+	u2phy0_otg: otg-port {
+		phy-supply = <&vbus_typec>;
+		status = "okay";
+	};
+
+	u2phy0_host: host-port {
+		phy-supply = <&vbus_host>;
+		status = "okay";
+	};
+};
+
+
+&u2phy1 {
+	status = "okay";
+
+	u2phy1_host: host-port {
+		phy-supply = <&vbus_host>;
+		status = "okay";
+	};
+};
+
+&usb_host0_ehci {
+	status = "okay";
+};
+
+&usb_host0_ohci {
+	status = "okay";
+};
+
+&usb_host1_ehci {
+	status = "okay";
+};
+
+&usb_host1_ohci {
+	status = "okay";
+};
+
+&usbdrd3_0 {
+	status = "okay";
+};
+
+&usbdrd_dwc3_0 {
+	status = "okay";
+};
+
+&vbus_host {
+	enable-active-high;
+	gpio = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>; /* USB1_EN_OC# */
+	pinctrl-names = "default";
+	pinctrl-0 = <&usb1_en_oc>;
+};
+
+&vbus_typec {
+	enable-active-high;
+	gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; /* USB0_EN_OC# */
+	pinctrl-names = "default";
+	pinctrl-0 = <&usb0_en_oc>;
+};
arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi +18 -0
index 450e5bb5af..d2b6ead148 100644
@@ -33,6 +33,24 @@
  		regulator-max-microvolt = <5000000>;
  		vin-supply = <&vcc12v_dcin>;
  	};
+
+	vbus_host: vbus-host {
+		compatible = "regulator-fixed";
+		pinctrl-names = "default";
+		pinctrl-0 = <&usb1_en_oc>;
+		regulator-name = "vbus_host"; /* HOST-5V */
+		regulator-always-on;
+		vin-supply = <&vcc5v0_sys>;
+	};
+
+	vbus_typec: vbus-typec {
+		compatible = "regulator-fixed";
+		pinctrl-names = "default";
+		pinctrl-0 = <&usb0_en_oc>;
+		regulator-name = "vbus_typec";
+		regulator-always-on;
+		vin-supply = <&vcc5v0_sys>;
+	};
  };
 
  &gmac {
author
#7 lore raw

PATCH v2 5/12 arm: dts: rockchip: Add HDMI out for RockPI N8/N10

In reply to Jagan Teki

This patch adds support to enable HDMI out for
N10 and N8 combinations SBCs.

---
Changes for v2:
- none

 arch/arm/dts/rk3288-vmarc-som.dtsi            | 10 ++++++++++
 arch/arm/dts/rk3399pro-vmarc-som.dtsi         | 12 +++++++++++
 .../dts/rockchip-radxa-dalang-carrier.dtsi    | 20 +++++++++++++++++++
 3 files changed, 42 insertions(+)
arch/arm/dts/rk3288-vmarc-som.dtsi +10 -0
index 72a503e50d..717cb3dc81 100644
@@ -38,6 +38,12 @@
 	snps,reset-gpio = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>;
 };
 
+&hdmi {
+	ddc-i2c-bus = <&i2c5>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&hdmi_cec_c0>;
+};
+
 &i2c0 {
 	clock-frequency = <400000>;
 	status = "okay";
@@ -225,6 +231,10 @@
 	};
 };
 
+&i2c5 {
+	status = "okay";
+};
+
 &pinctrl {
 	pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma {
 		drive-strength = <8>;
arch/arm/dts/rk3399pro-vmarc-som.dtsi +12 -0
index 111d6cf9a4..ebccc4a153 100644
@@ -39,6 +39,12 @@
 	snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
 };
 
+&hdmi {
+	ddc-i2c-bus = <&i2c3>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&hdmi_cec>;
+};
+
 &i2c0 {
 	clock-frequency = <400000>;
 	i2c-scl-falling-time-ns = <30>;
@@ -285,6 +291,12 @@
 	};
 };
 
+&i2c3 {
+	i2c-scl-rising-time-ns = <450>;
+	i2c-scl-falling-time-ns = <15>;
+	status = "okay";
+};
+
 &io_domains {
 	status = "okay";
 	bt656-supply = <&vcca_1v8>;
arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi +20 -0
index d2b6ead148..26b53eac47 100644
@@ -66,6 +66,10 @@
 	status = "okay";
 };
 
+&hdmi {
+	status = "okay";
+};
+
 &pwm0 {
 	status = "okay";
 };
@@ -94,3 +98,19 @@
 &uart2 {
 	status = "okay";
 };
+
+&vopb {
+	status = "okay";
+};
+
+&vopb_mmu {
+	status = "okay";
+};
+
+&vopl {
+	status = "okay";
+};
+
+&vopl_mmu {
+	status = "okay";
+};
Signature · 1 line
2.25.1
Reviewed-by on v2 5/12
#8 lore raw

Re: [PATCH v2 05/12] arm: dts: rockchip: Add HDMI out for RockPI N8/N10

Quoted 4 lines · Jagan Teki

This patch adds support to enable HDMI out for
N10 and N8 combinations SBCs.

Thanks,
- Kever

Quoted 102 lines

---
Changes for v2:
- none

  arch/arm/dts/rk3288-vmarc-som.dtsi            | 10 ++++++++++
  arch/arm/dts/rk3399pro-vmarc-som.dtsi         | 12 +++++++++++
  .../dts/rockchip-radxa-dalang-carrier.dtsi    | 20 +++++++++++++++++++
  3 files changed, 42 insertions(+)
arch/arm/dts/rk3288-vmarc-som.dtsi +10 -0
index 72a503e50d..717cb3dc81 100644
@@ -38,6 +38,12 @@
  	snps,reset-gpio = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>;
  };
 
+&hdmi {
+	ddc-i2c-bus = <&i2c5>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&hdmi_cec_c0>;
+};
+
  &i2c0 {
  	clock-frequency = <400000>;
  	status = "okay";
@@ -225,6 +231,10 @@
  	};
  };
 
+&i2c5 {
+	status = "okay";
+};
+
  &pinctrl {
  	pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma {
  		drive-strength = <8>;
arch/arm/dts/rk3399pro-vmarc-som.dtsi +12 -0
index 111d6cf9a4..ebccc4a153 100644
@@ -39,6 +39,12 @@
  	snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
  };
 
+&hdmi {
+	ddc-i2c-bus = <&i2c3>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&hdmi_cec>;
+};
+
  &i2c0 {
  	clock-frequency = <400000>;
  	i2c-scl-falling-time-ns = <30>;
@@ -285,6 +291,12 @@
  	};
  };
 
+&i2c3 {
+	i2c-scl-rising-time-ns = <450>;
+	i2c-scl-falling-time-ns = <15>;
+	status = "okay";
+};
+
  &io_domains {
  	status = "okay";
  	bt656-supply = <&vcca_1v8>;
arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi +20 -0
index d2b6ead148..26b53eac47 100644
@@ -66,6 +66,10 @@
  	status = "okay";
  };
 
+&hdmi {
+	status = "okay";
+};
+
  &pwm0 {
  	status = "okay";
  };
@@ -94,3 +98,19 @@
  &uart2 {
  	status = "okay";
  };
+
+&vopb {
+	status = "okay";
+};
+
+&vopb_mmu {
+	status = "okay";
+};
+
+&vopl {
+	status = "okay";
+};
+
+&vopl_mmu {
+	status = "okay";
+};
author
#9 lore raw

PATCH v2 6/12 arm64: dts: rockchip: Add PCIe for RockPI N10

In reply to Jagan Teki

This patch adds support to enable PCIe for RockPI N10.

---
Changes for v2:
- none

 arch/arm/dts/rk3399pro-vmarc-som.dtsi | 40 +++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)
arch/arm/dts/rk3399pro-vmarc-som.dtsi +38 -2
index ebccc4a153..5d087be04a 100644
@@ -11,6 +11,18 @@
 
 / {
 	compatible = "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro";
+
+	vcc3v3_pcie: vcc-pcie-regulator {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio4 RK_PD4 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pcie_pwr>;
+		regulator-name = "vcc3v3_pcie";
+		regulator-always-on;
+		regulator-boot-on;
+		vin-supply = <&vcc5v0_sys>;
+	};
 };
 
 &cpu_l0 {
@@ -142,7 +154,8 @@
 				regulator-min-microvolt = <900000>;
 				regulator-max-microvolt = <900000>;
 				regulator-state-mem {
-					regulator-off-in-suspend;
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <900000>;
 				};
 			};
 
@@ -177,7 +190,8 @@
 				regulator-min-microvolt = <1850000>;
 				regulator-max-microvolt = <1850000>;
 				regulator-state-mem {
-					regulator-off-in-suspend;
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1850000>;
 				};
 			};
 
@@ -304,6 +318,22 @@
 	sdmmc-supply = <&vccio_sd>;
 };
 
+&pcie_phy {
+	status = "okay";
+};
+
+&pcie0 {
+	ep-gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;
+	max-link-speed = <2>;
+	num-lanes = <4>;
+	pinctrl-0 = <&pcie_clkreqnb_cpm>;
+	pinctrl-names = "default";
+	vpcie0v9-supply = <&vcca_0v9>;	/* VCC_0V9_S0 */
+	vpcie1v8-supply = <&vcca_1v8>;	/* VCC_1V8_S0 */
+	vpcie3v3-supply = <&vcc3v3_pcie>;
+	status = "okay";
+};
+
 &pinctrl {
 	hym8563 {
 		hym8563_int: hym8563-int {
@@ -311,6 +341,12 @@
 		};
 	};
 
+	pcie {
+		pcie_pwr: pcie-pwr {
+			rockchip,pins =	<4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
 	pmic {
 		pmic_int_l: pmic-int-l {
 			rockchip,pins = <1 RK_PC2 0 &pcfg_pull_up>;
Signature · 1 line
2.25.1
Reviewed-by on v2 6/12
#10 lore raw

Re: [PATCH v2 06/12] arm64: dts: rockchip: Add PCIe for RockPI N10

Quoted 3 lines · Jagan Teki

This patch adds support to enable PCIe for RockPI N10.

Thanks,
- Kever

Quoted 86 lines

---
Changes for v2:
- none

  arch/arm/dts/rk3399pro-vmarc-som.dtsi | 40 +++++++++++++++++++++++++--
  1 file changed, 38 insertions(+), 2 deletions(-)
arch/arm/dts/rk3399pro-vmarc-som.dtsi +38 -2
index ebccc4a153..5d087be04a 100644
@@ -11,6 +11,18 @@
 
  / {
  	compatible = "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro";
+
+	vcc3v3_pcie: vcc-pcie-regulator {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio4 RK_PD4 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pcie_pwr>;
+		regulator-name = "vcc3v3_pcie";
+		regulator-always-on;
+		regulator-boot-on;
+		vin-supply = <&vcc5v0_sys>;
+	};
  };
 
  &cpu_l0 {
@@ -142,7 +154,8 @@
  				regulator-min-microvolt = <900000>;
  				regulator-max-microvolt = <900000>;
  				regulator-state-mem {
-					regulator-off-in-suspend;
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <900000>;
  				};
  			};
 
@@ -177,7 +190,8 @@
  				regulator-min-microvolt = <1850000>;
  				regulator-max-microvolt = <1850000>;
  				regulator-state-mem {
-					regulator-off-in-suspend;
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1850000>;
  				};
  			};
 
@@ -304,6 +318,22 @@
  	sdmmc-supply = <&vccio_sd>;
  };
 
+&pcie_phy {
+	status = "okay";
+};
+
+&pcie0 {
+	ep-gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;
+	max-link-speed = <2>;
+	num-lanes = <4>;
+	pinctrl-0 = <&pcie_clkreqnb_cpm>;
+	pinctrl-names = "default";
+	vpcie0v9-supply = <&vcca_0v9>;	/* VCC_0V9_S0 */
+	vpcie1v8-supply = <&vcca_1v8>;	/* VCC_1V8_S0 */
+	vpcie3v3-supply = <&vcc3v3_pcie>;
+	status = "okay";
+};
+
  &pinctrl {
  	hym8563 {
  		hym8563_int: hym8563-int {
@@ -311,6 +341,12 @@
  		};
  	};
 
+	pcie {
+		pcie_pwr: pcie-pwr {
+			rockchip,pins =	<4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
  	pmic {
  		pmic_int_l: pmic-int-l {
  			rockchip,pins = <1 RK_PC2 0 &pcfg_pull_up>;
author
#11 lore raw

PATCH v2 7/12 rockchip: rock-pi-n10: Enable on board devices

In reply to Jagan Teki

From: Suniel Mahesh <[email protected]>

Enable common on board devices for ROCKPi N10.

- USB 2.0 Host
- USB 3.0 Host
- USB 3.0 Gadget
- HDMI Out

---
Changes for v2:
- squash common device enablement

 configs/rock-pi-n10-rk3399pro_defconfig | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
configs/rock-pi-n10-rk3399pro_defconfig +21 -0
index c705ce01ce..895820fbe6 100644
@@ -9,6 +9,8 @@ CONFIG_NR_DRAM_BANKS=1
 CONFIG_DEBUG_UART_BASE=0xFF1A0000
 CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_DEBUG_UART=y
+# CONFIG_ANDROID_BOOT_IMAGE is not set
+# CONFIG_CONSOLE_MUX is not set
 CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399pro-rock-pi-n10.dtb"
 CONFIG_MISC_INIT_R=y
 CONFIG_DISPLAY_BOARDINFO_LATE=y
@@ -19,6 +21,7 @@ CONFIG_TPL=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
@@ -36,11 +39,29 @@ CONFIG_MMC_SDHCI_ROCKCHIP=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
+CONFIG_PHY_ROCKCHIP_TYPEC=y
 CONFIG_PMIC_RK8XX=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
+CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
 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_DWC3=y
+CONFIG_USB_DWC3_GENERIC=y
+CONFIG_ROCKCHIP_USB2_PHY=y
+CONFIG_USB_KEYBOARD=y
+# CONFIG_USB_KEYBOARD_FN_KEYS is not set
+CONFIG_USB_GADGET=y
+CONFIG_DM_VIDEO=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
 CONFIG_ERRNO_STR=y
Signature · 1 line
2.25.1
Reviewed-by on v2 7/12
#12 lore raw

Re: [PATCH v2 07/12] rockchip: rock-pi-n10: Enable on board devices

Quoted 11 lines · Jagan Teki

From: Suniel Mahesh <[email protected]>

Enable common on board devices for ROCKPi N10.

- USB 2.0 Host
- USB 3.0 Host
- USB 3.0 Gadget
- HDMI Out

Thanks,
- Kever

Quoted 58 lines

---
Changes for v2:
- squash common device enablement

  configs/rock-pi-n10-rk3399pro_defconfig | 21 +++++++++++++++++++++
  1 file changed, 21 insertions(+)
configs/rock-pi-n10-rk3399pro_defconfig +21 -0
index c705ce01ce..895820fbe6 100644
@@ -9,6 +9,8 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_DEBUG_UART=y
+# CONFIG_ANDROID_BOOT_IMAGE is not set
+# CONFIG_CONSOLE_MUX is not set
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399pro-rock-pi-n10.dtb"
  CONFIG_MISC_INIT_R=y
  CONFIG_DISPLAY_BOARDINFO_LATE=y
@@ -19,6 +21,7 @@ CONFIG_TPL=y
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
+CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_TIME=y
  CONFIG_SPL_OF_CONTROL=y
@@ -36,11 +39,29 @@ CONFIG_MMC_SDHCI_ROCKCHIP=y
  CONFIG_DM_ETH=y
  CONFIG_ETH_DESIGNWARE=y
  CONFIG_GMAC_ROCKCHIP=y
+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
+CONFIG_PHY_ROCKCHIP_TYPEC=y
  CONFIG_PMIC_RK8XX=y
  CONFIG_REGULATOR_PWM=y
  CONFIG_REGULATOR_RK8XX=y
  CONFIG_PWM_ROCKCHIP=y
+CONFIG_DM_RESET=y
  CONFIG_BAUDRATE=1500000
  CONFIG_DEBUG_UART_SHIFT=2
  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_DWC3=y
+CONFIG_USB_DWC3_GENERIC=y
+CONFIG_ROCKCHIP_USB2_PHY=y
+CONFIG_USB_KEYBOARD=y
+# CONFIG_USB_KEYBOARD_FN_KEYS is not set
+CONFIG_USB_GADGET=y
+CONFIG_DM_VIDEO=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
  CONFIG_ERRNO_STR=y
author
#13 lore raw

PATCH v2 8/12 rockchip: evb_rk3288: Add console settings

In reply to Jagan Teki

From: Suniel Mahesh <[email protected]>

Add console settings like stdin, stdout and stderr as usbkbd and vidconsole respectively for evb-rk3288 targets.

This would certainly help to detect the attached video devices (like HDMI) and print the console messages on display.

---
Changes for v2:
- update commit messaage

 include/configs/evb_rk3288.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
include/configs/evb_rk3288.h +5 -1
index ddd7012c8f..e19fa90212 100644
@@ -6,7 +6,11 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define ROCKCHIP_DEVICE_SETTINGS
+#define ROCKCHIP_DEVICE_SETTINGS \
+		"stdin=serial,usbkbd\0" \
+		"stdout=serial,vidconsole\0" \
+		"stderr=serial,vidconsole\0"
+
 #include <configs/rk3288_common.h>
 
 #define CONFIG_SYS_MMC_ENV_DEV 0
Signature · 1 line
2.25.1
Reviewed-by on v2 8/12
#14 lore raw

Re: [PATCH v2 08/12] rockchip: evb_rk3288: Add console settings

Quoted 10 lines · Jagan Teki

From: Suniel Mahesh <[email protected]>

Add console settings like stdin, stdout and stderr as usbkbd and vidconsole respectively for evb-rk3288 targets.

This would certainly help to detect the attached video devices (like HDMI) and print the console messages on display.

Thanks,
- Kever

Quoted 24 lines

---
Changes for v2:
- update commit messaage

  include/configs/evb_rk3288.h | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
include/configs/evb_rk3288.h +5 -1
index ddd7012c8f..e19fa90212 100644
@@ -6,7 +6,11 @@
  #ifndef __CONFIG_H
  #define __CONFIG_H
 
-#define ROCKCHIP_DEVICE_SETTINGS
+#define ROCKCHIP_DEVICE_SETTINGS \
+		"stdin=serial,usbkbd\0" \
+		"stdout=serial,vidconsole\0" \
+		"stderr=serial,vidconsole\0"
+
  #include <configs/rk3288_common.h>
 
  #define CONFIG_SYS_MMC_ENV_DEV 0
author
#15 lore raw

PATCH v2 9/12 rockchip: rock-pi-n8: Enable on board devices

In reply to Jagan Teki

From: Suniel Mahesh <[email protected]>

Enable common on board devices for ROCKPi N8.

- USB 2.0 Host
- USB 2.0 OTG/Gadget
- HDMI Out

---
Changes for v2:
- squash common device enablement

 configs/rock-pi-n8-rk3288_defconfig | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
configs/rock-pi-n8-rk3288_defconfig +16 -0
index 6b31e19eda..d218852d79 100644
@@ -11,8 +11,10 @@ CONFIG_NR_DRAM_BANKS=1
 CONFIG_DEBUG_UART_BASE=0xff690000
 CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_DEBUG_UART=y
+# CONFIG_ANDROID_BOOT_IMAGE is not set
 CONFIG_USE_PREBOOT=y
 CONFIG_SILENT_CONSOLE=y
+# CONFIG_CONSOLE_MUX is not set
 CONFIG_DEFAULT_FDT_FILE="rk3288-rock-pi-n8.dtb"
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_SPL_STACK_R=y
@@ -22,6 +24,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
@@ -63,4 +66,17 @@ CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYSRESET=y
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_GENERIC=y
+CONFIG_USB_DWC2=y
+CONFIG_ROCKCHIP_USB2_PHY=y
+CONFIG_USB_KEYBOARD=y
+# CONFIG_USB_KEYBOARD_FN_KEYS is not set
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_DM_VIDEO=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
 CONFIG_ERRNO_STR=y
Signature · 1 line
2.25.1
Reviewed-by on v2 9/12
#16 lore raw

Re: [PATCH v2 09/12] rockchip: rock-pi-n8: Enable on board devices

Quoted 10 lines · Jagan Teki

From: Suniel Mahesh <[email protected]>

Enable common on board devices for ROCKPi N8.

- USB 2.0 Host
- USB 2.0 OTG/Gadget
- HDMI Out

Thanks,
- Kever

Quoted 48 lines

---
Changes for v2:
- squash common device enablement

  configs/rock-pi-n8-rk3288_defconfig | 16 ++++++++++++++++
  1 file changed, 16 insertions(+)
configs/rock-pi-n8-rk3288_defconfig +16 -0
index 6b31e19eda..d218852d79 100644
@@ -11,8 +11,10 @@ CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BASE=0xff690000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_DEBUG_UART=y
+# CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_USE_PREBOOT=y
  CONFIG_SILENT_CONSOLE=y
+# CONFIG_CONSOLE_MUX is not set
  CONFIG_DEFAULT_FDT_FILE="rk3288-rock-pi-n8.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  CONFIG_SPL_STACK_R=y
@@ -22,6 +24,7 @@ CONFIG_CMD_GPIO=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_I2C=y
  CONFIG_CMD_MMC=y
+CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_CACHE=y
  CONFIG_CMD_TIME=y
@@ -63,4 +66,17 @@ CONFIG_RAM=y
  CONFIG_SPL_RAM=y
  CONFIG_DEBUG_UART_SHIFT=2
  CONFIG_SYSRESET=y
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_GENERIC=y
+CONFIG_USB_DWC2=y
+CONFIG_ROCKCHIP_USB2_PHY=y
+CONFIG_USB_KEYBOARD=y
+# CONFIG_USB_KEYBOARD_FN_KEYS is not set
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_DM_VIDEO=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
  CONFIG_ERRNO_STR=y
#17 lore raw
In reply to Jagan Teki
Quoted 28 lines · Jagan Teki

Series enable hardware enablement on ROCKPi N8/N10 boards.

- USB 3.0 Host
- USB 2.0 Host
- USB 3.0 Gadget
- USB 2.0 Gadget
- HDMI Out
- PCIe

Note: dts patches are Synced from linux-next and few from mailing list.

Jagan Teki (8):
ARM: dts: rockchip: Sync ROCKPi N8/N10 dts(i) from Linux
ARM: dts: rockchip: Add usb host0 ohci node for rk3288
ARM: dts: rockchip: Add USB for RockPI N8/N10
arm: dts: rockchip: Add HDMI out for RockPI N8/N10
arm64: dts: rockchip: Add PCIe for RockPI N10
rockchip: rock-pi-n10: Enable PCI/NVME
arm64: dts: rockchip: Add u-boot,spl-boot-order for ROCKPi N10
rockchip: rock-p-n8/n10: Disable RAM_ROCKCHIP_DEBUG

Suniel Mahesh (4):
arm: dts: rockchip: Sync rk3288 dtsi from linux
rockchip: rock-pi-n10: Enable on board devices
rockchip: evb_rk3288: Add console settings
rockchip: rock-pi-n8: Enable on board devices

Quoted 12 lines
  arch/arm/dts/rk3288-rock-pi-n8.dts            |   2 +-
  arch/arm/dts/rk3288-vmarc-som.dtsi            | 132 +++++++-----
  arch/arm/dts/rk3288.dtsi                      |  17 +-
  .../arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi |   6 +
  arch/arm/dts/rk3399pro-rock-pi-n10.dts        |   6 +-
  arch/arm/dts/rk3399pro-vmarc-som.dtsi         | 201 ++++++++++++++----
  .../dts/rockchip-radxa-dalang-carrier.dtsi    |  95 ++++++---
  configs/rock-pi-n10-rk3399pro_defconfig       |  25 +++
  configs/rock-pi-n8-rk3288_defconfig           |  17 ++
  include/configs/evb_rk3288.h                  |   6 +-
  10 files changed, 379 insertions(+), 128 deletions(-)

Applied to u-boot-rockchip master for this patch set, thanks.