Skip to contentSkip to conversation

rockchip: rk3328: Add support for FriendlyARM NanoPi R2S

PATCH New David Bauer 2 participants 4 messages Jul 21, 2020 – Aug 8, 2020 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rockchip: rk3328: Add support for FriendlyARM NanoPi R2S

This adds support for the NanoPi R2S from FriendlyArm.

Rockchip RK3328 SoC
1GB DDR4 RAM
Gigabit Ethernet (WAN)
Gigabit Ethernet (USB3) (LAN)
USB 2.0 Host Port
MicroSD slot
Reset button
WAN - LAN - SYS LED

---
 arch/arm/dts/Makefile                      |   1 +
 arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi |  34 +++
 arch/arm/dts/rk3328-nanopi-r2s.dts         | 317 +++++++++++++++++++++
 board/rockchip/evb_rk3328/MAINTAINERS      |   7 +
 configs/nanopi-r2s-rk3328_defconfig        |  99 +++++++
 5 files changed, 458 insertions(+)
 create mode 100644 arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3328-nanopi-r2s.dts
 create mode 100644 configs/nanopi-r2s-rk3328_defconfig
arch/arm/dts/Makefile +1 -0
index cee10f533f..a6bd8ea0d8 100644
@@ -107,6 +107,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3308) += \
 
 dtb-$(CONFIG_ROCKCHIP_RK3328) += \
 	rk3328-evb.dtb \
+	rk3328-nanopi-r2s.dtb \
 	rk3328-roc-cc.dtb \
 	rk3328-rock64.dtb \
 	rk3328-rock-pi-e.dtb
arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi new file +34 -0
new file mode 100644
index 0000000000..4159348402
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * (C) Copyright 2018-2019 Rockchip Electronics Co., Ltd
+ * (C) Copyright 2020 David Bauer
+ */
+
+#include "rk3328-u-boot.dtsi"
+#include "rk3328-sdram-ddr4-666.dtsi"
+/ {
+	chosen {
+		u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
+	};
+};
+
+&gpio0 {
+	u-boot,dm-spl;
+};
+
+&pinctrl {
+	u-boot,dm-spl;
+};
+
+&sdmmc0m1_gpio {
+	u-boot,dm-spl;
+};
+
+&pcfg_pull_up_4ma {
+	u-boot,dm-spl;
+};
+
+/* Need this and all the pinctrl/gpio stuff above to set pinmux */
+&vcc_sd {
+	u-boot,dm-spl;
+};
arch/arm/dts/rk3328-nanopi-r2s.dts new file +317 -0

317 lines not on this page · raw message

board/rockchip/evb_rk3328/MAINTAINERS +7 -0
index e7dd59ff4e..14fda46e8f 100644
@@ -5,6 +5,13 @@ F:      board/rockchip/evb_rk3328
 F:      include/configs/evb_rk3328.h
 F:      configs/evb-rk3328_defconfig
 
+NANOPI-R2S-RK3328
+M:      David Bauer <[email protected]>
+S:      Maintained
+F:      configs/nanopi-r2s-rk3328_defconfig
+F:      arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
+F:      arch/arm/dts/rk3328-nanopi-r2s.dts
+
 ROC-RK3328-CC
 M:      Loic Devulder <[email protected]>
 M:      Chen-Yu Tsai <[email protected]>
configs/nanopi-r2s-rk3328_defconfig new file +99 -0

99 lines not on this page · raw message

Signature · 1 line
2.27.0
#1 lore raw

PATCH 1/1 rockchip: rk3328: Add support for FriendlyARM NanoPi R2S

Hi David,

??? Does this board dts available in kernel mainline?

Thanks,

- Kever

Quoted 521 lines · David Bauer

This adds support for the NanoPi R2S from FriendlyArm.

Rockchip RK3328 SoC
1GB DDR4 RAM
Gigabit Ethernet (WAN)
Gigabit Ethernet (USB3) (LAN)
USB 2.0 Host Port
MicroSD slot
Reset button
WAN - LAN - SYS LED

---
  arch/arm/dts/Makefile                      |   1 +
  arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi |  34 +++
  arch/arm/dts/rk3328-nanopi-r2s.dts         | 317 +++++++++++++++++++++
  board/rockchip/evb_rk3328/MAINTAINERS      |   7 +
  configs/nanopi-r2s-rk3328_defconfig        |  99 +++++++
  5 files changed, 458 insertions(+)

create mode 100644 arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi create mode 100644 arch/arm/dts/rk3328-nanopi-r2s.dts create mode 100644 configs/nanopi-r2s-rk3328_defconfig

arch/arm/dts/Makefile +1 -0
index cee10f533f..a6bd8ea0d8 100644
@@ -107,6 +107,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3308) += \
 
  dtb-$(CONFIG_ROCKCHIP_RK3328) += \
  	rk3328-evb.dtb \
+	rk3328-nanopi-r2s.dtb \
  	rk3328-roc-cc.dtb \
  	rk3328-rock64.dtb \
  	rk3328-rock-pi-e.dtb
arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi new file +34 -0
new file mode 100644
index 0000000000..4159348402
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * (C) Copyright 2018-2019 Rockchip Electronics Co., Ltd
+ * (C) Copyright 2020 David Bauer
+ */
+
+#include "rk3328-u-boot.dtsi"
+#include "rk3328-sdram-ddr4-666.dtsi"
+/ {
+	chosen {
+		u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
+	};
+};
+
+&gpio0 {
+	u-boot,dm-spl;
+};
+
+&pinctrl {
+	u-boot,dm-spl;
+};
+
+&sdmmc0m1_gpio {
+	u-boot,dm-spl;
+};
+
+&pcfg_pull_up_4ma {
+	u-boot,dm-spl;
+};
+
+/* Need this and all the pinctrl/gpio stuff above to set pinmux */
+&vcc_sd {
+	u-boot,dm-spl;
+};
arch/arm/dts/rk3328-nanopi-r2s.dts new file +317 -0
new file mode 100644
index 0000000000..2a3c8b6012
@@ -0,0 +1,317 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2020 David Bauer <[email protected]>
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+#include "rk3328.dtsi"
+
+/ {
+	model = "FriendlyARM NanoPi R2S";
+	compatible = "friendlyarm,nanopi-r2s", "rockchip,rk3328";
+
+	chosen {
+		stdout-path = "serial2:1500000n8";
+	};
+
+	gmac_clkin: external-gmac-clock {
+		compatible = "fixed-clock";
+		clock-frequency = <125000000>;
+		clock-output-names = "gmac_clkin";
+		#clock-cells = <0>;
+	};
+
+	vcc_sd: sdmmc-regulator {
+		compatible = "regulator-fixed";
+		gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&sdmmc0m1_gpio>;
+		regulator-name = "vcc_sd";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		vin-supply = <&vcc_io>;
+	};
+
+	vcc_sys: vcc-sys {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc_sys";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+	};
+
+	vcc_rtl8153: vcc-rtl8153-regulator {
+		compatible = "regulator-fixed";
+		gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&rtl8153_en_drv>;
+		regulator-always-on;
+		regulator-name = "vcc_rtl8153";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		enable-active-high;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&led_pins>;
+
+		sys {
+			gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
+			label = "nanopi-r2s:red:sys";
+		};
+
+		lan {
+			gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
+			label = "nanopi-r2s:green:lan";
+		};
+
+		wan {
+			gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_HIGH>;
+			label = "nanopi-r2s:green:wan";
+		};
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys-polled";
+		poll-interval = <100>;
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&button_pins>;
+
+		reset {
+			label = "Reset Button";
+			gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+			debounce-interval = <50>;
+		};
+	};
+};
+
+&cpu0 {
+	cpu-supply = <&vdd_arm>;
+};
+
+&cpu1 {
+	cpu-supply = <&vdd_arm>;
+};
+
+&cpu2 {
+	cpu-supply = <&vdd_arm>;
+};
+
+&cpu3 {
+	cpu-supply = <&vdd_arm>;
+};
+
+&gmac2io {
+	assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;
+	assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>;
+	clock_in_out = "input";
+	phy-supply = <&vcc_io>;
+	phy-mode = "rgmii";
+	pinctrl-names = "default";
+	pinctrl-0 = <&rgmiim1_pins>;
+	snps,force_thresh_dma_mode;
+	snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
+	snps,reset-active-low;
+	snps,reset-delays-us = <0 10000 50000>;
+	tx_delay = <0x24>;
+	rx_delay = <0x18>;
+	status = "okay";
+};
+
+&i2c1 {
+	status = "okay";
+
+	rk805: rk805 at 18 {
+		compatible = "rockchip,rk805";
+		reg = <0x18>;
+		interrupt-parent = <&gpio2>;
+		interrupts = <6 IRQ_TYPE_LEVEL_LOW>;
+		#clock-cells = <1>;
+		clock-output-names = "xin32k", "rk805-clkout2";
+		gpio-controller;
+		#gpio-cells = <2>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pmic_int_l>;
+		rockchip,system-power-controller;
+		wakeup-source;
+
+		vcc1-supply = <&vcc_sys>;
+		vcc2-supply = <&vcc_sys>;
+		vcc3-supply = <&vcc_sys>;
+		vcc4-supply = <&vcc_sys>;
+		vcc5-supply = <&vcc_io>;
+		vcc6-supply = <&vcc_sys>;
+
+		regulators {
+			vdd_logic: DCDC_REG1 {
+				regulator-name = "vdd_logic";
+				regulator-min-microvolt = <712500>;
+				regulator-max-microvolt = <1450000>;
+				regulator-ramp-delay = <12500>;
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1000000>;
+				};
+			};
+
+			vdd_arm: DCDC_REG2 {
+				regulator-name = "vdd_arm";
+				regulator-min-microvolt = <712500>;
+				regulator-max-microvolt = <1450000>;
+				regulator-ramp-delay = <12500>;
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <950000>;
+				};
+			};
+
+			vcc_ddr: DCDC_REG3 {
+				regulator-name = "vcc_ddr";
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+				};
+			};
+
+			vcc_io: DCDC_REG4 {
+				regulator-name = "vcc_io";
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <3300000>;
+				};
+			};
+
+			vcc_18: LDO_REG1 {
+				regulator-name = "vcc_18";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
+				};
+			};
+
+			vcc18_emmc: LDO_REG2 {
+				regulator-name = "vcc18_emmc";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
+				};
+			};
+
+			vdd_10: LDO_REG3 {
+				regulator-name = "vdd_10";
+				regulator-min-microvolt = <1000000>;
+				regulator-max-microvolt = <1000000>;
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1000000>;
+				};
+			};
+		};
+	};
+};
+
+&io_domains {
+	status = "okay";
+
+	vccio1-supply = <&vcc_io>;
+	vccio2-supply = <&vcc18_emmc>;
+	vccio3-supply = <&vcc_io>;
+	vccio4-supply = <&vcc_18>;
+	vccio5-supply = <&vcc_io>;
+	vccio6-supply = <&vcc_io>;
+	pmuio-supply = <&vcc_io>;
+};
+
+&pinctrl {
+	leds {
+		led_pins: led_pins {
+			rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>,
+							<2 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>,
+							<2 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	button {
+		button_pins: button_pins {
+			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	pmic {
+		pmic_int_l: pmic-int-l {
+			rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
+	usb {
+		rtl8153_en_drv: rtl8153-en-drv {
+			rockchip,pins = <2 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+};
+
+&sdmmc {
+	bus-width = <4>;
+	cap-mmc-highspeed;
+	cap-sd-highspeed;
+	disable-wp;
+	max-frequency = <150000000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_dectn &sdmmc0_bus4>;
+	vmmc-supply = <&vcc_sd>;
+	status = "okay";
+};
+
+&tsadc {
+	rockchip,hw-tshut-mode = <0>;
+	rockchip,hw-tshut-polarity = <0>;
+	status = "okay";
+};
+
+&uart2 {
+	status = "okay";
+};
+
+&u2phy {
+	status = "okay";
+
+	u2phy_host: host-port {
+		status = "okay";
+	};
+};
+
+&usb_host0_ehci {
+	status = "okay";
+};
+
+&usb_host0_ohci {
+	status = "okay";
+};
board/rockchip/evb_rk3328/MAINTAINERS +7 -0
index e7dd59ff4e..14fda46e8f 100644
@@ -5,6 +5,13 @@ F:      board/rockchip/evb_rk3328
  F:      include/configs/evb_rk3328.h
  F:      configs/evb-rk3328_defconfig
 
+NANOPI-R2S-RK3328
+M:      David Bauer <[email protected]>
+S:      Maintained
+F:      configs/nanopi-r2s-rk3328_defconfig
+F:      arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
+F:      arch/arm/dts/rk3328-nanopi-r2s.dts
+
  ROC-RK3328-CC
  M:      Loic Devulder <[email protected]>
  M:      Chen-Yu Tsai <[email protected]>
configs/nanopi-r2s-rk3328_defconfig new file +99 -0
new file mode 100644
index 0000000000..2c028e9d0b
@@ -0,0 +1,99 @@
+CONFIG_ARM=y
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_SYS_TEXT_BASE=0x00200000
+CONFIG_SPL_GPIO_SUPPORT=y
+CONFIG_ENV_OFFSET=0x3F8000
+CONFIG_ROCKCHIP_RK3328=y
+CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
+CONFIG_TPL_LIBCOMMON_SUPPORT=y
+CONFIG_TPL_LIBGENERIC_SUPPORT=y
+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_SPL_STACK_R_ADDR=0x600000
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_DEBUG_UART_BASE=0xFF130000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SMBIOS_PRODUCT_NAME="nanopi_r2s_rk3328"
+CONFIG_DEBUG_UART=y
+CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
+# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_SPL_LOAD_FIT=y
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-nanopi-r2s.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_TPL_SYS_MALLOC_SIMPLE=y
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_I2C_SUPPORT=y
+CONFIG_SPL_POWER_SUPPORT=y
+CONFIG_SPL_ATF=y
+CONFIG_SPL_ATF_NO_PLATFORM_PARAM=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_TPL_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="rk3328-nanopi-r2s"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_TPL_OF_PLATDATA=y
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_TPL_DM=y
+CONFIG_REGMAP=y
+CONFIG_SPL_REGMAP=y
+CONFIG_TPL_REGMAP=y
+CONFIG_SYSCON=y
+CONFIG_SPL_SYSCON=y
+CONFIG_TPL_SYSCON=y
+CONFIG_CLK=y
+CONFIG_SPL_CLK=y
+CONFIG_FASTBOOT_BUF_ADDR=0x800800
+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_ROCKCHIP_GPIO=y
+CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SF_DEFAULT_SPEED=20000000
+CONFIG_DM_ETH=y
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_GMAC_ROCKCHIP=y
+CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
+CONFIG_DM_PMIC=y
+CONFIG_PMIC_RK8XX=y
+CONFIG_SPL_DM_REGULATOR=y
+CONFIG_REGULATOR_PWM=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_SPL_DM_REGULATOR_FIXED=y
+CONFIG_REGULATOR_RK8XX=y
+CONFIG_PWM_ROCKCHIP=y
+CONFIG_RAM=y
+CONFIG_SPL_RAM=y
+CONFIG_TPL_RAM=y
+CONFIG_DM_RESET=y
+CONFIG_BAUDRATE=1500000
+CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYSRESET=y
+# CONFIG_TPL_SYSRESET is not set
+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_OHCI_HCD=y
+CONFIG_USB_OHCI_GENERIC=y
+CONFIG_USB_DWC2=y
+CONFIG_USB_DWC3=y
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_SPL_TINY_MEMSET=y
+CONFIG_TPL_TINY_MEMSET=y
+CONFIG_ERRNO_STR=y
+CONFIG_SMBIOS_MANUFACTURER="pine64"
#2 lore raw

PATCH 1/1 rockchip: rk3328: Add support for FriendlyARM NanoPi R2S

Hi Kenver,

Quoted 3 lines · Kever Yang

Hi David,

??? Does this board dts available in kernel mainline?

<Resending as it didn't reach the U-Boot MX>

I'm in the process of mainlining the board to kernel too (planning to submit it within the next week).

The DTS however is identical to the one I'm submitting here. See
https://github.com/blocktrron/linux-nanopi-r2s

Best wishes
David

Quoted 528 lines

Thanks,

- Kever

Quoted 519 lines · David Bauer

This adds support for the NanoPi R2S from FriendlyArm.

Rockchip RK3328 SoC
1GB DDR4 RAM
Gigabit Ethernet (WAN)
Gigabit Ethernet (USB3) (LAN)
USB 2.0 Host Port
MicroSD slot
Reset button
WAN - LAN - SYS LED

---

? arch/arm/dts/Makefile????????????????????? |?? 1 +
? arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi |? 34 +++
? arch/arm/dts/rk3328-nanopi-r2s.dts???????? | 317 +++++++++++++++++++++
? board/rockchip/evb_rk3328/MAINTAINERS????? |?? 7 +
? configs/nanopi-r2s-rk3328_defconfig??????? |? 99 +++++++

? 5 files changed, 458 insertions(+)
? create mode 100644 arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi ? create mode 100644 arch/arm/dts/rk3328-nanopi-r2s.dts ? create mode 100644 configs/nanopi-r2s-rk3328_defconfig

arch/arm/dts/Makefile +1 -0
index cee10f533f..a6bd8ea0d8 100644
@@ -107,6 +107,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3308) += \
 ? ? dtb-$(CONFIG_ROCKCHIP_RK3328) += \
 ????? rk3328-evb.dtb \
+??? rk3328-nanopi-r2s.dtb \
 ????? rk3328-roc-cc.dtb \
 ????? rk3328-rock64.dtb \

????? rk3328-rock-pi-e.dtb

arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi new file +34 -0
new file mode 100644
index 0000000000..4159348402
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * (C) Copyright 2018-2019 Rockchip Electronics Co., Ltd
+ * (C) Copyright 2020 David Bauer
+ */
+
+#include "rk3328-u-boot.dtsi"
+#include "rk3328-sdram-ddr4-666.dtsi"
+/ {
+??? chosen {
+??????? u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
+??? };
+};
+
+&gpio0 {
+??? u-boot,dm-spl;
+};
+
+&pinctrl {
+??? u-boot,dm-spl;
+};
+
+&sdmmc0m1_gpio {
+??? u-boot,dm-spl;
+};
+
+&pcfg_pull_up_4ma {
+??? u-boot,dm-spl;
+};
+
+/* Need this and all the pinctrl/gpio stuff above to set pinmux */
+&vcc_sd {
+??? u-boot,dm-spl;
+};
arch/arm/dts/rk3328-nanopi-r2s.dts new file +317 -0
new file mode 100644
index 0000000000..2a3c8b6012
@@ -0,0 +1,317 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2020 David Bauer <[email protected]>
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+#include "rk3328.dtsi"
+
+/ {
+??? model = "FriendlyARM NanoPi R2S";
+??? compatible = "friendlyarm,nanopi-r2s", "rockchip,rk3328";
+
+??? chosen {
+??????? stdout-path = "serial2:1500000n8";
+??? };
+
+??? gmac_clkin: external-gmac-clock {
+??????? compatible = "fixed-clock";
+??????? clock-frequency = <125000000>;
+??????? clock-output-names = "gmac_clkin";
+??????? #clock-cells = <0>;
+??? };
+
+??? vcc_sd: sdmmc-regulator {
+??????? compatible = "regulator-fixed";
+??????? gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;
+??????? pinctrl-names = "default";
+??????? pinctrl-0 = <&sdmmc0m1_gpio>;
+??????? regulator-name = "vcc_sd";
+??????? regulator-min-microvolt = <3300000>;
+??????? regulator-max-microvolt = <3300000>;
+??????? vin-supply = <&vcc_io>;
+??? };
+
+??? vcc_sys: vcc-sys {
+??????? compatible = "regulator-fixed";
+??????? regulator-name = "vcc_sys";
+??????? regulator-always-on;
+??????? regulator-boot-on;
+??????? regulator-min-microvolt = <5000000>;
+??????? regulator-max-microvolt = <5000000>;
+??? };
+
+??? vcc_rtl8153: vcc-rtl8153-regulator {
+??????? compatible = "regulator-fixed";
+??????? gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_HIGH>;
+??????? pinctrl-names = "default";
+??????? pinctrl-0 = <&rtl8153_en_drv>;
+??????? regulator-always-on;
+??????? regulator-name = "vcc_rtl8153";
+??????? regulator-min-microvolt = <5000000>;
+??????? regulator-max-microvolt = <5000000>;
+??????? enable-active-high;
+??? };
+
+??? leds {
+??????? compatible = "gpio-leds";
+
+??????? pinctrl-names = "default";
+??????? pinctrl-0 = <&led_pins>;
+
+??????? sys {
+??????????? gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
+??????????? label = "nanopi-r2s:red:sys";
+??????? };
+
+??????? lan {
+??????????? gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
+??????????? label = "nanopi-r2s:green:lan";
+??????? };
+
+??????? wan {
+??????????? gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_HIGH>;
+??????????? label = "nanopi-r2s:green:wan";
+??????? };
+??? };
+
+??? gpio_keys {
+??????? compatible = "gpio-keys-polled";
+??????? poll-interval = <100>;
+
+??????? pinctrl-names = "default";
+??????? pinctrl-0 = <&button_pins>;
+
+??????? reset {
+??????????? label = "Reset Button";
+??????????? gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>;
+??????????? linux,code = <KEY_RESTART>;
+??????????? debounce-interval = <50>;
+??????? };
+??? };
+};
+
+&cpu0 {
+??? cpu-supply = <&vdd_arm>;
+};
+
+&cpu1 {
+??? cpu-supply = <&vdd_arm>;
+};
+
+&cpu2 {
+??? cpu-supply = <&vdd_arm>;
+};
+
+&cpu3 {
+??? cpu-supply = <&vdd_arm>;
+};
+
+&gmac2io {
+??? assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;
+??? assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>;
+??? clock_in_out = "input";
+??? phy-supply = <&vcc_io>;
+??? phy-mode = "rgmii";
+??? pinctrl-names = "default";
+??? pinctrl-0 = <&rgmiim1_pins>;
+??? snps,force_thresh_dma_mode;
+??? snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
+??? snps,reset-active-low;
+??? snps,reset-delays-us = <0 10000 50000>;
+??? tx_delay = <0x24>;
+??? rx_delay = <0x18>;
+??? status = "okay";
+};
+
+&i2c1 {
+??? status = "okay";
+
+??? rk805: rk805 at 18 {
+??????? compatible = "rockchip,rk805";
+??????? reg = <0x18>;
+??????? interrupt-parent = <&gpio2>;
+??????? interrupts = <6 IRQ_TYPE_LEVEL_LOW>;
+??????? #clock-cells = <1>;
+??????? clock-output-names = "xin32k", "rk805-clkout2";
+??????? gpio-controller;
+??????? #gpio-cells = <2>;
+??????? pinctrl-names = "default";
+??????? pinctrl-0 = <&pmic_int_l>;
+??????? rockchip,system-power-controller;
+??????? wakeup-source;
+
+??????? vcc1-supply = <&vcc_sys>;
+??????? vcc2-supply = <&vcc_sys>;
+??????? vcc3-supply = <&vcc_sys>;
+??????? vcc4-supply = <&vcc_sys>;
+??????? vcc5-supply = <&vcc_io>;
+??????? vcc6-supply = <&vcc_sys>;
+
+??????? regulators {
+??????????? vdd_logic: DCDC_REG1 {
+??????????????? regulator-name = "vdd_logic";
+??????????????? regulator-min-microvolt = <712500>;
+??????????????? regulator-max-microvolt = <1450000>;
+??????????????? regulator-ramp-delay = <12500>;
+??????????????? regulator-always-on;
+??????????????? regulator-boot-on;
+??????????????? regulator-state-mem {
+??????????????????? regulator-on-in-suspend;
+??????????????????? regulator-suspend-microvolt = <1000000>;
+??????????????? };
+??????????? };
+
+??????????? vdd_arm: DCDC_REG2 {
+??????????????? regulator-name = "vdd_arm";
+??????????????? regulator-min-microvolt = <712500>;
+??????????????? regulator-max-microvolt = <1450000>;
+??????????????? regulator-ramp-delay = <12500>;
+??????????????? regulator-always-on;
+??????????????? regulator-boot-on;
+??????????????? regulator-state-mem {
+??????????????????? regulator-on-in-suspend;
+??????????????????? regulator-suspend-microvolt = <950000>;
+??????????????? };
+??????????? };
+
+??????????? vcc_ddr: DCDC_REG3 {
+??????????????? regulator-name = "vcc_ddr";
+??????????????? regulator-always-on;
+??????????????? regulator-boot-on;
+??????????????? regulator-state-mem {
+??????????????????? regulator-on-in-suspend;
+??????????????? };
+??????????? };
+
+??????????? vcc_io: DCDC_REG4 {
+??????????????? regulator-name = "vcc_io";
+??????????????? regulator-min-microvolt = <3300000>;
+??????????????? regulator-max-microvolt = <3300000>;
+??????????????? regulator-always-on;
+??????????????? regulator-boot-on;
+??????????????? regulator-state-mem {
+??????????????????? regulator-on-in-suspend;
+??????????????????? regulator-suspend-microvolt = <3300000>;
+??????????????? };
+??????????? };
+
+??????????? vcc_18: LDO_REG1 {
+??????????????? regulator-name = "vcc_18";
+??????????????? regulator-min-microvolt = <1800000>;
+??????????????? regulator-max-microvolt = <1800000>;
+??????????????? regulator-always-on;
+??????????????? regulator-boot-on;
+??????????????? regulator-state-mem {
+??????????????????? regulator-on-in-suspend;
+??????????????????? regulator-suspend-microvolt = <1800000>;
+??????????????? };
+??????????? };
+
+??????????? vcc18_emmc: LDO_REG2 {
+??????????????? regulator-name = "vcc18_emmc";
+??????????????? regulator-min-microvolt = <1800000>;
+??????????????? regulator-max-microvolt = <1800000>;
+??????????????? regulator-always-on;
+??????????????? regulator-boot-on;
+??????????????? regulator-state-mem {
+??????????????????? regulator-on-in-suspend;
+??????????????????? regulator-suspend-microvolt = <1800000>;
+??????????????? };
+??????????? };
+
+??????????? vdd_10: LDO_REG3 {
+??????????????? regulator-name = "vdd_10";
+??????????????? regulator-min-microvolt = <1000000>;
+??????????????? regulator-max-microvolt = <1000000>;
+??????????????? regulator-always-on;
+??????????????? regulator-boot-on;
+??????????????? regulator-state-mem {
+??????????????????? regulator-on-in-suspend;
+??????????????????? regulator-suspend-microvolt = <1000000>;
+??????????????? };
+??????????? };
+??????? };
+??? };
+};
+
+&io_domains {
+??? status = "okay";
+
+??? vccio1-supply = <&vcc_io>;
+??? vccio2-supply = <&vcc18_emmc>;
+??? vccio3-supply = <&vcc_io>;
+??? vccio4-supply = <&vcc_18>;
+??? vccio5-supply = <&vcc_io>;
+??? vccio6-supply = <&vcc_io>;
+??? pmuio-supply = <&vcc_io>;
+};
+
+&pinctrl {
+??? leds {
+??????? led_pins: led_pins {
+??????????? rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>,
+??????????????????????????? <2 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>,
+??????????????????????????? <2 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
+??????? };
+??? };
+
+??? button {
+??????? button_pins: button_pins {
+??????????? rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
+??????? };
+??? };
+
+??? pmic {
+??????? pmic_int_l: pmic-int-l {
+??????????? rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
+??????? };
+??? };
+
+??? usb {
+??????? rtl8153_en_drv: rtl8153-en-drv {
+??????????? rockchip,pins = <2 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
+??????? };
+??? };
+};
+
+&sdmmc {
+??? bus-width = <4>;
+??? cap-mmc-highspeed;
+??? cap-sd-highspeed;
+??? disable-wp;
+??? max-frequency = <150000000>;
+??? pinctrl-names = "default";
+??? pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_dectn &sdmmc0_bus4>;
+??? vmmc-supply = <&vcc_sd>;
+??? status = "okay";
+};
+
+&tsadc {
+??? rockchip,hw-tshut-mode = <0>;
+??? rockchip,hw-tshut-polarity = <0>;
+??? status = "okay";
+};
+
+&uart2 {
+??? status = "okay";
+};
+
+&u2phy {
+??? status = "okay";
+
+??? u2phy_host: host-port {
+??????? status = "okay";
+??? };
+};
+
+&usb_host0_ehci {
+??? status = "okay";
+};
+
+&usb_host0_ohci {
+??? status = "okay";
+};
board/rockchip/evb_rk3328/MAINTAINERS +0 -0
index e7dd59ff4e..14fda46e8f 100644
@@ -5,6 +5,13 @@ F:????? board/rockchip/evb_rk3328

? F:????? include/configs/evb_rk3328.h
? F:????? configs/evb-rk3328_defconfig
? +NANOPI-R2S-RK3328

board/rockchip/evb_rk3328/MAINTAINERS +6 -0
+M:????? David Bauer <[email protected]>
+S:????? Maintained
+F:????? configs/nanopi-r2s-rk3328_defconfig
+F:????? arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
+F:????? arch/arm/dts/rk3328-nanopi-r2s.dts
+

? ROC-RK3328-CC
? M:????? Loic Devulder <[email protected]>
? M:????? Chen-Yu Tsai <[email protected]>

configs/nanopi-r2s-rk3328_defconfig new file +99 -0
new file mode 100644
index 0000000000..2c028e9d0b
@@ -0,0 +1,99 @@
+CONFIG_ARM=y
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_SYS_TEXT_BASE=0x00200000
+CONFIG_SPL_GPIO_SUPPORT=y
+CONFIG_ENV_OFFSET=0x3F8000
+CONFIG_ROCKCHIP_RK3328=y
+CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
+CONFIG_TPL_LIBCOMMON_SUPPORT=y
+CONFIG_TPL_LIBGENERIC_SUPPORT=y
+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_SPL_STACK_R_ADDR=0x600000
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_DEBUG_UART_BASE=0xFF130000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SMBIOS_PRODUCT_NAME="nanopi_r2s_rk3328"
+CONFIG_DEBUG_UART=y
+CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
+# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_SPL_LOAD_FIT=y
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-nanopi-r2s.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_TPL_SYS_MALLOC_SIMPLE=y
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_I2C_SUPPORT=y
+CONFIG_SPL_POWER_SUPPORT=y
+CONFIG_SPL_ATF=y
+CONFIG_SPL_ATF_NO_PLATFORM_PARAM=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_TPL_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="rk3328-nanopi-r2s"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_TPL_OF_PLATDATA=y
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_TPL_DM=y
+CONFIG_REGMAP=y
+CONFIG_SPL_REGMAP=y
+CONFIG_TPL_REGMAP=y
+CONFIG_SYSCON=y
+CONFIG_SPL_SYSCON=y
+CONFIG_TPL_SYSCON=y
+CONFIG_CLK=y
+CONFIG_SPL_CLK=y
+CONFIG_FASTBOOT_BUF_ADDR=0x800800
+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_ROCKCHIP_GPIO=y
+CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SF_DEFAULT_SPEED=20000000
+CONFIG_DM_ETH=y
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_GMAC_ROCKCHIP=y
+CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
+CONFIG_DM_PMIC=y
+CONFIG_PMIC_RK8XX=y
+CONFIG_SPL_DM_REGULATOR=y
+CONFIG_REGULATOR_PWM=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_SPL_DM_REGULATOR_FIXED=y
+CONFIG_REGULATOR_RK8XX=y
+CONFIG_PWM_ROCKCHIP=y
+CONFIG_RAM=y
+CONFIG_SPL_RAM=y
+CONFIG_TPL_RAM=y
+CONFIG_DM_RESET=y
+CONFIG_BAUDRATE=1500000
+CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYSRESET=y
+# CONFIG_TPL_SYSRESET is not set
+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_OHCI_HCD=y
+CONFIG_USB_OHCI_GENERIC=y
+CONFIG_USB_DWC2=y
+CONFIG_USB_DWC3=y
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_SPL_TINY_MEMSET=y
+CONFIG_TPL_TINY_MEMSET=y
+CONFIG_ERRNO_STR=y
+CONFIG_SMBIOS_MANUFACTURER="pine64"

A message that is not in the archive (sent off-list or not yet received): [email protected]

#4 lore raw

PATCH 1/1 rockchip: rk3328: Add support for FriendlyARM NanoPi R2S

Hi David,

??? You can send new version patch when with commit id in the mainline
kernel when it's available.

Thanks,

- Kever

? 2020/7/22 ??4:33, David Bauer ??:

Quoted 542 lines

Hi Kever,

Quoted 3 lines · Kever Yang

Hi David,

??? Does this board dts available in kernel mainline?

I'm in the process of mainlining the board to kernel too (planning to submit it within the next week).

The DTS however is identical to the one I'm submitting here. See
https://github.com/blocktrron/linux-nanopi-r2s

Best wishes
David

Quoted 526 lines

Thanks,

- Kever

Quoted 519 lines · David Bauer

This adds support for the NanoPi R2S from FriendlyArm.

Rockchip RK3328 SoC
1GB DDR4 RAM
Gigabit Ethernet (WAN)
Gigabit Ethernet (USB3) (LAN)
USB 2.0 Host Port
MicroSD slot
Reset button
WAN - LAN - SYS LED

---

 ? arch/arm/dts/Makefile????????????????????? |?? 1 +
 ? arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi |? 34 +++
 ? arch/arm/dts/rk3328-nanopi-r2s.dts???????? | 317 +++++++++++++++++++++
 ? board/rockchip/evb_rk3328/MAINTAINERS????? |?? 7 +
 ? configs/nanopi-r2s-rk3328_defconfig??????? |? 99 +++++++

? 5 files changed, 458 insertions(+)
? create mode 100644 arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi ? create mode 100644 arch/arm/dts/rk3328-nanopi-r2s.dts ? create mode 100644 configs/nanopi-r2s-rk3328_defconfig

arch/arm/dts/Makefile +1 -0
index cee10f533f..a6bd8ea0d8 100644
@@ -107,6 +107,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3308) += \
 ? ? dtb-$(CONFIG_ROCKCHIP_RK3328) += \
 ????? rk3328-evb.dtb \
+??? rk3328-nanopi-r2s.dtb \
 ????? rk3328-roc-cc.dtb \
 ????? rk3328-rock64.dtb \
 ????? rk3328-rock-pi-e.dtb
arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi new file +34 -0
new file mode 100644
index 0000000000..4159348402
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * (C) Copyright 2018-2019 Rockchip Electronics Co., Ltd
+ * (C) Copyright 2020 David Bauer
+ */
+
+#include "rk3328-u-boot.dtsi"
+#include "rk3328-sdram-ddr4-666.dtsi"
+/ {
+??? chosen {
+??????? u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
+??? };
+};
+
+&gpio0 {
+??? u-boot,dm-spl;
+};
+
+&pinctrl {
+??? u-boot,dm-spl;
+};
+
+&sdmmc0m1_gpio {
+??? u-boot,dm-spl;
+};
+
+&pcfg_pull_up_4ma {
+??? u-boot,dm-spl;
+};
+
+/* Need this and all the pinctrl/gpio stuff above to set pinmux */
+&vcc_sd {
+??? u-boot,dm-spl;
+};
arch/arm/dts/rk3328-nanopi-r2s.dts new file +317 -0
new file mode 100644
index 0000000000..2a3c8b6012
@@ -0,0 +1,317 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2020 David Bauer <[email protected]>
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+#include "rk3328.dtsi"
+
+/ {
+??? model = "FriendlyARM NanoPi R2S";
+??? compatible = "friendlyarm,nanopi-r2s", "rockchip,rk3328";
+
+??? chosen {
+??????? stdout-path = "serial2:1500000n8";
+??? };
+
+??? gmac_clkin: external-gmac-clock {
+??????? compatible = "fixed-clock";
+??????? clock-frequency = <125000000>;
+??????? clock-output-names = "gmac_clkin";
+??????? #clock-cells = <0>;
+??? };
+
+??? vcc_sd: sdmmc-regulator {
+??????? compatible = "regulator-fixed";
+??????? gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;
+??????? pinctrl-names = "default";
+??????? pinctrl-0 = <&sdmmc0m1_gpio>;
+??????? regulator-name = "vcc_sd";
+??????? regulator-min-microvolt = <3300000>;
+??????? regulator-max-microvolt = <3300000>;
+??????? vin-supply = <&vcc_io>;
+??? };
+
+??? vcc_sys: vcc-sys {
+??????? compatible = "regulator-fixed";
+??????? regulator-name = "vcc_sys";
+??????? regulator-always-on;
+??????? regulator-boot-on;
+??????? regulator-min-microvolt = <5000000>;
+??????? regulator-max-microvolt = <5000000>;
+??? };
+
+??? vcc_rtl8153: vcc-rtl8153-regulator {
+??????? compatible = "regulator-fixed";
+??????? gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_HIGH>;
+??????? pinctrl-names = "default";
+??????? pinctrl-0 = <&rtl8153_en_drv>;
+??????? regulator-always-on;
+??????? regulator-name = "vcc_rtl8153";
+??????? regulator-min-microvolt = <5000000>;
+??????? regulator-max-microvolt = <5000000>;
+??????? enable-active-high;
+??? };
+
+??? leds {
+??????? compatible = "gpio-leds";
+
+??????? pinctrl-names = "default";
+??????? pinctrl-0 = <&led_pins>;
+
+??????? sys {
+??????????? gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
+??????????? label = "nanopi-r2s:red:sys";
+??????? };
+
+??????? lan {
+??????????? gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
+??????????? label = "nanopi-r2s:green:lan";
+??????? };
+
+??????? wan {
+??????????? gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_HIGH>;
+??????????? label = "nanopi-r2s:green:wan";
+??????? };
+??? };
+
+??? gpio_keys {
+??????? compatible = "gpio-keys-polled";
+??????? poll-interval = <100>;
+
+??????? pinctrl-names = "default";
+??????? pinctrl-0 = <&button_pins>;
+
+??????? reset {
+??????????? label = "Reset Button";
+??????????? gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>;
+??????????? linux,code = <KEY_RESTART>;
+??????????? debounce-interval = <50>;
+??????? };
+??? };
+};
+
+&cpu0 {
+??? cpu-supply = <&vdd_arm>;
+};
+
+&cpu1 {
+??? cpu-supply = <&vdd_arm>;
+};
+
+&cpu2 {
+??? cpu-supply = <&vdd_arm>;
+};
+
+&cpu3 {
+??? cpu-supply = <&vdd_arm>;
+};
+
+&gmac2io {
+??? assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;
+??? assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>;
+??? clock_in_out = "input";
+??? phy-supply = <&vcc_io>;
+??? phy-mode = "rgmii";
+??? pinctrl-names = "default";
+??? pinctrl-0 = <&rgmiim1_pins>;
+??? snps,force_thresh_dma_mode;
+??? snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
+??? snps,reset-active-low;
+??? snps,reset-delays-us = <0 10000 50000>;
+??? tx_delay = <0x24>;
+??? rx_delay = <0x18>;
+??? status = "okay";
+};
+
+&i2c1 {
+??? status = "okay";
+
+??? rk805: rk805 at 18 {
+??????? compatible = "rockchip,rk805";
+??????? reg = <0x18>;
+??????? interrupt-parent = <&gpio2>;
+??????? interrupts = <6 IRQ_TYPE_LEVEL_LOW>;
+??????? #clock-cells = <1>;
+??????? clock-output-names = "xin32k", "rk805-clkout2";
+??????? gpio-controller;
+??????? #gpio-cells = <2>;
+??????? pinctrl-names = "default";
+??????? pinctrl-0 = <&pmic_int_l>;
+??????? rockchip,system-power-controller;
+??????? wakeup-source;
+
+??????? vcc1-supply = <&vcc_sys>;
+??????? vcc2-supply = <&vcc_sys>;
+??????? vcc3-supply = <&vcc_sys>;
+??????? vcc4-supply = <&vcc_sys>;
+??????? vcc5-supply = <&vcc_io>;
+??????? vcc6-supply = <&vcc_sys>;
+
+??????? regulators {
+??????????? vdd_logic: DCDC_REG1 {
+??????????????? regulator-name = "vdd_logic";
+??????????????? regulator-min-microvolt = <712500>;
+??????????????? regulator-max-microvolt = <1450000>;
+??????????????? regulator-ramp-delay = <12500>;
+??????????????? regulator-always-on;
+??????????????? regulator-boot-on;
+??????????????? regulator-state-mem {
+??????????????????? regulator-on-in-suspend;
+??????????????????? regulator-suspend-microvolt = <1000000>;
+??????????????? };
+??????????? };
+
+??????????? vdd_arm: DCDC_REG2 {
+??????????????? regulator-name = "vdd_arm";
+??????????????? regulator-min-microvolt = <712500>;
+??????????????? regulator-max-microvolt = <1450000>;
+??????????????? regulator-ramp-delay = <12500>;
+??????????????? regulator-always-on;
+??????????????? regulator-boot-on;
+??????????????? regulator-state-mem {
+??????????????????? regulator-on-in-suspend;
+??????????????????? regulator-suspend-microvolt = <950000>;
+??????????????? };
+??????????? };
+
+??????????? vcc_ddr: DCDC_REG3 {
+??????????????? regulator-name = "vcc_ddr";
+??????????????? regulator-always-on;
+??????????????? regulator-boot-on;
+??????????????? regulator-state-mem {
+??????????????????? regulator-on-in-suspend;
+??????????????? };
+??????????? };
+
+??????????? vcc_io: DCDC_REG4 {
+??????????????? regulator-name = "vcc_io";
+??????????????? regulator-min-microvolt = <3300000>;
+??????????????? regulator-max-microvolt = <3300000>;
+??????????????? regulator-always-on;
+??????????????? regulator-boot-on;
+??????????????? regulator-state-mem {
+??????????????????? regulator-on-in-suspend;
+??????????????????? regulator-suspend-microvolt = <3300000>;
+??????????????? };
+??????????? };
+
+??????????? vcc_18: LDO_REG1 {
+??????????????? regulator-name = "vcc_18";
+??????????????? regulator-min-microvolt = <1800000>;
+??????????????? regulator-max-microvolt = <1800000>;
+??????????????? regulator-always-on;
+??????????????? regulator-boot-on;
+??????????????? regulator-state-mem {
+??????????????????? regulator-on-in-suspend;
+??????????????????? regulator-suspend-microvolt = <1800000>;
+??????????????? };
+??????????? };
+
+??????????? vcc18_emmc: LDO_REG2 {
+??????????????? regulator-name = "vcc18_emmc";
+??????????????? regulator-min-microvolt = <1800000>;
+??????????????? regulator-max-microvolt = <1800000>;
+??????????????? regulator-always-on;
+??????????????? regulator-boot-on;
+??????????????? regulator-state-mem {
+??????????????????? regulator-on-in-suspend;
+??????????????????? regulator-suspend-microvolt = <1800000>;
+??????????????? };
+??????????? };
+
+??????????? vdd_10: LDO_REG3 {
+??????????????? regulator-name = "vdd_10";
+??????????????? regulator-min-microvolt = <1000000>;
+??????????????? regulator-max-microvolt = <1000000>;
+??????????????? regulator-always-on;
+??????????????? regulator-boot-on;
+??????????????? regulator-state-mem {
+??????????????????? regulator-on-in-suspend;
+??????????????????? regulator-suspend-microvolt = <1000000>;
+??????????????? };
+??????????? };
+??????? };
+??? };
+};
+
+&io_domains {
+??? status = "okay";
+
+??? vccio1-supply = <&vcc_io>;
+??? vccio2-supply = <&vcc18_emmc>;
+??? vccio3-supply = <&vcc_io>;
+??? vccio4-supply = <&vcc_18>;
+??? vccio5-supply = <&vcc_io>;
+??? vccio6-supply = <&vcc_io>;
+??? pmuio-supply = <&vcc_io>;
+};
+
+&pinctrl {
+??? leds {
+??????? led_pins: led_pins {
+??????????? rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>,
+??????????????????????????? <2 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>,
+??????????????????????????? <2 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
+??????? };
+??? };
+
+??? button {
+??????? button_pins: button_pins {
+??????????? rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
+??????? };
+??? };
+
+??? pmic {
+??????? pmic_int_l: pmic-int-l {
+??????????? rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
+??????? };
+??? };
+
+??? usb {
+??????? rtl8153_en_drv: rtl8153-en-drv {
+??????????? rockchip,pins = <2 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
+??????? };
+??? };
+};
+
+&sdmmc {
+??? bus-width = <4>;
+??? cap-mmc-highspeed;
+??? cap-sd-highspeed;
+??? disable-wp;
+??? max-frequency = <150000000>;
+??? pinctrl-names = "default";
+??? pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_dectn &sdmmc0_bus4>;
+??? vmmc-supply = <&vcc_sd>;
+??? status = "okay";
+};
+
+&tsadc {
+??? rockchip,hw-tshut-mode = <0>;
+??? rockchip,hw-tshut-polarity = <0>;
+??? status = "okay";
+};
+
+&uart2 {
+??? status = "okay";
+};
+
+&u2phy {
+??? status = "okay";
+
+??? u2phy_host: host-port {
+??????? status = "okay";
+??? };
+};
+
+&usb_host0_ehci {
+??? status = "okay";
+};
+
+&usb_host0_ohci {
+??? status = "okay";
+};
board/rockchip/evb_rk3328/MAINTAINERS +6 -0
index e7dd59ff4e..14fda46e8f 100644
@@ -5,6 +5,13 @@ F:????? board/rockchip/evb_rk3328
 ? F:????? include/configs/evb_rk3328.h
 ? F:????? configs/evb-rk3328_defconfig
 ? +NANOPI-R2S-RK3328
+M:????? David Bauer <[email protected]>
+S:????? Maintained
+F:????? configs/nanopi-r2s-rk3328_defconfig
+F:????? arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
+F:????? arch/arm/dts/rk3328-nanopi-r2s.dts
+
 ? ROC-RK3328-CC
 ? M:????? Loic Devulder <[email protected]>
 ? M:????? Chen-Yu Tsai <[email protected]>
configs/nanopi-r2s-rk3328_defconfig new file +99 -0
new file mode 100644
index 0000000000..2c028e9d0b
@@ -0,0 +1,99 @@
+CONFIG_ARM=y
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_SYS_TEXT_BASE=0x00200000
+CONFIG_SPL_GPIO_SUPPORT=y
+CONFIG_ENV_OFFSET=0x3F8000
+CONFIG_ROCKCHIP_RK3328=y
+CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
+CONFIG_TPL_LIBCOMMON_SUPPORT=y
+CONFIG_TPL_LIBGENERIC_SUPPORT=y
+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_SPL_STACK_R_ADDR=0x600000
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_DEBUG_UART_BASE=0xFF130000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SMBIOS_PRODUCT_NAME="nanopi_r2s_rk3328"
+CONFIG_DEBUG_UART=y
+CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
+# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_SPL_LOAD_FIT=y
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-nanopi-r2s.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_TPL_SYS_MALLOC_SIMPLE=y
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_I2C_SUPPORT=y
+CONFIG_SPL_POWER_SUPPORT=y
+CONFIG_SPL_ATF=y
+CONFIG_SPL_ATF_NO_PLATFORM_PARAM=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_TPL_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="rk3328-nanopi-r2s"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_TPL_OF_PLATDATA=y
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_TPL_DM=y
+CONFIG_REGMAP=y
+CONFIG_SPL_REGMAP=y
+CONFIG_TPL_REGMAP=y
+CONFIG_SYSCON=y
+CONFIG_SPL_SYSCON=y
+CONFIG_TPL_SYSCON=y
+CONFIG_CLK=y
+CONFIG_SPL_CLK=y
+CONFIG_FASTBOOT_BUF_ADDR=0x800800
+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_ROCKCHIP_GPIO=y
+CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SF_DEFAULT_SPEED=20000000
+CONFIG_DM_ETH=y
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_GMAC_ROCKCHIP=y
+CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
+CONFIG_DM_PMIC=y
+CONFIG_PMIC_RK8XX=y
+CONFIG_SPL_DM_REGULATOR=y
+CONFIG_REGULATOR_PWM=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_SPL_DM_REGULATOR_FIXED=y
+CONFIG_REGULATOR_RK8XX=y
+CONFIG_PWM_ROCKCHIP=y
+CONFIG_RAM=y
+CONFIG_SPL_RAM=y
+CONFIG_TPL_RAM=y
+CONFIG_DM_RESET=y
+CONFIG_BAUDRATE=1500000
+CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYSRESET=y
+# CONFIG_TPL_SYSRESET is not set
+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_OHCI_HCD=y
+CONFIG_USB_OHCI_GENERIC=y
+CONFIG_USB_DWC2=y
+CONFIG_USB_DWC3=y
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_SPL_TINY_MEMSET=y
+CONFIG_TPL_TINY_MEMSET=y
+CONFIG_ERRNO_STR=y
+CONFIG_SMBIOS_MANUFACTURER="pine64"