diff --git a/patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/0005-board-nanopi-r4s-adjust-for-v2022.04.patch b/patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/0005-board-nanopi-r4s-adjust-for-v2022.04.patch deleted file mode 100644 index bbad663fc5..0000000000 --- a/patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/0005-board-nanopi-r4s-adjust-for-v2022.04.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/configs/nanopi-r4s-rk3399_defconfig b/configs/nanopi-r4s-rk3399_defconfig -index f1776eee..65423202 100644 ---- a/configs/nanopi-r4s-rk3399_defconfig -+++ b/configs/nanopi-r4s-rk3399_defconfig -@@ -1,4 +1,5 @@ - CONFIG_ARM=y -+CONFIG_SKIP_LOWLEVEL_INIT=y - CONFIG_ARCH_ROCKCHIP=y - CONFIG_SYS_TEXT_BASE=0x00200000 - CONFIG_NR_DRAM_BANKS=1 -@@ -9,6 +10,7 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 - CONFIG_DEBUG_UART_CLOCK=24000000 - CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-r4s" - CONFIG_DEBUG_UART=y -+CONFIG_SYS_LOAD_ADDR=0x800800 - CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-r4s.dtb" - CONFIG_MISC_INIT_R=y - # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set diff --git a/patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/0001-rockchip-rk3399-Add-Nanopi-R4S-board-support.patch b/patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/zzz-0001-rockchip-rk3399-Add-Nanopi-R4S-board-support.patch similarity index 60% rename from patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/0001-rockchip-rk3399-Add-Nanopi-R4S-board-support.patch rename to patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/zzz-0001-rockchip-rk3399-Add-Nanopi-R4S-board-support.patch index 5edb891116..4125dd31d7 100644 --- a/patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/0001-rockchip-rk3399-Add-Nanopi-R4S-board-support.patch +++ b/patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/zzz-0001-rockchip-rk3399-Add-Nanopi-R4S-board-support.patch @@ -1,7 +1,7 @@ -From a86eb090b22ce1b83493e6ac833265955063da97 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: hmz007 Date: Tue, 15 Dec 2020 18:02:38 +0800 -Subject: [PATCH 1/4] rockchip: rk3399: Add Nanopi R4S board support +Subject: rockchip: rk3399: Add Nanopi R4S board support Add initial support for Nanopi R4S board. @@ -16,33 +16,14 @@ Specification Signed-off-by: hmz007 --- - arch/arm/dts/Makefile | 1 + - .../arm/dts/rk3399-nanopi-r4s-4gb-u-boot.dtsi | 8 ++ - arch/arm/dts/rk3399-nanopi-r4s-4gb.dts | 114 ++++++++++++++++++ - arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi | 7 ++ - arch/arm/dts/rk3399-nanopi-r4s.dts | 114 ++++++++++++++++++ - configs/nanopi-r4s-4gb-rk3399_defconfig | 63 ++++++++++ - configs/nanopi-r4s-rk3399_defconfig | 62 ++++++++++ - 7 files changed, 370 insertions(+) - create mode 100644 arch/arm/dts/rk3399-nanopi-r4s-4gb-u-boot.dtsi - create mode 100644 arch/arm/dts/rk3399-nanopi-r4s-4gb.dts - create mode 100644 arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi - create mode 100644 arch/arm/dts/rk3399-nanopi-r4s.dts - create mode 100644 configs/nanopi-r4s-4gb-rk3399_defconfig - create mode 100644 configs/nanopi-r4s-rk3399_defconfig + arch/arm/dts/rk3399-nanopi-r4s-4gb-u-boot.dtsi | 8 + + arch/arm/dts/rk3399-nanopi-r4s-4gb.dts | 114 +++++++++ + arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi | 13 +- + arch/arm/dts/rk3399-nanopi-r4s.dts | 125 ++++------ + configs/nanopi-r4s-4gb-rk3399_defconfig | 63 +++++ + configs/nanopi-r4s-rk3399_defconfig | 6 +- + 6 files changed, 242 insertions(+), 87 deletions(-) -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index f8f529435b..55ca25bb22 100644 ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -131,6 +131,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ - rk3399-nanopi-m4.dtb \ - rk3399-nanopi-m4-2gb.dtb \ - rk3399-nanopi-neo4.dtb \ -+ rk3399-nanopi-r4s.dtb \ - rk3399-orangepi.dtb \ - rk3399-pinebook-pro.dtb \ - rk3399-puma-haikou.dtb \ diff --git a/arch/arm/dts/rk3399-nanopi-r4s-4gb-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-r4s-4gb-u-boot.dtsi new file mode 100644 index 0000000000..b291830640 @@ -178,49 +159,64 @@ index 0000000000..3072880c77 + vin-supply = <&vcc5v0_sys>; +}; diff --git a/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi -new file mode 100644 -index 0000000000..eb0aca4758 ---- /dev/null +index cd1642527b..eb0aca4758 100644 +--- a/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi +++ b/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi -@@ -0,0 +1,7 @@ -+// SPDX-License-Identifier: GPL-2.0+ -+/* +@@ -1,16 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0+ + /* +- * RK3399-based FriendlyElec boards device tree source +- * +- * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd +- * +- * Copyright (c) 2018 FriendlyElec Computer Tech. Co., Ltd. +- * (http://www.friendlyarm.com) +- * +- * Copyright (c) 2018 Collabora Ltd. +- * Copyright (c) 2019 Arm Ltd. +- * Copyright (C) 2020 Xiaobo + * Copyright (C) 2019 Jagan Teki -+ */ -+ -+#include "rk3399-nanopi4-u-boot.dtsi" + */ + + #include "rk3399-nanopi4-u-boot.dtsi" +-#include "rk3399-sdram-lpddr4-100.dtsi" +#include "rk3399-sdram-ddr3-1866.dtsi" diff --git a/arch/arm/dts/rk3399-nanopi-r4s.dts b/arch/arm/dts/rk3399-nanopi-r4s.dts -new file mode 100644 -index 0000000000..3072880c77 ---- /dev/null +index cef4d18b59..3072880c77 100644 +--- a/arch/arm/dts/rk3399-nanopi-r4s.dts +++ b/arch/arm/dts/rk3399-nanopi-r4s.dts -@@ -0,0 +1,114 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* +@@ -1,15 +1,12 @@ + // SPDX-License-Identifier: (GPL-2.0+ OR MIT) + /* +- * FriendlyElec NanoPC-T4 board device tree source + * FriendlyElec NanoPi R4S board device tree source -+ * -+ * Copyright (c) 2020 FriendlyElec Computer Tech. Co., Ltd. -+ * (http://www.friendlyarm.com) -+ * -+ * Copyright (c) 2018 Collabora Ltd. + * + * Copyright (c) 2020 FriendlyElec Computer Tech. Co., Ltd. + * (http://www.friendlyarm.com) + * + * Copyright (c) 2018 Collabora Ltd. +- * +- * Copyright (c) 2020 Jensen Huang +- * Copyright (c) 2020 Marty Jones +- * Copyright (c) 2021 Tianling Shen + * Copyright (c) 2019 Arm Ltd. -+ */ -+ -+/dts-v1/; -+#include "rk3399-nanopi4.dtsi" -+ -+/ { -+ model = "FriendlyElec NanoPi R4S"; -+ compatible = "friendlyarm,nanopi-r4s", "rockchip,rk3399"; -+ + */ + + /dts-v1/; +@@ -19,48 +16,67 @@ + model = "FriendlyElec NanoPi R4S"; + compatible = "friendlyarm,nanopi-r4s", "rockchip,rk3399"; + +- /delete-node/ display-subsystem; + vdd_5v: vdd-5v { + compatible = "regulator-fixed"; + regulator-name = "vdd_5v"; + regulator-always-on; + regulator-boot-on; + }; -+ + +- gpio-leds { +- pinctrl-0 = <&lan_led_pin>, <&sys_led_pin>, <&wan_led_pin>; + vcc5v0_usb1: vcc5v0-usb1 { + compatible = "regulator-fixed"; + regulator-name = "vcc5v0_usb1"; @@ -228,7 +224,8 @@ index 0000000000..3072880c77 + regulator-boot-on; + vin-supply = <&vdd_5v>; + }; -+ + +- /delete-node/ led-0; + vcc5v0_usb2: vcc5v0-usb2 { + compatible = "regulator-fixed"; + regulator-name = "vcc5v0_usb2"; @@ -236,7 +233,11 @@ index 0000000000..3072880c77 + regulator-boot-on; + vin-supply = <&vdd_5v>; + }; -+ + +- lan_led: led-lan { +- gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>; +- label = "green:lan"; +- }; + fan: pwm-fan { + compatible = "pwm-fan"; + /* @@ -249,67 +250,117 @@ index 0000000000..3072880c77 + pwms = <&pwm1 0 50000 0>; + }; +}; -+ + +- sys_led: led-sys { +- gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; +- label = "red:power"; +- default-state = "on"; +&cpu_thermal { + trips { + cpu_warm: cpu_warm { + temperature = <55000>; + hysteresis = <2000>; + type = "active"; -+ }; -+ + }; + +- wan_led: led-wan { +- gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; +- label = "green:wan"; + cpu_hot: cpu_hot { + temperature = <65000>; + hysteresis = <2000>; + type = "active"; -+ }; -+ }; -+ + }; + }; + +- gpio-keys { +- pinctrl-0 = <&reset_button_pin>; +- +- /delete-node/ power; +- +- reset { +- debounce-interval = <50>; +- gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>; +- label = "reset"; +- linux,code = ; + cooling-maps { + map2 { + trip = <&cpu_warm>; + cooling-device = <&fan THERMAL_NO_LIMIT 1>; -+ }; -+ + }; +- }; + +- vdd_5v: vdd-5v { +- compatible = "regulator-fixed"; +- regulator-name = "vdd_5v"; +- regulator-always-on; +- regulator-boot-on; + map3 { + trip = <&cpu_hot>; + cooling-device = <&fan 2 THERMAL_NO_LIMIT>; + }; -+ }; -+}; -+ -+&emmc_phy { -+ status = "disabled"; -+}; -+ + }; + }; + +@@ -68,42 +84,15 @@ + status = "disabled"; + }; + +-&i2c4 { +&fusb0 { -+ status = "disabled"; -+}; -+ -+&pcie0 { -+ num-lanes = <1>; -+ vpcie3v3-supply = <&vcc3v3_sys>; -+}; -+ -+&sdhci { -+ status = "disabled"; -+}; -+ -+&sdio0 { -+ status = "disabled"; -+}; -+ -+&u2phy0_host { -+ phy-supply = <&vdd_5v>; -+}; -+ -+&u2phy1_host { -+ status = "disabled"; -+}; -+ -+&vcc3v3_sys { -+ vin-supply = <&vcc5v0_sys>; -+}; + status = "disabled"; + }; + + &pcie0 { +- max-link-speed = <1>; + num-lanes = <1>; + vpcie3v3-supply = <&vcc3v3_sys>; + }; + +-&pinctrl { +- gpio-leds { +- /delete-node/ status-led-pin; +- +- lan_led_pin: lan-led-pin { +- rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; +- }; +- +- sys_led_pin: sys-led-pin { +- rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; +- }; +- +- wan_led_pin: wan-led-pin { +- rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; +- }; +- }; +- +- rockchip-key { +- /delete-node/ power-key; +- +- reset_button_pin: reset-button-pin { +- rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>; +- }; +- }; +-}; +- + &sdhci { + status = "disabled"; + }; +@@ -120,14 +109,6 @@ + status = "disabled"; + }; + +-&uart0 { +- status = "disabled"; +-}; +- +-&usbdrd_dwc3_0 { +- dr_mode = "host"; +-}; +- + &vcc3v3_sys { + vin-supply = <&vcc5v0_sys>; + }; diff --git a/configs/nanopi-r4s-4gb-rk3399_defconfig b/configs/nanopi-r4s-4gb-rk3399_defconfig new file mode 100644 index 0000000000..dcac8d426f @@ -380,73 +431,43 @@ index 0000000000..dcac8d426f +CONFIG_SPL_TINY_MEMSET=y +CONFIG_ERRNO_STR=y diff --git a/configs/nanopi-r4s-rk3399_defconfig b/configs/nanopi-r4s-rk3399_defconfig -new file mode 100644 -index 0000000000..034241f209 ---- /dev/null +index 7d176ce28e..034241f209 100644 +--- a/configs/nanopi-r4s-rk3399_defconfig +++ b/configs/nanopi-r4s-rk3399_defconfig -@@ -0,0 +1,62 @@ -+CONFIG_ARM=y -+CONFIG_ARCH_ROCKCHIP=y -+CONFIG_SYS_TEXT_BASE=0x00200000 -+CONFIG_NR_DRAM_BANKS=1 -+CONFIG_ENV_OFFSET=0x3F8000 -+CONFIG_ROCKCHIP_RK3399=y -+CONFIG_TARGET_EVB_RK3399=y -+CONFIG_DEBUG_UART_BASE=0xFF1A0000 -+CONFIG_DEBUG_UART_CLOCK=24000000 +@@ -1,16 +1,14 @@ + CONFIG_ARM=y +-CONFIG_SKIP_LOWLEVEL_INIT=y + CONFIG_ARCH_ROCKCHIP=y + CONFIG_SYS_TEXT_BASE=0x00200000 + CONFIG_NR_DRAM_BANKS=1 + CONFIG_ENV_OFFSET=0x3F8000 +-CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-r4s" + CONFIG_ROCKCHIP_RK3399=y + CONFIG_TARGET_EVB_RK3399=y + CONFIG_DEBUG_UART_BASE=0xFF1A0000 + CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-r4s" -+CONFIG_DEBUG_UART=y -+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-r4s.dtb" -+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_USB=y -+# CONFIG_CMD_SETEXPR is not set -+CONFIG_CMD_TIME=y -+CONFIG_SPL_OF_CONTROL=y -+CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" -+CONFIG_ENV_IS_IN_MMC=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y + CONFIG_DEBUG_UART=y +-CONFIG_SYS_LOAD_ADDR=0x800800 + CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-r4s.dtb" + CONFIG_DISPLAY_BOARDINFO_LATE=y + # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set +@@ -27,6 +25,7 @@ CONFIG_SPL_OF_CONTROL=y + CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" + CONFIG_ENV_IS_IN_MMC=y + CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 -+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_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_KEYBOARD=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_DM_VIDEO=y -+CONFIG_DISPLAY=y -+CONFIG_VIDEO_ROCKCHIP=y -+CONFIG_DISPLAY_ROCKCHIP_HDMI=y -+CONFIG_SPL_TINY_MEMSET=y -+CONFIG_ERRNO_STR=y + CONFIG_ROCKCHIP_GPIO=y + CONFIG_SYS_I2C_ROCKCHIP=y + CONFIG_MMC_DW=y +@@ -40,7 +39,6 @@ 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 -- -2.25.1 +Armbian diff --git a/patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/0002-rockchip-rk3399-split-nanopi-r4s-out-of-evb_rk3399.patch b/patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/zzz-0002-rockchip-rk3399-split-nanopi-r4s-out-of-evb_rk3399.patch similarity index 93% rename from patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/0002-rockchip-rk3399-split-nanopi-r4s-out-of-evb_rk3399.patch rename to patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/zzz-0002-rockchip-rk3399-split-nanopi-r4s-out-of-evb_rk3399.patch index ea49fdbdff..ee580c7c9a 100644 --- a/patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/0002-rockchip-rk3399-split-nanopi-r4s-out-of-evb_rk3399.patch +++ b/patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/zzz-0002-rockchip-rk3399-split-nanopi-r4s-out-of-evb_rk3399.patch @@ -1,37 +1,29 @@ -From 244492a7a5451eca042d3ec7ccff8de6e23dd288 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: hmz007 Date: Fri, 18 Dec 2020 17:10:35 +0800 -Subject: [PATCH 2/4] rockchip: rk3399: split nanopi-r4s out of evb_rk3399 +Subject: rockchip: rk3399: split nanopi-r4s out of evb_rk3399 Signed-off-by: hmz007 --- arch/arm/mach-rockchip/rk3399/Kconfig | 6 + - board/friendlyarm/nanopi4/Kconfig | 15 +++ + board/friendlyarm/nanopi4/Kconfig | 15 + board/friendlyarm/nanopi4/MAINTAINERS | 6 + - board/friendlyarm/nanopi4/Makefile | 8 ++ - board/friendlyarm/nanopi4/README | 122 +++++++++++++++++++ - board/friendlyarm/nanopi4/hwrev.c | 149 ++++++++++++++++++++++++ - board/friendlyarm/nanopi4/hwrev.h | 27 +++++ - board/friendlyarm/nanopi4/nanopi4.c | 148 +++++++++++++++++++++++ + board/friendlyarm/nanopi4/Makefile | 8 + + board/friendlyarm/nanopi4/README | 122 ++++++++ + board/friendlyarm/nanopi4/hwrev.c | 149 ++++++++++ + board/friendlyarm/nanopi4/hwrev.h | 27 ++ + board/friendlyarm/nanopi4/nanopi4.c | 148 +++++++++ configs/nanopi-r4s-4gb-rk3399_defconfig | 4 +- configs/nanopi-r4s-rk3399_defconfig | 4 +- drivers/clk/rockchip/clk_rk3399.c | 2 + - include/configs/nanopi4.h | 24 ++++ + include/configs/nanopi4.h | 24 ++ 12 files changed, 511 insertions(+), 4 deletions(-) - create mode 100644 board/friendlyarm/nanopi4/Kconfig - create mode 100644 board/friendlyarm/nanopi4/MAINTAINERS - create mode 100644 board/friendlyarm/nanopi4/Makefile - create mode 100644 board/friendlyarm/nanopi4/README - create mode 100644 board/friendlyarm/nanopi4/hwrev.c - create mode 100644 board/friendlyarm/nanopi4/hwrev.h - create mode 100644 board/friendlyarm/nanopi4/nanopi4.c - create mode 100644 include/configs/nanopi4.h diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig -index 17628f9171..2a44aae43c 100644 +index 80e0d1c182..809d86d6f4 100644 --- a/arch/arm/mach-rockchip/rk3399/Kconfig +++ b/arch/arm/mach-rockchip/rk3399/Kconfig -@@ -109,6 +109,11 @@ config TARGET_ROC_PC_RK3399 +@@ -136,6 +136,11 @@ config TARGET_ROC_PC_RK3399 * wide voltage input(5V-15V), dual cell battery * Wifi/BT accessible via expansion board M.2 @@ -43,14 +35,14 @@ index 17628f9171..2a44aae43c 100644 endchoice config ROCKCHIP_BOOT_MODE_REG -@@ -152,6 +157,7 @@ config SYS_BOOTCOUNT_ADDR +@@ -179,6 +184,7 @@ config SYS_BOOTCOUNT_ADDR endif # BOOTCOUNT_LIMIT source "board/firefly/roc-pc-rk3399/Kconfig" +source "board/friendlyarm/nanopi4/Kconfig" source "board/google/gru/Kconfig" + source "board/kobol/helios64/Kconfig" source "board/pine64/pinebook-pro-rk3399/Kconfig" - source "board/pine64/rockpro64_rk3399/Kconfig" diff --git a/board/friendlyarm/nanopi4/Kconfig b/board/friendlyarm/nanopi4/Kconfig new file mode 100644 index 0000000000..f3f9dd7b56 @@ -609,18 +601,18 @@ index 034241f209..b67f7c0dc9 100644 CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c -index 22c373a623..38975c0c65 100644 +index e82a545c96..6b368602dc 100644 --- a/drivers/clk/rockchip/clk_rk3399.c +++ b/drivers/clk/rockchip/clk_rk3399.c -@@ -1351,6 +1351,8 @@ static void rkclk_init(struct rockchip_cru *cru) +@@ -1372,6 +1372,8 @@ static void rkclk_init(struct rockchip_cru *cru) pclk_div << PCLK_PERILP1_DIV_CON_SHIFT | hclk_div << HCLK_PERILP1_DIV_CON_SHIFT | HCLK_PERILP1_PLL_SEL_GPLL << HCLK_PERILP1_PLL_SEL_SHIFT); + + rk3399_saradc_set_clk(cru, 1000000); } - #endif + static int rk3399_clk_probe(struct udevice *dev) diff --git a/include/configs/nanopi4.h b/include/configs/nanopi4.h new file mode 100644 index 0000000000..a86d38976a @@ -652,5 +644,5 @@ index 0000000000..a86d38976a + +#endif -- -2.25.1 +Armbian diff --git a/patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/0003-ram-rk3399-Add-support-for-multiple-DDR-types.patch b/patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/zzz-0003-ram-rk3399-Add-support-for-multiple-DDR-types.patch similarity index 86% rename from patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/0003-ram-rk3399-Add-support-for-multiple-DDR-types.patch rename to patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/zzz-0003-ram-rk3399-Add-support-for-multiple-DDR-types.patch index b9fbb7519f..cdc25785bb 100644 --- a/patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/0003-ram-rk3399-Add-support-for-multiple-DDR-types.patch +++ b/patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/zzz-0003-ram-rk3399-Add-support-for-multiple-DDR-types.patch @@ -1,7 +1,7 @@ -From 1bc90230df5cd55513268f2f7a43abdbad1161b5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: hmz007 Date: Sat, 19 Dec 2020 19:39:14 +0800 -Subject: [PATCH 3/4] ram: rk3399: Add support for multiple DDR types +Subject: ram: rk3399: Add support for multiple DDR types Move rockchip,sdram-params to named subnode to include multiple sdram parameters, and then read the parameters @@ -10,14 +10,14 @@ rk3399_dmc_init(). Signed-off-by: hmz007 --- - arch/arm/dts/rk3399-sdram-ddr3-1333.dtsi | 6 ++- - arch/arm/dts/rk3399-sdram-ddr3-1600.dtsi | 5 +- - arch/arm/dts/rk3399-sdram-ddr3-1866.dtsi | 6 ++- - .../arm/dts/rk3399-sdram-lpddr3-2GB-1600.dtsi | 3 ++ - .../arm/dts/rk3399-sdram-lpddr3-4GB-1600.dtsi | 3 ++ - .../rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi | 3 ++ - arch/arm/dts/rk3399-sdram-lpddr4-100.dtsi | 3 ++ - drivers/ram/rockchip/sdram_rk3399.c | 49 +++++++++++++++---- + arch/arm/dts/rk3399-sdram-ddr3-1333.dtsi | 6 +- + arch/arm/dts/rk3399-sdram-ddr3-1600.dtsi | 5 +- + arch/arm/dts/rk3399-sdram-ddr3-1866.dtsi | 6 +- + arch/arm/dts/rk3399-sdram-lpddr3-2GB-1600.dtsi | 3 + + arch/arm/dts/rk3399-sdram-lpddr3-4GB-1600.dtsi | 3 + + arch/arm/dts/rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi | 3 + + arch/arm/dts/rk3399-sdram-lpddr4-100.dtsi | 3 + + drivers/ram/rockchip/sdram_rk3399.c | 49 ++++++++-- 8 files changed, 64 insertions(+), 14 deletions(-) diff --git a/arch/arm/dts/rk3399-sdram-ddr3-1333.dtsi b/arch/arm/dts/rk3399-sdram-ddr3-1333.dtsi @@ -162,7 +162,7 @@ index f0c478d189..21d212236f 100644 + }; }; diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c -index 530c8a2f40..db30105989 100644 +index c0a06dcaed..083ec80af1 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -1625,7 +1625,6 @@ static void set_ddr_stride(struct rk3399_pmusgrf_regs *pmusgrf, u32 stride) @@ -183,7 +183,7 @@ index 530c8a2f40..db30105989 100644 struct rk3399_sdram_params dfs_cfgs_lpddr4[] = { #include "sdram-rk3399-lpddr4-400.inc" #include "sdram-rk3399-lpddr4-800.inc" -@@ -3011,20 +3010,40 @@ static int sdram_init(struct dram_info *dram, +@@ -3011,22 +3010,42 @@ static int sdram_init(struct dram_info *dram, return 0; } @@ -192,14 +192,16 @@ index 530c8a2f40..db30105989 100644 + return NULL; +} + - static int rk3399_dmc_ofdata_to_platdata(struct udevice *dev) + static int rk3399_dmc_of_to_plat(struct udevice *dev) { - #if !CONFIG_IS_ENABLED(OF_PLATDATA) - struct rockchip_dmc_plat *plat = dev_get_platdata(dev); + struct rockchip_dmc_plat *plat = dev_get_plat(dev); + ofnode node = { .np = NULL }; + const char *name; int ret; + if (!CONFIG_IS_ENABLED(OF_REAL)) + return 0; + - ret = dev_read_u32_array(dev, "rockchip,sdram-params", - (u32 *)&plat->sdram_params, - sizeof(plat->sdram_params) / sizeof(u32)); @@ -227,7 +229,7 @@ index 530c8a2f40..db30105989 100644 ret = regmap_init_mem(dev_ofnode(dev), &plat->map); if (ret) printf("%s: regmap failed %d\n", __func__, ret); -@@ -3051,18 +3070,20 @@ static int conv_of_platdata(struct udevice *dev) +@@ -3051,18 +3070,20 @@ static int conv_of_plat(struct udevice *dev) #endif static const struct sdram_rk3399_ops rk3399_ops = { @@ -271,5 +273,5 @@ index 530c8a2f40..db30105989 100644 priv->grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); priv->pmu = syscon_get_first_range(ROCKCHIP_SYSCON_PMU); -- -2.25.1 +Armbian diff --git a/patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/0004-board-nanopi4-unify-1GB-4GB-variants-of-R4S.patch b/patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/zzz-0004-board-nanopi4-unify-1GB-4GB-variants-of-R4S.patch similarity index 91% rename from patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/0004-board-nanopi4-unify-1GB-4GB-variants-of-R4S.patch rename to patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/zzz-0004-board-nanopi4-unify-1GB-4GB-variants-of-R4S.patch index 25574cf969..ff844fa34e 100644 --- a/patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/0004-board-nanopi4-unify-1GB-4GB-variants-of-R4S.patch +++ b/patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/zzz-0004-board-nanopi4-unify-1GB-4GB-variants-of-R4S.patch @@ -1,20 +1,17 @@ -From 317331b3d7ddcf2a5e7b5a9002ac559627000032 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: hmz007 Date: Sat, 19 Dec 2020 20:39:29 +0800 -Subject: [PATCH 4/4] board: nanopi4: unify 1GB/4GB variants of R4S +Subject: board: nanopi4: unify 1GB/4GB variants of R4S Signed-off-by: hmz007 --- - .../arm/dts/rk3399-nanopi-r4s-4gb-u-boot.dtsi | 8 -- - arch/arm/dts/rk3399-nanopi-r4s-4gb.dts | 114 ------------------ - arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi | 2 + - board/friendlyarm/nanopi4/hwrev.c | 36 ++++++ - configs/nanopi-r4s-4gb-rk3399_defconfig | 63 ---------- - configs/nanopi-r4s-rk3399_defconfig | 1 + + arch/arm/dts/rk3399-nanopi-r4s-4gb-u-boot.dtsi | 8 - + arch/arm/dts/rk3399-nanopi-r4s-4gb.dts | 114 ---------- + arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi | 2 + + board/friendlyarm/nanopi4/hwrev.c | 36 +++ + configs/nanopi-r4s-4gb-rk3399_defconfig | 63 ----- + configs/nanopi-r4s-rk3399_defconfig | 1 + 6 files changed, 39 insertions(+), 185 deletions(-) - delete mode 100644 arch/arm/dts/rk3399-nanopi-r4s-4gb-u-boot.dtsi - delete mode 100644 arch/arm/dts/rk3399-nanopi-r4s-4gb.dts - delete mode 100644 configs/nanopi-r4s-4gb-rk3399_defconfig diff --git a/arch/arm/dts/rk3399-nanopi-r4s-4gb-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-r4s-4gb-u-boot.dtsi deleted file mode 100644 @@ -300,5 +297,5 @@ index b67f7c0dc9..f1776eee73 100644 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYSRESET=y -- -2.25.1 +Armbian diff --git a/patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/zzz-0005-board-nanopi-r4s-adjust-for-v2022.04.patch b/patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/zzz-0005-board-nanopi-r4s-adjust-for-v2022.04.patch new file mode 100644 index 0000000000..1947c4b021 --- /dev/null +++ b/patch/u-boot/u-boot-rockchip64-v2022.04/board_nanopi-r4s/zzz-0005-board-nanopi-r4s-adjust-for-v2022.04.patch @@ -0,0 +1,50 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Piotr Szczepanik +Date: Thu, 16 Jun 2022 12:27:05 +0200 +Subject: [ARCHEOLOGY] Switched rockchip64 u-boot to v2022.04 (#3871) + +> X-Git-Archeology: > recovered message: > * Switched rockchip64 u-boot to v2022.04 +> X-Git-Archeology: > recovered message: > * Adjust u-boot config for NanoPi M4V2 +> X-Git-Archeology: > recovered message: > * Adjust u-boot config for OrangePi 4 +> X-Git-Archeology: > recovered message: > * Adjust u-boot config for Helios64 +> X-Git-Archeology: > recovered message: > * Adjust u-boot config for clockworkpi a06 +> X-Git-Archeology: > recovered message: > * Adjust u-boot config for OrangePi R1 Plus LTS +> X-Git-Archeology: > recovered message: > * Adjust u-boot config for OrangePi R1 Plus +> X-Git-Archeology: > recovered message: > * Adjust u-boot device tree for OrangePi R1 Plus LTS +> X-Git-Archeology: > recovered message: > * Adjust u-boot config for Tinkerboard 2 +> X-Git-Archeology: > recovered message: > * Adjust u-boot config for RockPi S +> X-Git-Archeology: > recovered message: > * Adjust u-boot config for NanoPi R4S +> X-Git-Archeology: - Revision 26437e36c18bb09484f4150e396a1784cc6471b7: https://github.com/armbian/build/commit/26437e36c18bb09484f4150e396a1784cc6471b7 +> X-Git-Archeology: Date: Thu, 16 Jun 2022 12:27:05 +0200 +> X-Git-Archeology: From: Piotr Szczepanik +> X-Git-Archeology: Subject: Switched rockchip64 u-boot to v2022.04 (#3871) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec +> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392) +--- + configs/nanopi-r4s-rk3399_defconfig | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configs/nanopi-r4s-rk3399_defconfig b/configs/nanopi-r4s-rk3399_defconfig +index f1776eee73..65423202ce 100644 +--- a/configs/nanopi-r4s-rk3399_defconfig ++++ b/configs/nanopi-r4s-rk3399_defconfig +@@ -1,4 +1,5 @@ + CONFIG_ARM=y ++CONFIG_SKIP_LOWLEVEL_INIT=y + CONFIG_ARCH_ROCKCHIP=y + CONFIG_SYS_TEXT_BASE=0x00200000 + CONFIG_NR_DRAM_BANKS=1 +@@ -9,6 +10,7 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 + CONFIG_DEBUG_UART_CLOCK=24000000 + CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-r4s" + CONFIG_DEBUG_UART=y ++CONFIG_SYS_LOAD_ADDR=0x800800 + CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-r4s.dtb" + CONFIG_MISC_INIT_R=y + # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set +-- +Armbian +