Skip to contentSkip to conversation

rockchip: rock-pi-n10: Enable PCI/NVME

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

Subsystems (2)
lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH v2 10/12 rockchip: rock-pi-n10: Enable PCI/NVME

Enable PCI/NVME for M.2 Slot on RockPI-4 boards.

=> nvme info
Device 0: Vendor: 0x144d Rev: 4L1QCXB7 Prod: S35FNX0J623292
Type: Hard Disk
Capacity: 122104.3 MB = 119.2 GB (250069680 x 512)

---
Changes for v2:
- none

 configs/rock-pi-n10-rk3399pro_defconfig | 3 +++
 1 file changed, 3 insertions(+)
configs/rock-pi-n10-rk3399pro_defconfig +3 -0
index 895820fbe6..2aa2fafaa4 100644
@@ -21,6 +21,7 @@ CONFIG_TPL=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_PCI=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
@@ -39,6 +40,8 @@ CONFIG_MMC_SDHCI_ROCKCHIP=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
+CONFIG_NVME=y
+CONFIG_PCI=y
 CONFIG_PHY_ROCKCHIP_INNO_USB2=y
 CONFIG_PHY_ROCKCHIP_TYPEC=y
 CONFIG_PMIC_RK8XX=y
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH v2 11/12 arm64: dts: rockchip: Add u-boot, spl-boot-order for ROCKPi N10

Add u-boot,spl-boot-order for ROCKPi N10, so-that it can able to boot from eMMC and SDMMC in order.

---
Changes for v2:
- none

 arch/arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi +6 -0
index 946a0230db..7c66e1145a 100644
@@ -5,3 +5,9 @@
 
 #include "rk3399pro-u-boot.dtsi"
 #include "rk3399-sdram-lpddr3-4GB-1600.dtsi"
+
+/ {
+	chosen {
+		u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
+	};
+};
Signature · 1 line
2.25.1
Reviewed-by on v2 11/12
#2 lore raw

Re: [PATCH v2 11/12] arm64: dts: rockchip: Add u-boot, spl-boot-order for ROCKPi N10

Quoted 4 lines · Jagan Teki

Add u-boot,spl-boot-order for ROCKPi N10, so-that it can able to boot from eMMC and SDMMC in order.

Thanks,
- Kever

Quoted 21 lines

---
Changes for v2:
- none

  arch/arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi | 6 ++++++
  1 file changed, 6 insertions(+)
arch/arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi +6 -0
index 946a0230db..7c66e1145a 100644
@@ -5,3 +5,9 @@
 
  #include "rk3399pro-u-boot.dtsi"
  #include "rk3399-sdram-lpddr3-4GB-1600.dtsi"
+
+/ {
+	chosen {
+		u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
+	};
+};
author
#3 lore raw

PATCH v2 12/12 rockchip: rock-p-n8/n10: Disable RAM_ROCKCHIP_DEBUG

In reply to Jagan Teki

Disable ram rockchip debug driver for ROCKPi N8/N10 boards since we have verified ram in many instances with respective U-Boot versions.

---
Changes for v2:
- none

 configs/rock-pi-n10-rk3399pro_defconfig | 1 +
 configs/rock-pi-n8-rk3288_defconfig     | 1 +
 2 files changed, 2 insertions(+)
configs/rock-pi-n10-rk3399pro_defconfig +1 -0
index 2aa2fafaa4..4a5bff44ef 100644
@@ -48,6 +48,7 @@ CONFIG_PMIC_RK8XX=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
+# CONFIG_RAM_ROCKCHIP_DEBUG is not set
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
configs/rock-pi-n8-rk3288_defconfig +1 -0
index d218852d79..630ec6e491 100644
@@ -64,6 +64,7 @@ CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
+# CONFIG_RAM_ROCKCHIP_DEBUG is not set
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYSRESET=y
 CONFIG_USB=y
Signature · 1 line
2.25.1
Reviewed-by on v2 12/12
#4 lore raw

Re: [PATCH v2 12/12] rockchip: rock-p-n8/n10: Disable RAM_ROCKCHIP_DEBUG

Quoted 5 lines · Jagan Teki

Disable ram rockchip debug driver for ROCKPi N8/N10 boards since we have verified ram in many instances with respective U-Boot versions.

Thanks,
- Kever

Quoted 32 lines

---
Changes for v2:
- none

  configs/rock-pi-n10-rk3399pro_defconfig | 1 +
  configs/rock-pi-n8-rk3288_defconfig     | 1 +
  2 files changed, 2 insertions(+)
configs/rock-pi-n10-rk3399pro_defconfig +1 -0
index 2aa2fafaa4..4a5bff44ef 100644
@@ -48,6 +48,7 @@ CONFIG_PMIC_RK8XX=y
  CONFIG_REGULATOR_PWM=y
  CONFIG_REGULATOR_RK8XX=y
  CONFIG_PWM_ROCKCHIP=y
+# CONFIG_RAM_ROCKCHIP_DEBUG is not set
  CONFIG_DM_RESET=y
  CONFIG_BAUDRATE=1500000
  CONFIG_DEBUG_UART_SHIFT=2
configs/rock-pi-n8-rk3288_defconfig +1 -0
index d218852d79..630ec6e491 100644
@@ -64,6 +64,7 @@ CONFIG_REGULATOR_RK8XX=y
  CONFIG_PWM_ROCKCHIP=y
  CONFIG_RAM=y
  CONFIG_SPL_RAM=y
+# CONFIG_RAM_ROCKCHIP_DEBUG is not set
  CONFIG_DEBUG_UART_SHIFT=2
  CONFIG_SYSRESET=y
  CONFIG_USB=y
Reviewed-by on v2 10/12
#5 lore raw
In reply to Jagan Teki
Quoted 8 lines · Jagan Teki

Enable PCI/NVME for M.2 Slot on RockPI-4 boards.

=> nvme info
Device 0: Vendor: 0x144d Rev: 4L1QCXB7 Prod: S35FNX0J623292
Type: Hard Disk
Capacity: 122104.3 MB = 119.2 GB (250069680 x 512)

Thanks,
- Kever

Quoted 28 lines

---
Changes for v2:
- none

  configs/rock-pi-n10-rk3399pro_defconfig | 3 +++
  1 file changed, 3 insertions(+)
configs/rock-pi-n10-rk3399pro_defconfig +3 -0
index 895820fbe6..2aa2fafaa4 100644
@@ -21,6 +21,7 @@ CONFIG_TPL=y
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
+CONFIG_CMD_PCI=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_TIME=y
@@ -39,6 +40,8 @@ CONFIG_MMC_SDHCI_ROCKCHIP=y
  CONFIG_DM_ETH=y
  CONFIG_ETH_DESIGNWARE=y
  CONFIG_GMAC_ROCKCHIP=y
+CONFIG_NVME=y
+CONFIG_PCI=y
  CONFIG_PHY_ROCKCHIP_INNO_USB2=y
  CONFIG_PHY_ROCKCHIP_TYPEC=y
  CONFIG_PMIC_RK8XX=y