* [PATCH v2 00/12] rockchip: ROCKPi N8/N10 hardware enablement
@ 2020-07-21 15:24 ` Jagan Teki
0 siblings, 0 replies; 36+ messages in thread
From: Jagan Teki @ 2020-07-21 15:24 UTC (permalink / raw
To: Kever Yang, Philipp Tomsich, Simon Glass
Cc: Suniel Mahesh, U-Boot-Denx, linux-rockchip, linux-amarula,
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
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(-)
--
2.25.1
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 00/12] rockchip: ROCKPi N8/N10 hardware enablement
@ 2020-07-21 15:24 ` Jagan Teki
0 siblings, 0 replies; 36+ messages in thread
From: Jagan Teki @ 2020-07-21 15:24 UTC (permalink / raw
To: u-boot
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(-)
--
2.25.1
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 01/12] ARM: dts: rockchip: Sync ROCKPi N8/N10 dts(i) from Linux
2020-07-21 15:24 ` Jagan Teki
@ 2020-07-21 15:24 ` Jagan Teki
-1 siblings, 0 replies; 36+ messages in thread
From: Jagan Teki @ 2020-07-21 15:24 UTC (permalink / raw
To: Kever Yang, Philipp Tomsich, Simon Glass
Cc: Suniel Mahesh, U-Boot-Denx, linux-rockchip, linux-amarula,
Jagan Teki
Sync ROCKPi N8/N10 dts(i) changes from Linux.
commit <afd9eb880414> ("ARM: dts: rockchip: Add Radxa Rock Pi N8 initial
support")
Signed-off-by: Suniel Mahesh <sunil@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang<kever.yang@rock-chips.com>
---
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(-)
diff --git a/arch/arm/dts/rk3288-rock-pi-n8.dts b/arch/arm/dts/rk3288-rock-pi-n8.dts
index c8637a50c1..c9894a60e7 100644
--- a/arch/arm/dts/rk3288-rock-pi-n8.dts
+++ b/arch/arm/dts/rk3288-rock-pi-n8.dts
@@ -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";
diff --git a/arch/arm/dts/rk3288-vmarc-som.dtsi b/arch/arm/dts/rk3288-vmarc-som.dtsi
index 3cffe61cdf..7a9fd40e5b 100644
--- a/arch/arm/dts/rk3288-vmarc-som.dtsi
+++ b/arch/arm/dts/rk3288-vmarc-som.dtsi
@@ -7,35 +7,17 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/rockchip.h>
-#include <dt-bindings/pwm/pwm.h>
/ {
compatible = "vamrs,rk3288-vmarc-som", "rockchip,rk3288";
- ext_gmac: external-gmac-clock {
- compatible = "fixed-clock";
- clock-frequency = <125000000>;
- clock-output-names = "ext_gmac";
- #clock-cells = <0>;
- };
-
vccio_flash: vccio-flash-regulator {
compatible = "regulator-fixed";
regulator-name = "vccio_flash";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
- startup-delay-us = <150>;
vin-supply = <&vcc_io>;
};
-
- vcc_sys: vsys-regulator {
- compatible = "regulator-fixed";
- regulator-name = "vcc_sys";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- regulator-always-on;
- regulator-boot-on;
- };
};
&emmc {
@@ -45,23 +27,15 @@
non-removable;
pinctrl-names = "default";
pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
+ vmmc-supply = <&vcc_io>;
+ vqmmc-supply = <&vccio_flash>;
status = "okay";
};
&gmac {
assigned-clocks = <&cru SCLK_MAC>;
- assigned-clock-parents = <&ext_gmac>;
- clock_in_out = "input";
- phy-mode = "rgmii";
phy-supply = <&vcc_io>;
- pinctrl-names = "default";
- pinctrl-0 = <&rgmii_pins>;
snps,reset-gpio = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>;
- snps,reset-active-low;
- snps,reset-delays-us = <0 10000 50000>;
- tx_delay = <0x30>;
- rx_delay = <0x10>;
- max-speed = <1000>;
};
&i2c0 {
@@ -80,37 +54,37 @@
#clock-cells = <1>;
clock-output-names = "rk808-clkout1", "rk808-clkout2";
- vcc1-supply = <&vcc_sys>;
- vcc2-supply = <&vcc_sys>;
- vcc3-supply = <&vcc_sys>;
- vcc4-supply = <&vcc_sys>;
- vcc6-supply = <&vcc_sys>;
- vcc7-supply = <&vcc_sys>;
+ vcc1-supply = <&vcc5v0_sys>;
+ vcc2-supply = <&vcc5v0_sys>;
+ vcc3-supply = <&vcc5v0_sys>;
+ vcc4-supply = <&vcc5v0_sys>;
+ vcc6-supply = <&vcc5v0_sys>;
+ vcc7-supply = <&vcc5v0_sys>;
vcc8-supply = <&vcc_io>;
vcc9-supply = <&vcc_io>;
- vcc10-supply = <&vcc_sys>;
- vcc11-supply = <&vcc_sys>;
+ vcc10-supply = <&vcc5v0_sys>;
+ vcc11-supply = <&vcc5v0_sys>;
vcc12-supply = <&vcc_io>;
vddio-supply = <&vcc_io>;
regulators {
vdd_cpu: DCDC_REG1 {
+ regulator-name = "vdd_arm";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <750000>;
regulator-max-microvolt = <1400000>;
- regulator-name = "vdd_arm";
regulator-state-mem {
regulator-off-in-suspend;
};
};
vdd_gpu: DCDC_REG2 {
+ regulator-name = "vdd_gpu";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <850000>;
regulator-max-microvolt = <1250000>;
- regulator-name = "vdd_gpu";
regulator-ramp-delay = <6000>;
regulator-state-mem {
regulator-off-in-suspend;
@@ -118,20 +92,20 @@
};
vcc_ddr: DCDC_REG3 {
+ regulator-name = "vcc_ddr";
regulator-always-on;
regulator-boot-on;
- regulator-name = "vcc_ddr";
regulator-state-mem {
regulator-on-in-suspend;
};
};
vcc_io: DCDC_REG4 {
+ regulator-name = "vcc_io";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
- regulator-name = "vcc_io";
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <3300000>;
@@ -139,22 +113,22 @@
};
vcc_tp: LDO_REG1 {
+ regulator-name = "vcc_tp";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
- regulator-name = "vcc_tp";
regulator-state-mem {
regulator-off-in-suspend;
};
};
vcca_codec: LDO_REG2 {
+ regulator-name = "vcca_codec";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
- regulator-name = "vcca_codec";
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <3300000>;
@@ -162,11 +136,11 @@
};
vdd_10: LDO_REG3 {
+ regulator-name = "vdd_10";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
- regulator-name = "vdd_10";
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <1000000>;
@@ -174,22 +148,22 @@
};
vcc_wl: LDO_REG4 {
+ regulator-name = "vcc_wl";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
- regulator-name = "vcc_wl";
regulator-state-mem {
regulator-on-in-suspend;
};
};
vccio_sd: LDO_REG5 {
+ regulator-name = "vccio_sd";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
- regulator-name = "vccio_sd";
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <3300000>;
@@ -197,22 +171,22 @@
};
vdd10_lcd: LDO_REG6 {
+ regulator-name = "vdd10_lcd";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
- regulator-name = "vdd10_lcd";
regulator-state-mem {
regulator-off-in-suspend;
};
};
vcc_18: LDO_REG7 {
+ regulator-name = "vcc_18";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
- regulator-name = "vcc_18";
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <1800000>;
@@ -220,29 +194,29 @@
};
vcc18_lcd: LDO_REG8 {
+ regulator-name = "vcc18_lcd";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
- regulator-name = "vcc18_lcd";
regulator-state-mem {
regulator-off-in-suspend;
};
};
vcc_sd: SWITCH_REG1 {
+ regulator-name = "vcc_sd";
regulator-always-on;
regulator-boot-on;
- regulator-name = "vcc_sd";
regulator-state-mem {
regulator-off-in-suspend;
};
};
vcc_lcd: SWITCH_REG2 {
+ regulator-name = "vcc_lcd";
regulator-always-on;
regulator-boot-on;
- regulator-name = "vcc_lcd";
regulator-state-mem {
regulator-off-in-suspend;
};
@@ -277,13 +251,11 @@
};
sdmmc_clk: sdmmc-clk {
- rockchip,pins =
- <6 RK_PC4 1 &pcfg_pull_none_drv_8ma>;
+ rockchip,pins = <6 RK_PC4 1 &pcfg_pull_none_drv_8ma>;
};
sdmmc_cmd: sdmmc-cmd {
- rockchip,pins =
- <6 RK_PC5 1 &pcfg_pull_up_drv_8ma>;
+ rockchip,pins = <6 RK_PC5 1 &pcfg_pull_up_drv_8ma>;
};
};
};
diff --git a/arch/arm/dts/rk3399pro-rock-pi-n10.dts b/arch/arm/dts/rk3399pro-rock-pi-n10.dts
index 6ac2d4d721..bf026786fa 100644
--- a/arch/arm/dts/rk3399pro-rock-pi-n10.dts
+++ b/arch/arm/dts/rk3399pro-rock-pi-n10.dts
@@ -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";
+ };
};
diff --git a/arch/arm/dts/rk3399pro-vmarc-som.dtsi b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
index 6fd17e8a81..37ed95d5f7 100644
--- a/arch/arm/dts/rk3399pro-vmarc-som.dtsi
+++ b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
@@ -11,32 +11,6 @@
/ {
compatible = "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro";
-
- clkin_gmac: external-gmac-clock {
- compatible = "fixed-clock";
- clock-frequency = <125000000>;
- clock-output-names = "clkin_gmac";
- #clock-cells = <0>;
- };
-
- vcc12v_dcin: vcc12v-dcin-regulator {
- compatible = "regulator-fixed";
- regulator-name = "vcc12v_dcin";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <12000000>;
- regulator-max-microvolt = <12000000>;
- };
-
- vcc5v0_sys: vcc5v0-sys-regulator {
- compatible = "regulator-fixed";
- regulator-name = "vcc5v0_sys";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- vin-supply = <&vcc12v_dcin>;
- };
};
&cpu_l0 {
@@ -61,23 +35,14 @@
&gmac {
assigned-clocks = <&cru SCLK_RMII_SRC>;
- assigned-clock-parents = <&clkin_gmac>;
- clock_in_out = "input";
phy-supply = <&vcc_lan>;
- phy-mode = "rgmii";
- pinctrl-names = "default";
- pinctrl-0 = <&rgmii_pins>;
snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
- snps,reset-active-low;
- snps,reset-delays-us = <0 10000 50000>;
- tx_delay = <0x28>;
- rx_delay = <0x11>;
};
&i2c0 {
clock-frequency = <400000>;
- i2c-scl-rising-time-ns = <180>;
i2c-scl-falling-time-ns = <30>;
+ i2c-scl-rising-time-ns = <180>;
status = "okay";
rk809: pmic@20 {
@@ -297,11 +262,48 @@
};
};
+&i2c1 {
+ i2c-scl-falling-time-ns = <30>;
+ i2c-scl-rising-time-ns = <140>;
+ status = "okay";
+};
+
+&i2c2 {
+ clock-frequency = <400000>;
+ status = "okay";
+
+ hym8563: hym8563@51 {
+ compatible = "haoyu,hym8563";
+ reg = <0x51>;
+ #clock-cells = <0>;
+ clock-frequency = <32768>;
+ clock-output-names = "hym8563";
+ pinctrl-names = "default";
+ pinctrl-0 = <&hym8563_int>;
+ interrupt-parent = <&gpio4>;
+ interrupts = <RK_PD6 IRQ_TYPE_LEVEL_LOW>;
+ };
+};
+
&io_domains {
status = "okay";
bt656-supply = <&vcca_1v8>;
- sdmmc-supply = <&vccio_sd>;
gpio1830-supply = <&vccio_3v0>;
+ sdmmc-supply = <&vccio_sd>;
+};
+
+&pinctrl {
+ hym8563 {
+ hym8563_int: hym8563-int {
+ rockchip,pins = <4 RK_PD6 0 &pcfg_pull_up>;
+ };
+ };
+
+ pmic {
+ pmic_int_l: pmic-int-l {
+ rockchip,pins = <1 RK_PC2 0 &pcfg_pull_up>;
+ };
+ };
};
&pmu_io_domains {
@@ -323,16 +325,7 @@
};
&tsadc {
- status = "okay";
rockchip,hw-tshut-mode = <1>;
rockchip,hw-tshut-polarity = <1>;
-};
-
-&pinctrl {
- pmic {
- pmic_int_l: pmic-int-l {
- rockchip,pins =
- <1 RK_PC2 0 &pcfg_pull_up>;
- };
- };
+ status = "okay";
};
diff --git a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
index 3e54f38f0a..450e5bb5af 100644
--- a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
+++ b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
@@ -8,36 +8,44 @@
#include <dt-bindings/pwm/pwm.h>
/ {
- chosen {
- stdout-path = "serial2:1500000n8";
+ clkin_gmac: external-gmac-clock {
+ compatible = "fixed-clock";
+ clock-frequency = <125000000>;
+ clock-output-names = "clkin_gmac";
+ #clock-cells = <0>;
};
-};
-&gmac {
- status = "okay";
-};
+ vcc12v_dcin: vcc12v-dcin-regulator {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc12v_dcin";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <12000000>;
+ regulator-max-microvolt = <12000000>;
+ };
-&i2c1 {
- status = "okay";
- i2c-scl-rising-time-ns = <140>;
- i2c-scl-falling-time-ns = <30>;
+ vcc5v0_sys: vcc5v0-sys-regulator {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc5v0_sys";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ vin-supply = <&vcc12v_dcin>;
+ };
};
-&i2c2 {
+&gmac {
+ assigned-clock-parents = <&clkin_gmac>;
+ clock_in_out = "input";
+ phy-mode = "rgmii";
+ pinctrl-names = "default";
+ pinctrl-0 = <&rgmii_pins>;
+ snps,reset-active-low;
+ snps,reset-delays-us = <0 10000 50000>;
+ tx_delay = <0x28>;
+ rx_delay = <0x11>;
status = "okay";
- clock-frequency = <400000>;
-
- hym8563: hym8563@51 {
- compatible = "haoyu,hym8563";
- reg = <0x51>;
- #clock-cells = <0>;
- clock-frequency = <32768>;
- clock-output-names = "hym8563";
- pinctrl-names = "default";
- pinctrl-0 = <&hym8563_int>;
- interrupt-parent = <&gpio4>;
- interrupts = <30 IRQ_TYPE_LEVEL_LOW>;
- };
};
&pwm0 {
@@ -68,12 +76,3 @@
&uart2 {
status = "okay";
};
-
-&pinctrl {
- hym8563 {
- hym8563_int: hym8563-int {
- rockchip,pins =
- <4 RK_PD6 0 &pcfg_pull_up>;
- };
- };
-};
--
2.25.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 01/12] ARM: dts: rockchip: Sync ROCKPi N8/N10 dts(i) from Linux
@ 2020-07-21 15:24 ` Jagan Teki
0 siblings, 0 replies; 36+ messages in thread
From: Jagan Teki @ 2020-07-21 15:24 UTC (permalink / raw
To: u-boot
Sync ROCKPi N8/N10 dts(i) changes from Linux.
commit <afd9eb880414> ("ARM: dts: rockchip: Add Radxa Rock Pi N8 initial
support")
Signed-off-by: Suniel Mahesh <sunil@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang<kever.yang@rock-chips.com>
---
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(-)
diff --git a/arch/arm/dts/rk3288-rock-pi-n8.dts b/arch/arm/dts/rk3288-rock-pi-n8.dts
index c8637a50c1..c9894a60e7 100644
--- a/arch/arm/dts/rk3288-rock-pi-n8.dts
+++ b/arch/arm/dts/rk3288-rock-pi-n8.dts
@@ -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";
diff --git a/arch/arm/dts/rk3288-vmarc-som.dtsi b/arch/arm/dts/rk3288-vmarc-som.dtsi
index 3cffe61cdf..7a9fd40e5b 100644
--- a/arch/arm/dts/rk3288-vmarc-som.dtsi
+++ b/arch/arm/dts/rk3288-vmarc-som.dtsi
@@ -7,35 +7,17 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/rockchip.h>
-#include <dt-bindings/pwm/pwm.h>
/ {
compatible = "vamrs,rk3288-vmarc-som", "rockchip,rk3288";
- ext_gmac: external-gmac-clock {
- compatible = "fixed-clock";
- clock-frequency = <125000000>;
- clock-output-names = "ext_gmac";
- #clock-cells = <0>;
- };
-
vccio_flash: vccio-flash-regulator {
compatible = "regulator-fixed";
regulator-name = "vccio_flash";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
- startup-delay-us = <150>;
vin-supply = <&vcc_io>;
};
-
- vcc_sys: vsys-regulator {
- compatible = "regulator-fixed";
- regulator-name = "vcc_sys";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- regulator-always-on;
- regulator-boot-on;
- };
};
&emmc {
@@ -45,23 +27,15 @@
non-removable;
pinctrl-names = "default";
pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
+ vmmc-supply = <&vcc_io>;
+ vqmmc-supply = <&vccio_flash>;
status = "okay";
};
&gmac {
assigned-clocks = <&cru SCLK_MAC>;
- assigned-clock-parents = <&ext_gmac>;
- clock_in_out = "input";
- phy-mode = "rgmii";
phy-supply = <&vcc_io>;
- pinctrl-names = "default";
- pinctrl-0 = <&rgmii_pins>;
snps,reset-gpio = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>;
- snps,reset-active-low;
- snps,reset-delays-us = <0 10000 50000>;
- tx_delay = <0x30>;
- rx_delay = <0x10>;
- max-speed = <1000>;
};
&i2c0 {
@@ -80,37 +54,37 @@
#clock-cells = <1>;
clock-output-names = "rk808-clkout1", "rk808-clkout2";
- vcc1-supply = <&vcc_sys>;
- vcc2-supply = <&vcc_sys>;
- vcc3-supply = <&vcc_sys>;
- vcc4-supply = <&vcc_sys>;
- vcc6-supply = <&vcc_sys>;
- vcc7-supply = <&vcc_sys>;
+ vcc1-supply = <&vcc5v0_sys>;
+ vcc2-supply = <&vcc5v0_sys>;
+ vcc3-supply = <&vcc5v0_sys>;
+ vcc4-supply = <&vcc5v0_sys>;
+ vcc6-supply = <&vcc5v0_sys>;
+ vcc7-supply = <&vcc5v0_sys>;
vcc8-supply = <&vcc_io>;
vcc9-supply = <&vcc_io>;
- vcc10-supply = <&vcc_sys>;
- vcc11-supply = <&vcc_sys>;
+ vcc10-supply = <&vcc5v0_sys>;
+ vcc11-supply = <&vcc5v0_sys>;
vcc12-supply = <&vcc_io>;
vddio-supply = <&vcc_io>;
regulators {
vdd_cpu: DCDC_REG1 {
+ regulator-name = "vdd_arm";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <750000>;
regulator-max-microvolt = <1400000>;
- regulator-name = "vdd_arm";
regulator-state-mem {
regulator-off-in-suspend;
};
};
vdd_gpu: DCDC_REG2 {
+ regulator-name = "vdd_gpu";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <850000>;
regulator-max-microvolt = <1250000>;
- regulator-name = "vdd_gpu";
regulator-ramp-delay = <6000>;
regulator-state-mem {
regulator-off-in-suspend;
@@ -118,20 +92,20 @@
};
vcc_ddr: DCDC_REG3 {
+ regulator-name = "vcc_ddr";
regulator-always-on;
regulator-boot-on;
- regulator-name = "vcc_ddr";
regulator-state-mem {
regulator-on-in-suspend;
};
};
vcc_io: DCDC_REG4 {
+ regulator-name = "vcc_io";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
- regulator-name = "vcc_io";
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <3300000>;
@@ -139,22 +113,22 @@
};
vcc_tp: LDO_REG1 {
+ regulator-name = "vcc_tp";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
- regulator-name = "vcc_tp";
regulator-state-mem {
regulator-off-in-suspend;
};
};
vcca_codec: LDO_REG2 {
+ regulator-name = "vcca_codec";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
- regulator-name = "vcca_codec";
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <3300000>;
@@ -162,11 +136,11 @@
};
vdd_10: LDO_REG3 {
+ regulator-name = "vdd_10";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
- regulator-name = "vdd_10";
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <1000000>;
@@ -174,22 +148,22 @@
};
vcc_wl: LDO_REG4 {
+ regulator-name = "vcc_wl";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
- regulator-name = "vcc_wl";
regulator-state-mem {
regulator-on-in-suspend;
};
};
vccio_sd: LDO_REG5 {
+ regulator-name = "vccio_sd";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
- regulator-name = "vccio_sd";
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <3300000>;
@@ -197,22 +171,22 @@
};
vdd10_lcd: LDO_REG6 {
+ regulator-name = "vdd10_lcd";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
- regulator-name = "vdd10_lcd";
regulator-state-mem {
regulator-off-in-suspend;
};
};
vcc_18: LDO_REG7 {
+ regulator-name = "vcc_18";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
- regulator-name = "vcc_18";
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <1800000>;
@@ -220,29 +194,29 @@
};
vcc18_lcd: LDO_REG8 {
+ regulator-name = "vcc18_lcd";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
- regulator-name = "vcc18_lcd";
regulator-state-mem {
regulator-off-in-suspend;
};
};
vcc_sd: SWITCH_REG1 {
+ regulator-name = "vcc_sd";
regulator-always-on;
regulator-boot-on;
- regulator-name = "vcc_sd";
regulator-state-mem {
regulator-off-in-suspend;
};
};
vcc_lcd: SWITCH_REG2 {
+ regulator-name = "vcc_lcd";
regulator-always-on;
regulator-boot-on;
- regulator-name = "vcc_lcd";
regulator-state-mem {
regulator-off-in-suspend;
};
@@ -277,13 +251,11 @@
};
sdmmc_clk: sdmmc-clk {
- rockchip,pins =
- <6 RK_PC4 1 &pcfg_pull_none_drv_8ma>;
+ rockchip,pins = <6 RK_PC4 1 &pcfg_pull_none_drv_8ma>;
};
sdmmc_cmd: sdmmc-cmd {
- rockchip,pins =
- <6 RK_PC5 1 &pcfg_pull_up_drv_8ma>;
+ rockchip,pins = <6 RK_PC5 1 &pcfg_pull_up_drv_8ma>;
};
};
};
diff --git a/arch/arm/dts/rk3399pro-rock-pi-n10.dts b/arch/arm/dts/rk3399pro-rock-pi-n10.dts
index 6ac2d4d721..bf026786fa 100644
--- a/arch/arm/dts/rk3399pro-rock-pi-n10.dts
+++ b/arch/arm/dts/rk3399pro-rock-pi-n10.dts
@@ -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";
+ };
};
diff --git a/arch/arm/dts/rk3399pro-vmarc-som.dtsi b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
index 6fd17e8a81..37ed95d5f7 100644
--- a/arch/arm/dts/rk3399pro-vmarc-som.dtsi
+++ b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
@@ -11,32 +11,6 @@
/ {
compatible = "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro";
-
- clkin_gmac: external-gmac-clock {
- compatible = "fixed-clock";
- clock-frequency = <125000000>;
- clock-output-names = "clkin_gmac";
- #clock-cells = <0>;
- };
-
- vcc12v_dcin: vcc12v-dcin-regulator {
- compatible = "regulator-fixed";
- regulator-name = "vcc12v_dcin";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <12000000>;
- regulator-max-microvolt = <12000000>;
- };
-
- vcc5v0_sys: vcc5v0-sys-regulator {
- compatible = "regulator-fixed";
- regulator-name = "vcc5v0_sys";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- vin-supply = <&vcc12v_dcin>;
- };
};
&cpu_l0 {
@@ -61,23 +35,14 @@
&gmac {
assigned-clocks = <&cru SCLK_RMII_SRC>;
- assigned-clock-parents = <&clkin_gmac>;
- clock_in_out = "input";
phy-supply = <&vcc_lan>;
- phy-mode = "rgmii";
- pinctrl-names = "default";
- pinctrl-0 = <&rgmii_pins>;
snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
- snps,reset-active-low;
- snps,reset-delays-us = <0 10000 50000>;
- tx_delay = <0x28>;
- rx_delay = <0x11>;
};
&i2c0 {
clock-frequency = <400000>;
- i2c-scl-rising-time-ns = <180>;
i2c-scl-falling-time-ns = <30>;
+ i2c-scl-rising-time-ns = <180>;
status = "okay";
rk809: pmic at 20 {
@@ -297,11 +262,48 @@
};
};
+&i2c1 {
+ i2c-scl-falling-time-ns = <30>;
+ i2c-scl-rising-time-ns = <140>;
+ status = "okay";
+};
+
+&i2c2 {
+ clock-frequency = <400000>;
+ status = "okay";
+
+ hym8563: hym8563 at 51 {
+ compatible = "haoyu,hym8563";
+ reg = <0x51>;
+ #clock-cells = <0>;
+ clock-frequency = <32768>;
+ clock-output-names = "hym8563";
+ pinctrl-names = "default";
+ pinctrl-0 = <&hym8563_int>;
+ interrupt-parent = <&gpio4>;
+ interrupts = <RK_PD6 IRQ_TYPE_LEVEL_LOW>;
+ };
+};
+
&io_domains {
status = "okay";
bt656-supply = <&vcca_1v8>;
- sdmmc-supply = <&vccio_sd>;
gpio1830-supply = <&vccio_3v0>;
+ sdmmc-supply = <&vccio_sd>;
+};
+
+&pinctrl {
+ hym8563 {
+ hym8563_int: hym8563-int {
+ rockchip,pins = <4 RK_PD6 0 &pcfg_pull_up>;
+ };
+ };
+
+ pmic {
+ pmic_int_l: pmic-int-l {
+ rockchip,pins = <1 RK_PC2 0 &pcfg_pull_up>;
+ };
+ };
};
&pmu_io_domains {
@@ -323,16 +325,7 @@
};
&tsadc {
- status = "okay";
rockchip,hw-tshut-mode = <1>;
rockchip,hw-tshut-polarity = <1>;
-};
-
-&pinctrl {
- pmic {
- pmic_int_l: pmic-int-l {
- rockchip,pins =
- <1 RK_PC2 0 &pcfg_pull_up>;
- };
- };
+ status = "okay";
};
diff --git a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
index 3e54f38f0a..450e5bb5af 100644
--- a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
+++ b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
@@ -8,36 +8,44 @@
#include <dt-bindings/pwm/pwm.h>
/ {
- chosen {
- stdout-path = "serial2:1500000n8";
+ clkin_gmac: external-gmac-clock {
+ compatible = "fixed-clock";
+ clock-frequency = <125000000>;
+ clock-output-names = "clkin_gmac";
+ #clock-cells = <0>;
};
-};
-&gmac {
- status = "okay";
-};
+ vcc12v_dcin: vcc12v-dcin-regulator {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc12v_dcin";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <12000000>;
+ regulator-max-microvolt = <12000000>;
+ };
-&i2c1 {
- status = "okay";
- i2c-scl-rising-time-ns = <140>;
- i2c-scl-falling-time-ns = <30>;
+ vcc5v0_sys: vcc5v0-sys-regulator {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc5v0_sys";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ vin-supply = <&vcc12v_dcin>;
+ };
};
-&i2c2 {
+&gmac {
+ assigned-clock-parents = <&clkin_gmac>;
+ clock_in_out = "input";
+ phy-mode = "rgmii";
+ pinctrl-names = "default";
+ pinctrl-0 = <&rgmii_pins>;
+ snps,reset-active-low;
+ snps,reset-delays-us = <0 10000 50000>;
+ tx_delay = <0x28>;
+ rx_delay = <0x11>;
status = "okay";
- clock-frequency = <400000>;
-
- hym8563: hym8563 at 51 {
- compatible = "haoyu,hym8563";
- reg = <0x51>;
- #clock-cells = <0>;
- clock-frequency = <32768>;
- clock-output-names = "hym8563";
- pinctrl-names = "default";
- pinctrl-0 = <&hym8563_int>;
- interrupt-parent = <&gpio4>;
- interrupts = <30 IRQ_TYPE_LEVEL_LOW>;
- };
};
&pwm0 {
@@ -68,12 +76,3 @@
&uart2 {
status = "okay";
};
-
-&pinctrl {
- hym8563 {
- hym8563_int: hym8563-int {
- rockchip,pins =
- <4 RK_PD6 0 &pcfg_pull_up>;
- };
- };
-};
--
2.25.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 02/12] arm: dts: rockchip: Sync rk3288 dtsi from linux
2020-07-21 15:24 ` Jagan Teki
@ 2020-07-21 15:24 ` Jagan Teki
-1 siblings, 0 replies; 36+ messages in thread
From: Jagan Teki @ 2020-07-21 15:24 UTC (permalink / raw
To: Kever Yang, Philipp Tomsich, Simon Glass
Cc: Suniel Mahesh, U-Boot-Denx, linux-rockchip, linux-amarula,
Jagan Teki
From: Suniel Mahesh <sunil@amarulasolutions.com>
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)
Signed-off-by: Suniel Mahesh <sunil@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang<kever.yang@rock-chips.com>
---
Changes for v2:
- collect kerver r-b
arch/arm/dts/rk3288.dtsi | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi
index 866fc08215..18b372db3a 100644
--- a/arch/arm/dts/rk3288.dtsi
+++ b/arch/arm/dts/rk3288.dtsi
@@ -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;
};
--
2.25.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 02/12] arm: dts: rockchip: Sync rk3288 dtsi from linux
@ 2020-07-21 15:24 ` Jagan Teki
0 siblings, 0 replies; 36+ messages in thread
From: Jagan Teki @ 2020-07-21 15:24 UTC (permalink / raw
To: u-boot
From: Suniel Mahesh <sunil@amarulasolutions.com>
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)
Signed-off-by: Suniel Mahesh <sunil@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang<kever.yang@rock-chips.com>
---
Changes for v2:
- collect kerver r-b
arch/arm/dts/rk3288.dtsi | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi
index 866fc08215..18b372db3a 100644
--- a/arch/arm/dts/rk3288.dtsi
+++ b/arch/arm/dts/rk3288.dtsi
@@ -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;
};
--
2.25.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 03/12] ARM: dts: rockchip: Add usb host0 ohci node for rk3288
2020-07-21 15:24 ` Jagan Teki
@ 2020-07-21 15:24 ` Jagan Teki
-1 siblings, 0 replies; 36+ messages in thread
From: Jagan Teki @ 2020-07-21 15:24 UTC (permalink / raw
To: Kever Yang, Philipp Tomsich, Simon Glass
Cc: Suniel Mahesh, U-Boot-Denx, linux-rockchip, linux-amarula,
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.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- none
arch/arm/dts/rk3288.dtsi | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi
index 18b372db3a..22bb06cec5 100644
--- a/arch/arm/dts/rk3288.dtsi
+++ b/arch/arm/dts/rk3288.dtsi
@@ -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",
--
2.25.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 03/12] ARM: dts: rockchip: Add usb host0 ohci node for rk3288
@ 2020-07-21 15:24 ` Jagan Teki
0 siblings, 0 replies; 36+ messages in thread
From: Jagan Teki @ 2020-07-21 15:24 UTC (permalink / raw
To: u-boot
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.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- none
arch/arm/dts/rk3288.dtsi | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi
index 18b372db3a..22bb06cec5 100644
--- a/arch/arm/dts/rk3288.dtsi
+++ b/arch/arm/dts/rk3288.dtsi
@@ -431,7 +431,16 @@
status = "disabled";
};
- /* NOTE: ohci at ff520000 doesn't actually work on hardware */
+ /* NOTE: doesn't work on RK3288, but fixed on RK3288W */
+ usb_host0_ohci: usb at 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 at ff540000 {
compatible = "rockchip,rk3288-usb", "rockchip,rk3066-usb",
--
2.25.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 04/12] ARM: dts: rockchip: Add USB for RockPI N8/N10
2020-07-21 15:24 ` Jagan Teki
@ 2020-07-21 15:24 ` Jagan Teki
-1 siblings, 0 replies; 36+ messages in thread
From: Jagan Teki @ 2020-07-21 15:24 UTC (permalink / raw
To: Kever Yang, Philipp Tomsich, Simon Glass
Cc: Suniel Mahesh, U-Boot-Denx, linux-rockchip, linux-amarula,
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.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
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(+)
diff --git a/arch/arm/dts/rk3288-vmarc-som.dtsi b/arch/arm/dts/rk3288-vmarc-som.dtsi
index 7a9fd40e5b..72a503e50d 100644
--- a/arch/arm/dts/rk3288-vmarc-som.dtsi
+++ b/arch/arm/dts/rk3288-vmarc-som.dtsi
@@ -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# */
};
diff --git a/arch/arm/dts/rk3399pro-vmarc-som.dtsi b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
index 37ed95d5f7..111d6cf9a4 100644
--- a/arch/arm/dts/rk3399pro-vmarc-som.dtsi
+++ b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
@@ -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>;
+};
diff --git a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
index 450e5bb5af..d2b6ead148 100644
--- a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
+++ b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
@@ -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 {
--
2.25.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 04/12] ARM: dts: rockchip: Add USB for RockPI N8/N10
@ 2020-07-21 15:24 ` Jagan Teki
0 siblings, 0 replies; 36+ messages in thread
From: Jagan Teki @ 2020-07-21 15:24 UTC (permalink / raw
To: u-boot
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.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
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(+)
diff --git a/arch/arm/dts/rk3288-vmarc-som.dtsi b/arch/arm/dts/rk3288-vmarc-som.dtsi
index 7a9fd40e5b..72a503e50d 100644
--- a/arch/arm/dts/rk3288-vmarc-som.dtsi
+++ b/arch/arm/dts/rk3288-vmarc-som.dtsi
@@ -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# */
};
diff --git a/arch/arm/dts/rk3399pro-vmarc-som.dtsi b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
index 37ed95d5f7..111d6cf9a4 100644
--- a/arch/arm/dts/rk3399pro-vmarc-som.dtsi
+++ b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
@@ -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>;
+};
diff --git a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
index 450e5bb5af..d2b6ead148 100644
--- a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
+++ b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
@@ -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 {
--
2.25.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 05/12] arm: dts: rockchip: Add HDMI out for RockPI N8/N10
2020-07-21 15:24 ` Jagan Teki
@ 2020-07-21 15:24 ` Jagan Teki
-1 siblings, 0 replies; 36+ messages in thread
From: Jagan Teki @ 2020-07-21 15:24 UTC (permalink / raw
To: Kever Yang, Philipp Tomsich, Simon Glass
Cc: Suniel Mahesh, U-Boot-Denx, linux-rockchip, linux-amarula,
Jagan Teki
This patch adds support to enable HDMI out for
N10 and N8 combinations SBCs.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
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(+)
diff --git a/arch/arm/dts/rk3288-vmarc-som.dtsi b/arch/arm/dts/rk3288-vmarc-som.dtsi
index 72a503e50d..717cb3dc81 100644
--- a/arch/arm/dts/rk3288-vmarc-som.dtsi
+++ b/arch/arm/dts/rk3288-vmarc-som.dtsi
@@ -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>;
diff --git a/arch/arm/dts/rk3399pro-vmarc-som.dtsi b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
index 111d6cf9a4..ebccc4a153 100644
--- a/arch/arm/dts/rk3399pro-vmarc-som.dtsi
+++ b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
@@ -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>;
diff --git a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
index d2b6ead148..26b53eac47 100644
--- a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
+++ b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
@@ -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";
+};
--
2.25.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 05/12] arm: dts: rockchip: Add HDMI out for RockPI N8/N10
@ 2020-07-21 15:24 ` Jagan Teki
0 siblings, 0 replies; 36+ messages in thread
From: Jagan Teki @ 2020-07-21 15:24 UTC (permalink / raw
To: u-boot
This patch adds support to enable HDMI out for
N10 and N8 combinations SBCs.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
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(+)
diff --git a/arch/arm/dts/rk3288-vmarc-som.dtsi b/arch/arm/dts/rk3288-vmarc-som.dtsi
index 72a503e50d..717cb3dc81 100644
--- a/arch/arm/dts/rk3288-vmarc-som.dtsi
+++ b/arch/arm/dts/rk3288-vmarc-som.dtsi
@@ -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>;
diff --git a/arch/arm/dts/rk3399pro-vmarc-som.dtsi b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
index 111d6cf9a4..ebccc4a153 100644
--- a/arch/arm/dts/rk3399pro-vmarc-som.dtsi
+++ b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
@@ -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>;
diff --git a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
index d2b6ead148..26b53eac47 100644
--- a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
+++ b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
@@ -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";
+};
--
2.25.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 06/12] arm64: dts: rockchip: Add PCIe for RockPI N10
2020-07-21 15:24 ` Jagan Teki
@ 2020-07-21 15:24 ` Jagan Teki
-1 siblings, 0 replies; 36+ messages in thread
From: Jagan Teki @ 2020-07-21 15:24 UTC (permalink / raw
To: Kever Yang, Philipp Tomsich, Simon Glass
Cc: Suniel Mahesh, U-Boot-Denx, linux-rockchip, linux-amarula,
Jagan Teki
This patch adds support to enable PCIe for RockPI N10.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- none
arch/arm/dts/rk3399pro-vmarc-som.dtsi | 40 +++++++++++++++++++++++++--
1 file changed, 38 insertions(+), 2 deletions(-)
diff --git a/arch/arm/dts/rk3399pro-vmarc-som.dtsi b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
index ebccc4a153..5d087be04a 100644
--- a/arch/arm/dts/rk3399pro-vmarc-som.dtsi
+++ b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
@@ -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>;
--
2.25.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 06/12] arm64: dts: rockchip: Add PCIe for RockPI N10
@ 2020-07-21 15:24 ` Jagan Teki
0 siblings, 0 replies; 36+ messages in thread
From: Jagan Teki @ 2020-07-21 15:24 UTC (permalink / raw
To: u-boot
This patch adds support to enable PCIe for RockPI N10.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- none
arch/arm/dts/rk3399pro-vmarc-som.dtsi | 40 +++++++++++++++++++++++++--
1 file changed, 38 insertions(+), 2 deletions(-)
diff --git a/arch/arm/dts/rk3399pro-vmarc-som.dtsi b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
index ebccc4a153..5d087be04a 100644
--- a/arch/arm/dts/rk3399pro-vmarc-som.dtsi
+++ b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
@@ -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>;
--
2.25.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 07/12] rockchip: rock-pi-n10: Enable on board devices
2020-07-21 15:24 ` Jagan Teki
@ 2020-07-21 15:24 ` Jagan Teki
-1 siblings, 0 replies; 36+ messages in thread
From: Jagan Teki @ 2020-07-21 15:24 UTC (permalink / raw
To: Kever Yang, Philipp Tomsich, Simon Glass
Cc: Suniel Mahesh, U-Boot-Denx, linux-rockchip, linux-amarula,
Jagan Teki
From: Suniel Mahesh <sunil@amarulasolutions.com>
Enable common on board devices for ROCKPi N10.
- USB 2.0 Host
- USB 3.0 Host
- USB 3.0 Gadget
- HDMI Out
Signed-off-by: Suniel Mahesh <sunil@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- squash common device enablement
configs/rock-pi-n10-rk3399pro_defconfig | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/configs/rock-pi-n10-rk3399pro_defconfig b/configs/rock-pi-n10-rk3399pro_defconfig
index c705ce01ce..895820fbe6 100644
--- a/configs/rock-pi-n10-rk3399pro_defconfig
+++ b/configs/rock-pi-n10-rk3399pro_defconfig
@@ -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
--
2.25.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 07/12] rockchip: rock-pi-n10: Enable on board devices
@ 2020-07-21 15:24 ` Jagan Teki
0 siblings, 0 replies; 36+ messages in thread
From: Jagan Teki @ 2020-07-21 15:24 UTC (permalink / raw
To: u-boot
From: Suniel Mahesh <sunil@amarulasolutions.com>
Enable common on board devices for ROCKPi N10.
- USB 2.0 Host
- USB 3.0 Host
- USB 3.0 Gadget
- HDMI Out
Signed-off-by: Suniel Mahesh <sunil@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- squash common device enablement
configs/rock-pi-n10-rk3399pro_defconfig | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/configs/rock-pi-n10-rk3399pro_defconfig b/configs/rock-pi-n10-rk3399pro_defconfig
index c705ce01ce..895820fbe6 100644
--- a/configs/rock-pi-n10-rk3399pro_defconfig
+++ b/configs/rock-pi-n10-rk3399pro_defconfig
@@ -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
--
2.25.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 08/12] rockchip: evb_rk3288: Add console settings
2020-07-21 15:24 ` Jagan Teki
@ 2020-07-21 15:24 ` Jagan Teki
-1 siblings, 0 replies; 36+ messages in thread
From: Jagan Teki @ 2020-07-21 15:24 UTC (permalink / raw
To: Kever Yang, Philipp Tomsich, Simon Glass
Cc: Suniel Mahesh, U-Boot-Denx, linux-rockchip, linux-amarula,
Jagan Teki
From: Suniel Mahesh <sunil@amarulasolutions.com>
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.
Signed-off-by: Suniel Mahesh <sunil@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- update commit messaage
include/configs/evb_rk3288.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/include/configs/evb_rk3288.h b/include/configs/evb_rk3288.h
index ddd7012c8f..e19fa90212 100644
--- a/include/configs/evb_rk3288.h
+++ b/include/configs/evb_rk3288.h
@@ -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
--
2.25.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 08/12] rockchip: evb_rk3288: Add console settings
@ 2020-07-21 15:24 ` Jagan Teki
0 siblings, 0 replies; 36+ messages in thread
From: Jagan Teki @ 2020-07-21 15:24 UTC (permalink / raw
To: u-boot
From: Suniel Mahesh <sunil@amarulasolutions.com>
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.
Signed-off-by: Suniel Mahesh <sunil@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- update commit messaage
include/configs/evb_rk3288.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/include/configs/evb_rk3288.h b/include/configs/evb_rk3288.h
index ddd7012c8f..e19fa90212 100644
--- a/include/configs/evb_rk3288.h
+++ b/include/configs/evb_rk3288.h
@@ -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
--
2.25.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 09/12] rockchip: rock-pi-n8: Enable on board devices
2020-07-21 15:24 ` Jagan Teki
@ 2020-07-21 15:24 ` Jagan Teki
-1 siblings, 0 replies; 36+ messages in thread
From: Jagan Teki @ 2020-07-21 15:24 UTC (permalink / raw
To: Kever Yang, Philipp Tomsich, Simon Glass
Cc: Suniel Mahesh, U-Boot-Denx, linux-rockchip, linux-amarula,
Jagan Teki
From: Suniel Mahesh <sunil@amarulasolutions.com>
Enable common on board devices for ROCKPi N8.
- USB 2.0 Host
- USB 2.0 OTG/Gadget
- HDMI Out
Signed-off-by: Suniel Mahesh <sunil@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- squash common device enablement
configs/rock-pi-n8-rk3288_defconfig | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/configs/rock-pi-n8-rk3288_defconfig b/configs/rock-pi-n8-rk3288_defconfig
index 6b31e19eda..d218852d79 100644
--- a/configs/rock-pi-n8-rk3288_defconfig
+++ b/configs/rock-pi-n8-rk3288_defconfig
@@ -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
--
2.25.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 09/12] rockchip: rock-pi-n8: Enable on board devices
@ 2020-07-21 15:24 ` Jagan Teki
0 siblings, 0 replies; 36+ messages in thread
From: Jagan Teki @ 2020-07-21 15:24 UTC (permalink / raw
To: u-boot
From: Suniel Mahesh <sunil@amarulasolutions.com>
Enable common on board devices for ROCKPi N8.
- USB 2.0 Host
- USB 2.0 OTG/Gadget
- HDMI Out
Signed-off-by: Suniel Mahesh <sunil@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- squash common device enablement
configs/rock-pi-n8-rk3288_defconfig | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/configs/rock-pi-n8-rk3288_defconfig b/configs/rock-pi-n8-rk3288_defconfig
index 6b31e19eda..d218852d79 100644
--- a/configs/rock-pi-n8-rk3288_defconfig
+++ b/configs/rock-pi-n8-rk3288_defconfig
@@ -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
--
2.25.1
^ permalink raw reply related [flat|nested] 36+ messages in thread
* Re: [PATCH v2 03/12] ARM: dts: rockchip: Add usb host0 ohci node for rk3288
2020-07-21 15:24 ` Jagan Teki
@ 2020-07-22 12:28 ` Kever Yang
-1 siblings, 0 replies; 36+ messages in thread
From: Kever Yang @ 2020-07-22 12:28 UTC (permalink / raw
To: Jagan Teki, Philipp Tomsich, Simon Glass
Cc: Suniel Mahesh, U-Boot-Denx, linux-rockchip, linux-amarula
On 2020/7/21 下午11:24, Jagan Teki wrote:
> 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.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> Changes for v2:
> - none
>
> arch/arm/dts/rk3288.dtsi | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi
> index 18b372db3a..22bb06cec5 100644
> --- a/arch/arm/dts/rk3288.dtsi
> +++ b/arch/arm/dts/rk3288.dtsi
> @@ -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",
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 03/12] ARM: dts: rockchip: Add usb host0 ohci node for rk3288
@ 2020-07-22 12:28 ` Kever Yang
0 siblings, 0 replies; 36+ messages in thread
From: Kever Yang @ 2020-07-22 12:28 UTC (permalink / raw
To: u-boot
On 2020/7/21 ??11:24, Jagan Teki wrote:
> 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.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> Changes for v2:
> - none
>
> arch/arm/dts/rk3288.dtsi | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi
> index 18b372db3a..22bb06cec5 100644
> --- a/arch/arm/dts/rk3288.dtsi
> +++ b/arch/arm/dts/rk3288.dtsi
> @@ -431,7 +431,16 @@
> status = "disabled";
> };
>
> - /* NOTE: ohci at ff520000 doesn't actually work on hardware */
> + /* NOTE: doesn't work on RK3288, but fixed on RK3288W */
> + usb_host0_ohci: usb at 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 at ff540000 {
> compatible = "rockchip,rk3288-usb", "rockchip,rk3066-usb",
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 04/12] ARM: dts: rockchip: Add USB for RockPI N8/N10
2020-07-21 15:24 ` Jagan Teki
@ 2020-07-22 12:29 ` Kever Yang
-1 siblings, 0 replies; 36+ messages in thread
From: Kever Yang @ 2020-07-22 12:29 UTC (permalink / raw
To: Jagan Teki, Philipp Tomsich, Simon Glass
Cc: Suniel Mahesh, U-Boot-Denx, linux-rockchip, linux-amarula
On 2020/7/21 下午11:24, Jagan Teki wrote:
> 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.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> 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(+)
>
> diff --git a/arch/arm/dts/rk3288-vmarc-som.dtsi b/arch/arm/dts/rk3288-vmarc-som.dtsi
> index 7a9fd40e5b..72a503e50d 100644
> --- a/arch/arm/dts/rk3288-vmarc-som.dtsi
> +++ b/arch/arm/dts/rk3288-vmarc-som.dtsi
> @@ -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# */
> };
> diff --git a/arch/arm/dts/rk3399pro-vmarc-som.dtsi b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
> index 37ed95d5f7..111d6cf9a4 100644
> --- a/arch/arm/dts/rk3399pro-vmarc-som.dtsi
> +++ b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
> @@ -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>;
> +};
> diff --git a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
> index 450e5bb5af..d2b6ead148 100644
> --- a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
> +++ b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
> @@ -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 {
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 04/12] ARM: dts: rockchip: Add USB for RockPI N8/N10
@ 2020-07-22 12:29 ` Kever Yang
0 siblings, 0 replies; 36+ messages in thread
From: Kever Yang @ 2020-07-22 12:29 UTC (permalink / raw
To: u-boot
On 2020/7/21 ??11:24, Jagan Teki wrote:
> 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.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> 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(+)
>
> diff --git a/arch/arm/dts/rk3288-vmarc-som.dtsi b/arch/arm/dts/rk3288-vmarc-som.dtsi
> index 7a9fd40e5b..72a503e50d 100644
> --- a/arch/arm/dts/rk3288-vmarc-som.dtsi
> +++ b/arch/arm/dts/rk3288-vmarc-som.dtsi
> @@ -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# */
> };
> diff --git a/arch/arm/dts/rk3399pro-vmarc-som.dtsi b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
> index 37ed95d5f7..111d6cf9a4 100644
> --- a/arch/arm/dts/rk3399pro-vmarc-som.dtsi
> +++ b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
> @@ -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>;
> +};
> diff --git a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
> index 450e5bb5af..d2b6ead148 100644
> --- a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
> +++ b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
> @@ -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 {
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 05/12] arm: dts: rockchip: Add HDMI out for RockPI N8/N10
2020-07-21 15:24 ` Jagan Teki
@ 2020-07-22 12:29 ` Kever Yang
-1 siblings, 0 replies; 36+ messages in thread
From: Kever Yang @ 2020-07-22 12:29 UTC (permalink / raw
To: Jagan Teki, Philipp Tomsich, Simon Glass
Cc: Suniel Mahesh, U-Boot-Denx, linux-rockchip, linux-amarula
On 2020/7/21 下午11:24, Jagan Teki wrote:
> This patch adds support to enable HDMI out for
> N10 and N8 combinations SBCs.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> 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(+)
>
> diff --git a/arch/arm/dts/rk3288-vmarc-som.dtsi b/arch/arm/dts/rk3288-vmarc-som.dtsi
> index 72a503e50d..717cb3dc81 100644
> --- a/arch/arm/dts/rk3288-vmarc-som.dtsi
> +++ b/arch/arm/dts/rk3288-vmarc-som.dtsi
> @@ -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>;
> diff --git a/arch/arm/dts/rk3399pro-vmarc-som.dtsi b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
> index 111d6cf9a4..ebccc4a153 100644
> --- a/arch/arm/dts/rk3399pro-vmarc-som.dtsi
> +++ b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
> @@ -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>;
> diff --git a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
> index d2b6ead148..26b53eac47 100644
> --- a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
> +++ b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
> @@ -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";
> +};
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 05/12] arm: dts: rockchip: Add HDMI out for RockPI N8/N10
@ 2020-07-22 12:29 ` Kever Yang
0 siblings, 0 replies; 36+ messages in thread
From: Kever Yang @ 2020-07-22 12:29 UTC (permalink / raw
To: u-boot
On 2020/7/21 ??11:24, Jagan Teki wrote:
> This patch adds support to enable HDMI out for
> N10 and N8 combinations SBCs.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> 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(+)
>
> diff --git a/arch/arm/dts/rk3288-vmarc-som.dtsi b/arch/arm/dts/rk3288-vmarc-som.dtsi
> index 72a503e50d..717cb3dc81 100644
> --- a/arch/arm/dts/rk3288-vmarc-som.dtsi
> +++ b/arch/arm/dts/rk3288-vmarc-som.dtsi
> @@ -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>;
> diff --git a/arch/arm/dts/rk3399pro-vmarc-som.dtsi b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
> index 111d6cf9a4..ebccc4a153 100644
> --- a/arch/arm/dts/rk3399pro-vmarc-som.dtsi
> +++ b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
> @@ -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>;
> diff --git a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
> index d2b6ead148..26b53eac47 100644
> --- a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
> +++ b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi
> @@ -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";
> +};
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 06/12] arm64: dts: rockchip: Add PCIe for RockPI N10
2020-07-21 15:24 ` Jagan Teki
@ 2020-07-22 12:29 ` Kever Yang
-1 siblings, 0 replies; 36+ messages in thread
From: Kever Yang @ 2020-07-22 12:29 UTC (permalink / raw
To: Jagan Teki, Philipp Tomsich, Simon Glass
Cc: Suniel Mahesh, U-Boot-Denx, linux-rockchip, linux-amarula
On 2020/7/21 下午11:24, Jagan Teki wrote:
> This patch adds support to enable PCIe for RockPI N10.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> Changes for v2:
> - none
>
> arch/arm/dts/rk3399pro-vmarc-som.dtsi | 40 +++++++++++++++++++++++++--
> 1 file changed, 38 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/dts/rk3399pro-vmarc-som.dtsi b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
> index ebccc4a153..5d087be04a 100644
> --- a/arch/arm/dts/rk3399pro-vmarc-som.dtsi
> +++ b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
> @@ -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>;
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 06/12] arm64: dts: rockchip: Add PCIe for RockPI N10
@ 2020-07-22 12:29 ` Kever Yang
0 siblings, 0 replies; 36+ messages in thread
From: Kever Yang @ 2020-07-22 12:29 UTC (permalink / raw
To: u-boot
On 2020/7/21 ??11:24, Jagan Teki wrote:
> This patch adds support to enable PCIe for RockPI N10.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> Changes for v2:
> - none
>
> arch/arm/dts/rk3399pro-vmarc-som.dtsi | 40 +++++++++++++++++++++++++--
> 1 file changed, 38 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/dts/rk3399pro-vmarc-som.dtsi b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
> index ebccc4a153..5d087be04a 100644
> --- a/arch/arm/dts/rk3399pro-vmarc-som.dtsi
> +++ b/arch/arm/dts/rk3399pro-vmarc-som.dtsi
> @@ -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>;
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 07/12] rockchip: rock-pi-n10: Enable on board devices
2020-07-21 15:24 ` Jagan Teki
@ 2020-07-22 12:29 ` Kever Yang
-1 siblings, 0 replies; 36+ messages in thread
From: Kever Yang @ 2020-07-22 12:29 UTC (permalink / raw
To: Jagan Teki, Philipp Tomsich, Simon Glass
Cc: Suniel Mahesh, U-Boot-Denx, linux-rockchip, linux-amarula
On 2020/7/21 下午11:24, Jagan Teki wrote:
> From: Suniel Mahesh <sunil@amarulasolutions.com>
>
> Enable common on board devices for ROCKPi N10.
>
> - USB 2.0 Host
> - USB 3.0 Host
> - USB 3.0 Gadget
> - HDMI Out
>
> Signed-off-by: Suniel Mahesh <sunil@amarulasolutions.com>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> Changes for v2:
> - squash common device enablement
>
> configs/rock-pi-n10-rk3399pro_defconfig | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
> diff --git a/configs/rock-pi-n10-rk3399pro_defconfig b/configs/rock-pi-n10-rk3399pro_defconfig
> index c705ce01ce..895820fbe6 100644
> --- a/configs/rock-pi-n10-rk3399pro_defconfig
> +++ b/configs/rock-pi-n10-rk3399pro_defconfig
> @@ -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
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 07/12] rockchip: rock-pi-n10: Enable on board devices
@ 2020-07-22 12:29 ` Kever Yang
0 siblings, 0 replies; 36+ messages in thread
From: Kever Yang @ 2020-07-22 12:29 UTC (permalink / raw
To: u-boot
On 2020/7/21 ??11:24, Jagan Teki wrote:
> From: Suniel Mahesh <sunil@amarulasolutions.com>
>
> Enable common on board devices for ROCKPi N10.
>
> - USB 2.0 Host
> - USB 3.0 Host
> - USB 3.0 Gadget
> - HDMI Out
>
> Signed-off-by: Suniel Mahesh <sunil@amarulasolutions.com>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> Changes for v2:
> - squash common device enablement
>
> configs/rock-pi-n10-rk3399pro_defconfig | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
> diff --git a/configs/rock-pi-n10-rk3399pro_defconfig b/configs/rock-pi-n10-rk3399pro_defconfig
> index c705ce01ce..895820fbe6 100644
> --- a/configs/rock-pi-n10-rk3399pro_defconfig
> +++ b/configs/rock-pi-n10-rk3399pro_defconfig
> @@ -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
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 08/12] rockchip: evb_rk3288: Add console settings
2020-07-21 15:24 ` Jagan Teki
@ 2020-07-22 12:30 ` Kever Yang
-1 siblings, 0 replies; 36+ messages in thread
From: Kever Yang @ 2020-07-22 12:30 UTC (permalink / raw
To: Jagan Teki, Philipp Tomsich, Simon Glass
Cc: Suniel Mahesh, U-Boot-Denx, linux-rockchip, linux-amarula
On 2020/7/21 下午11:24, Jagan Teki wrote:
> From: Suniel Mahesh <sunil@amarulasolutions.com>
>
> 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.
>
> Signed-off-by: Suniel Mahesh <sunil@amarulasolutions.com>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> Changes for v2:
> - update commit messaage
>
> include/configs/evb_rk3288.h | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/include/configs/evb_rk3288.h b/include/configs/evb_rk3288.h
> index ddd7012c8f..e19fa90212 100644
> --- a/include/configs/evb_rk3288.h
> +++ b/include/configs/evb_rk3288.h
> @@ -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
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 08/12] rockchip: evb_rk3288: Add console settings
@ 2020-07-22 12:30 ` Kever Yang
0 siblings, 0 replies; 36+ messages in thread
From: Kever Yang @ 2020-07-22 12:30 UTC (permalink / raw
To: u-boot
On 2020/7/21 ??11:24, Jagan Teki wrote:
> From: Suniel Mahesh <sunil@amarulasolutions.com>
>
> 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.
>
> Signed-off-by: Suniel Mahesh <sunil@amarulasolutions.com>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> Changes for v2:
> - update commit messaage
>
> include/configs/evb_rk3288.h | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/include/configs/evb_rk3288.h b/include/configs/evb_rk3288.h
> index ddd7012c8f..e19fa90212 100644
> --- a/include/configs/evb_rk3288.h
> +++ b/include/configs/evb_rk3288.h
> @@ -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
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 09/12] rockchip: rock-pi-n8: Enable on board devices
2020-07-21 15:24 ` Jagan Teki
@ 2020-07-22 12:30 ` Kever Yang
-1 siblings, 0 replies; 36+ messages in thread
From: Kever Yang @ 2020-07-22 12:30 UTC (permalink / raw
To: Jagan Teki, Philipp Tomsich, Simon Glass
Cc: Suniel Mahesh, U-Boot-Denx, linux-rockchip, linux-amarula
On 2020/7/21 下午11:24, Jagan Teki wrote:
> From: Suniel Mahesh <sunil@amarulasolutions.com>
>
> Enable common on board devices for ROCKPi N8.
>
> - USB 2.0 Host
> - USB 2.0 OTG/Gadget
> - HDMI Out
>
> Signed-off-by: Suniel Mahesh <sunil@amarulasolutions.com>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> Changes for v2:
> - squash common device enablement
>
> configs/rock-pi-n8-rk3288_defconfig | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
> diff --git a/configs/rock-pi-n8-rk3288_defconfig b/configs/rock-pi-n8-rk3288_defconfig
> index 6b31e19eda..d218852d79 100644
> --- a/configs/rock-pi-n8-rk3288_defconfig
> +++ b/configs/rock-pi-n8-rk3288_defconfig
> @@ -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
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 09/12] rockchip: rock-pi-n8: Enable on board devices
@ 2020-07-22 12:30 ` Kever Yang
0 siblings, 0 replies; 36+ messages in thread
From: Kever Yang @ 2020-07-22 12:30 UTC (permalink / raw
To: u-boot
On 2020/7/21 ??11:24, Jagan Teki wrote:
> From: Suniel Mahesh <sunil@amarulasolutions.com>
>
> Enable common on board devices for ROCKPi N8.
>
> - USB 2.0 Host
> - USB 2.0 OTG/Gadget
> - HDMI Out
>
> Signed-off-by: Suniel Mahesh <sunil@amarulasolutions.com>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> Changes for v2:
> - squash common device enablement
>
> configs/rock-pi-n8-rk3288_defconfig | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
> diff --git a/configs/rock-pi-n8-rk3288_defconfig b/configs/rock-pi-n8-rk3288_defconfig
> index 6b31e19eda..d218852d79 100644
> --- a/configs/rock-pi-n8-rk3288_defconfig
> +++ b/configs/rock-pi-n8-rk3288_defconfig
> @@ -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
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 00/12] rockchip: ROCKPi N8/N10 hardware enablement
2020-07-21 15:24 ` Jagan Teki
@ 2020-07-22 13:10 ` Kever Yang
-1 siblings, 0 replies; 36+ messages in thread
From: Kever Yang @ 2020-07-22 13:10 UTC (permalink / raw
To: Jagan Teki, Philipp Tomsich, Simon Glass
Cc: Suniel Mahesh, U-Boot-Denx, linux-rockchip, linux-amarula
On 2020/7/21 下午11:24, Jagan Teki wrote:
> 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(-)
>
Applied to u-boot-rockchip master for this patch set, thanks.
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 00/12] rockchip: ROCKPi N8/N10 hardware enablement
@ 2020-07-22 13:10 ` Kever Yang
0 siblings, 0 replies; 36+ messages in thread
From: Kever Yang @ 2020-07-22 13:10 UTC (permalink / raw
To: u-boot
On 2020/7/21 ??11:24, Jagan Teki wrote:
> 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(-)
>
Applied to u-boot-rockchip master for this patch set, thanks.
^ permalink raw reply [flat|nested] 36+ messages in thread
end of thread, other threads:[~2020-07-22 13:10 UTC | newest]
Thread overview: 36+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-21 15:24 [PATCH v2 00/12] rockchip: ROCKPi N8/N10 hardware enablement Jagan Teki
2020-07-21 15:24 ` Jagan Teki
2020-07-21 15:24 ` [PATCH v2 01/12] ARM: dts: rockchip: Sync ROCKPi N8/N10 dts(i) from Linux Jagan Teki
2020-07-21 15:24 ` Jagan Teki
2020-07-21 15:24 ` [PATCH v2 02/12] arm: dts: rockchip: Sync rk3288 dtsi from linux Jagan Teki
2020-07-21 15:24 ` Jagan Teki
2020-07-21 15:24 ` [PATCH v2 03/12] ARM: dts: rockchip: Add usb host0 ohci node for rk3288 Jagan Teki
2020-07-21 15:24 ` Jagan Teki
2020-07-22 12:28 ` Kever Yang
2020-07-22 12:28 ` Kever Yang
2020-07-21 15:24 ` [PATCH v2 04/12] ARM: dts: rockchip: Add USB for RockPI N8/N10 Jagan Teki
2020-07-21 15:24 ` Jagan Teki
2020-07-22 12:29 ` Kever Yang
2020-07-22 12:29 ` Kever Yang
2020-07-21 15:24 ` [PATCH v2 05/12] arm: dts: rockchip: Add HDMI out " Jagan Teki
2020-07-21 15:24 ` Jagan Teki
2020-07-22 12:29 ` Kever Yang
2020-07-22 12:29 ` Kever Yang
2020-07-21 15:24 ` [PATCH v2 06/12] arm64: dts: rockchip: Add PCIe for RockPI N10 Jagan Teki
2020-07-21 15:24 ` Jagan Teki
2020-07-22 12:29 ` Kever Yang
2020-07-22 12:29 ` Kever Yang
2020-07-21 15:24 ` [PATCH v2 07/12] rockchip: rock-pi-n10: Enable on board devices Jagan Teki
2020-07-21 15:24 ` Jagan Teki
2020-07-22 12:29 ` Kever Yang
2020-07-22 12:29 ` Kever Yang
2020-07-21 15:24 ` [PATCH v2 08/12] rockchip: evb_rk3288: Add console settings Jagan Teki
2020-07-21 15:24 ` Jagan Teki
2020-07-22 12:30 ` Kever Yang
2020-07-22 12:30 ` Kever Yang
2020-07-21 15:24 ` [PATCH v2 09/12] rockchip: rock-pi-n8: Enable on board devices Jagan Teki
2020-07-21 15:24 ` Jagan Teki
2020-07-22 12:30 ` Kever Yang
2020-07-22 12:30 ` Kever Yang
2020-07-22 13:10 ` [PATCH v2 00/12] rockchip: ROCKPi N8/N10 hardware enablement Kever Yang
2020-07-22 13:10 ` Kever Yang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.