diff --git a/target/linux/rockchip/patches-5.4/001-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch b/target/linux/rockchip/patches-5.4/001-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch index ec86a0fc00..6213a30ca8 100644 --- a/target/linux/rockchip/patches-5.4/001-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch +++ b/target/linux/rockchip/patches-5.4/001-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch @@ -1,7 +1,8 @@ -From c13444e12a638ec059f50b512f6edbf461015bbd Mon Sep 17 00:00:00 2001 +From 1d2f7edaeefe5a6985b50a012eb8e6172df8bbea Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 10 Jul 2020 15:57:46 +0200 -Subject: [PATCH] rockchip: rk3328: Add support for FriendlyARM NanoPi R2S +Subject: [PATCH v2 2/2] rockchip: rk3328: Add support for FriendlyARM NanoPi + R2S This adds support for the NanoPi R2S from FriendlyARM. @@ -16,9 +17,17 @@ WAN - LAN - SYS LED Signed-off-by: David Bauer --- +Changes in v2: + - Enable SD UHS modes + - Add startup delay to SDIO regulator to improve + issues reported with some cards + - Fix PMIC interrupt pin + - Add pinctrl node for ethernet-PHY + - Fix various formatting issues + arch/arm64/boot/dts/rockchip/Makefile | 1 + - .../boot/dts/rockchip/rk3328-nanopi-r2s.dts | 365 ++++++++++++++++++ - 2 files changed, 366 insertions(+) + .../boot/dts/rockchip/rk3328-nanopi-r2s.dts | 367 ++++++++++++++++++ + 2 files changed, 368 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile @@ -35,10 +44,10 @@ index b87b1f773083..20055c51e150 100644 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts new file mode 100644 -index 000000000000..9bfbe80af0d4 +index 000000000000..51c100ea9211 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts -@@ -0,0 +1,365 @@ +@@ -0,0 +1,367 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2020 David Bauer @@ -105,6 +114,7 @@ index 000000000000..9bfbe80af0d4 + pinctrl-0 = <&sdmmc0m1_gpio>; + pinctrl-names = "default"; + regulator-name = "vcc_sd"; ++ regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc_io_33>; @@ -122,6 +132,7 @@ index 000000000000..9bfbe80af0d4 + regulator-max-microvolt = <3300000>; + regulator-settling-time-us = <5000>; + regulator-type = "voltage"; ++ startup-delay-us = <2000>; + states = <1800000 0x1 + 3300000 0x0>; + vin-supply = <&vcc_io_33>;