177 lines
4.3 KiB
Diff
177 lines
4.3 KiB
Diff
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
|
|
index 62da168e..efba2231 100644
|
|
--- a/arch/arm/dts/Makefile
|
|
+++ b/arch/arm/dts/Makefile
|
|
@@ -113,6 +113,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
|
|
rk3399-khadas-edge-v.dtb \
|
|
rk3399-nanopc-t4.dtb \
|
|
rk3399-nanopi-m4.dtb \
|
|
+ rk3399-nanopi-m4v2.dtb \
|
|
rk3399-nanopi-neo4.dtb \
|
|
rk3399-orangepi.dtb \
|
|
rk3399-puma-ddr1333.dtb \
|
|
diff --git a/arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi
|
|
new file mode 100644
|
|
index 00000000..5bd86966
|
|
--- /dev/null
|
|
+++ b/arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi
|
|
@@ -0,0 +1,17 @@
|
|
+// SPDX-License-Identifier: GPL-2.0+
|
|
+/*
|
|
+ * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
|
|
+ */
|
|
+
|
|
+#include "rk3399-nanopi4-u-boot.dtsi"
|
|
+#include "rk3399-sdram-lpddr4-100.dtsi"
|
|
+
|
|
+/ {
|
|
+ chosen {
|
|
+ u-boot,spl-boot-order = &sdmmc, &sdhci;
|
|
+ };
|
|
+};
|
|
+
|
|
+&sdio0 {
|
|
+ status = "disabled";
|
|
+};
|
|
diff --git a/arch/arm/dts/rk3399-nanopi-m4v2.dts b/arch/arm/dts/rk3399-nanopi-m4v2.dts
|
|
new file mode 100644
|
|
index 00000000..60358ab8
|
|
--- /dev/null
|
|
+++ b/arch/arm/dts/rk3399-nanopi-m4v2.dts
|
|
@@ -0,0 +1,66 @@
|
|
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
+/*
|
|
+ * FriendlyElec NanoPi M4 board device tree source
|
|
+ *
|
|
+ * Copyright (c) 2018 FriendlyElec Computer Tech. Co., Ltd.
|
|
+ * (http://www.friendlyarm.com)
|
|
+ *
|
|
+ * Copyright (c) 2018 Collabora Ltd.
|
|
+ * Copyright (c) 2019 Arm Ltd.
|
|
+ */
|
|
+
|
|
+/dts-v1/;
|
|
+#include "rk3399-nanopi4.dtsi"
|
|
+
|
|
+/ {
|
|
+ model = "FriendlyElec NanoPi M4V2";
|
|
+ compatible = "friendlyarm,nanopi-m4", "rockchip,rk3399";
|
|
+
|
|
+ vdd_5v: vdd-5v {
|
|
+ compatible = "regulator-fixed";
|
|
+ regulator-name = "vdd_5v";
|
|
+ regulator-always-on;
|
|
+ regulator-boot-on;
|
|
+ };
|
|
+
|
|
+ vcc5v0_core: vcc5v0-core {
|
|
+ compatible = "regulator-fixed";
|
|
+ regulator-name = "vcc5v0_core";
|
|
+ regulator-always-on;
|
|
+ regulator-boot-on;
|
|
+ vin-supply = <&vdd_5v>;
|
|
+ };
|
|
+
|
|
+ vcc5v0_usb1: vcc5v0-usb1 {
|
|
+ compatible = "regulator-fixed";
|
|
+ regulator-name = "vcc5v0_usb1";
|
|
+ regulator-always-on;
|
|
+ regulator-boot-on;
|
|
+ vin-supply = <&vcc5v0_sys>;
|
|
+ };
|
|
+
|
|
+ vcc5v0_usb2: vcc5v0-usb2 {
|
|
+ compatible = "regulator-fixed";
|
|
+ regulator-name = "vcc5v0_usb2";
|
|
+ regulator-always-on;
|
|
+ regulator-boot-on;
|
|
+ vin-supply = <&vcc5v0_sys>;
|
|
+ };
|
|
+};
|
|
+
|
|
+&vcc3v3_sys {
|
|
+ vin-supply = <&vcc5v0_core>;
|
|
+};
|
|
+
|
|
+&u2phy0_host {
|
|
+ phy-supply = <&vcc5v0_usb1>;
|
|
+};
|
|
+
|
|
+&u2phy1_host {
|
|
+ phy-supply = <&vcc5v0_usb2>;
|
|
+};
|
|
+
|
|
+&vbus_typec {
|
|
+ regulator-always-on;
|
|
+ vin-supply = <&vdd_5v>;
|
|
+};
|
|
diff --git a/configs/nanopi-m4v2-rk3399_defconfig b/configs/nanopi-m4v2-rk3399_defconfig
|
|
new file mode 100644
|
|
index 00000000..ff4d32e2
|
|
--- /dev/null
|
|
+++ b/configs/nanopi-m4v2-rk3399_defconfig
|
|
@@ -0,0 +1,63 @@
|
|
+CONFIG_ARM=y
|
|
+CONFIG_ARCH_ROCKCHIP=y
|
|
+CONFIG_SYS_TEXT_BASE=0x00200000
|
|
+CONFIG_ROCKCHIP_RK3399=y
|
|
+CONFIG_NR_DRAM_BANKS=1
|
|
+CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
|
+CONFIG_DEBUG_UART_CLOCK=24000000
|
|
+CONFIG_DEBUG_UART=y
|
|
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-m4v2.dtb"
|
|
+CONFIG_MISC_INIT_R=y
|
|
+# CONFIG_DISPLAY_CPUINFO is not set
|
|
+CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
|
|
+CONFIG_SPL_STACK_R=y
|
|
+CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
|
|
+CONFIG_TPL=y
|
|
+CONFIG_CMD_BOOTZ=y
|
|
+CONFIG_CMD_GPT=y
|
|
+CONFIG_CMD_MMC=y
|
|
+CONFIG_CMD_SF=y
|
|
+CONFIG_CMD_USB=y
|
|
+# CONFIG_CMD_SETEXPR is not set
|
|
+CONFIG_CMD_TIME=y
|
|
+CONFIG_SPL_OF_CONTROL=y
|
|
+CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-m4v2"
|
|
+CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
|
|
+CONFIG_ENV_IS_IN_MMC=y
|
|
+CONFIG_ROCKCHIP_GPIO=y
|
|
+CONFIG_SYS_I2C_ROCKCHIP=y
|
|
+CONFIG_MMC_DW=y
|
|
+CONFIG_MMC_DW_ROCKCHIP=y
|
|
+CONFIG_MMC_SDHCI=y
|
|
+CONFIG_MMC_SDHCI_ROCKCHIP=y
|
|
+CONFIG_DM_ETH=y
|
|
+CONFIG_ETH_DESIGNWARE=y
|
|
+CONFIG_GMAC_ROCKCHIP=y
|
|
+CONFIG_PMIC_RK8XX=y
|
|
+CONFIG_REGULATOR_PWM=y
|
|
+CONFIG_REGULATOR_RK8XX=y
|
|
+CONFIG_PWM_ROCKCHIP=y
|
|
+CONFIG_RAM_RK3399_LPDDR4=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_HOST_ETHER=y
|
|
+CONFIG_USB_ETHER_ASIX=y
|
|
+CONFIG_USB_ETHER_ASIX88179=y
|
|
+CONFIG_USB_ETHER_MCS7830=y
|
|
+CONFIG_USB_ETHER_RTL8152=y
|
|
+CONFIG_USB_ETHER_SMSC95XX=y
|
|
+CONFIG_SPL_TINY_MEMSET=y
|
|
+CONFIG_ERRNO_STR=y
|
|
+CONFIG_LOG=y
|
|
+CONFIG_LOG_CONSOLE=y
|
|
+CONFIG_SPL_LOG=y
|
|
+CONFIG_SPL_LOG_CONSOLE=y
|
|
+CONFIG_LOG_MAX_LEVEL=7
|
|
+# CONFIG_USE_TINY_PRINTF is not set
|