diff --git a/package/boot/uboot-rockchip/patches/202-arm-dts-rockchip-rename-and-label-gpio-keys-subnodes.patch b/package/boot/uboot-rockchip/patches/202-arm-dts-rockchip-rename-and-label-gpio-keys-subnodes.patch deleted file mode 100644 index 26bdaa4f2f..0000000000 --- a/package/boot/uboot-rockchip/patches/202-arm-dts-rockchip-rename-and-label-gpio-keys-subnodes.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f5c5391cc60a675ba38ece5f62b5d113fd57ee45 Mon Sep 17 00:00:00 2001 -From: Tianling Shen -Date: Sun, 27 Dec 2020 05:14:47 +0000 -Subject: [PATCH] arm: dts: rockchip: rename and label gpio-keys subnodes - -Current dtsi files does not allow to add new gpio labels -in device specific dts, so let's rename and label it. - -Signed-off-by: Tianling Shen ---- - arch/arm/dts/rk3399-nanopi4.dtsi | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/arch/arm/dts/rk3399-nanopi4.dtsi -+++ b/arch/arm/dts/rk3399-nanopi4.dtsi -@@ -99,11 +99,11 @@ - regulator-name = "vbus_typec"; - }; - -- gpio-keys { -+ keys: gpio-keys { - compatible = "gpio-keys"; - autorepeat; - pinctrl-names = "default"; -- pinctrl-0 = <&power_key>; -+ pinctrl-0 = <&key_pins>; - - power { - debounce-interval = <100>; -@@ -550,7 +550,7 @@ - }; - - rockchip-key { -- power_key: power-key { -+ key_pins: key-pins { - rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; diff --git a/package/boot/uboot-rockchip/patches/203-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch b/package/boot/uboot-rockchip/patches/202-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch similarity index 79% rename from package/boot/uboot-rockchip/patches/203-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch rename to package/boot/uboot-rockchip/patches/202-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch index e37b5283ce..74c7c3f4a5 100644 --- a/package/boot/uboot-rockchip/patches/203-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch +++ b/package/boot/uboot-rockchip/patches/202-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch @@ -1,6 +1,6 @@ -From 6997a44b545a60b82031c02ea144abc8df561352 Mon Sep 17 00:00:00 2001 +From 8dc76bbce30c3f63f290f008f8410c00fee13c9a Mon Sep 17 00:00:00 2001 From: Tianling Shen -Date: Fri, 25 Dec 2020 13:11:28 +0000 +Date: Fri, 8 Jan 2021 05:55:50 +0000 Subject: [PATCH] rockchip: rk3399: Add support for FriendlyARM NanoPi R4S This adds support for the NanoPi R4S from FriendlyArm. @@ -22,10 +22,10 @@ Signed-off-by: Marty Jones --- arch/arm/dts/Makefile | 1 + arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi | 9 ++ - arch/arm/dts/rk3399-nanopi-r4s.dts | 163 +++++++++++++++++++++ + arch/arm/dts/rk3399-nanopi-r4s.dts | 178 +++++++++++++++++++++ board/friendlyarm/nanopi4/MAINTAINERS | 6 + configs/nanopi-r4s-rk3399_defconfig | 63 ++++++++ - 5 files changed, 242 insertions(+) + 5 files changed, 257 insertions(+) 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-rk3399_defconfig @@ -54,7 +54,7 @@ Signed-off-by: Marty Jones +#include "rk3399-sdram-ddr3-1866.dtsi" --- /dev/null +++ b/arch/arm/dts/rk3399-nanopi-r4s.dts -@@ -0,0 +1,163 @@ +@@ -0,0 +1,178 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2020 Jensen Huang @@ -74,7 +74,42 @@ Signed-off-by: Marty Jones + led-failsafe = &sys_led; + led-running = &sys_led; + led-upgrade = &sys_led; -+ ethernet1 = &r8169; ++ }; ++ ++ /delete-node/ gpio-leds; ++ gpio-leds { ++ compatible = "gpio-leds"; ++ pinctrl-0 = <&lan_led_pin>, <&sys_led_pin>, <&wan_led_pin>; ++ pinctrl-names = "default"; ++ ++ lan_led: led-0 { ++ gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>; ++ label = "nanopi-r4s:green:lan"; ++ }; ++ ++ sys_led: led-1 { ++ gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; ++ label = "nanopi-r4s:red:sys"; ++ }; ++ ++ wan_led: led-2 { ++ gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; ++ label = "nanopi-r4s:green:wan"; ++ }; ++ }; ++ ++ /delete-node/ gpio-keys; ++ gpio-keys { ++ compatible = "gpio-keys"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&reset_button_pin>; ++ ++ reset { ++ debounce-interval = <50>; ++ gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>; ++ label = "reset"; ++ linux,code = ; ++ }; + }; + + vdd_5v: vdd-5v { @@ -133,47 +168,6 @@ Signed-off-by: Marty Jones + status = "disabled"; +}; + -+&keys { -+ reset { -+ label = "reset"; -+ gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>; -+ linux,code = ; -+ debounce-interval = <50>; -+ }; -+}; -+ -+&key_pins { -+ rockchip,pins = -+ <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>, -+ <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>; -+}; -+ -+&leds { -+ /delete-node/ status; -+ -+ lan_led: led-0 { -+ gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>; -+ label = "nanopi-r4s:green:lan"; -+ }; -+ -+ sys_led: led-1 { -+ gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; -+ label = "nanopi-r4s:red:sys"; -+ }; -+ -+ wan_led: led-2 { -+ gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; -+ label = "nanopi-r4s:green:wan"; -+ }; -+}; -+ -+&leds_gpio { -+ rockchip,pins = -+ <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, -+ <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>, -+ <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; -+}; -+ +&pcie0 { + max-link-speed = <1>; + num-lanes = <1>; @@ -183,10 +177,29 @@ Signed-off-by: Marty Jones + reg = <0x00000000 0 0 0 0>; + #address-cells = <3>; + #size-cells = <2>; ++ }; ++}; + -+ r8169: pcie@0,0 { -+ reg = <0x000000 0 0 0 0>; -+ local-mac-address = [ 00 00 00 00 00 00 ]; ++&pinctrl { ++ /delete-node/ gpio-leds; ++ gpio-leds { ++ 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>; ++ }; ++ }; ++ ++ /delete-node/ rockchip-key; ++ rockchip-key { ++ reset_button_pin: reset-button-pin { ++ rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; +}; @@ -200,7 +213,9 @@ Signed-off-by: Marty Jones +}; + +&sdmmc { -+ host-index-min = <1>; ++ sd-uhs-sdr12; ++ sd-uhs-sdr25; ++ sd-uhs-sdr50; +}; + +&u2phy0_host { diff --git a/target/linux/rockchip/patches-5.4/200-arm64-dts-rockchip-rename-and-label-gpio-keys-subnod.patch b/target/linux/rockchip/patches-5.4/200-arm64-dts-rockchip-rename-and-label-gpio-keys-subnod.patch deleted file mode 100644 index ebc1a9ce5c..0000000000 --- a/target/linux/rockchip/patches-5.4/200-arm64-dts-rockchip-rename-and-label-gpio-keys-subnod.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 14b845b26c9ab88672d164a7ed86773d6eb9ed3f Mon Sep 17 00:00:00 2001 -From: Tianling Shen -Date: Sun, 27 Dec 2020 05:37:26 +0000 -Subject: [PATCH] arm64: dts: rockchip: rename and label gpio-keys subnodes - -Current dtsi files does not allow to add new gpio labels -in device specific dts, so let's rename and label it. - -Signed-off-by: Tianling Shen ---- - arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi -@@ -78,11 +78,11 @@ - regulator-name = "vbus_typec"; - }; - -- gpio-keys { -+ keys: gpio-keys { - compatible = "gpio-keys"; - autorepeat; - pinctrl-names = "default"; -- pinctrl-0 = <&power_key>; -+ pinctrl-0 = <&key_pins>; - - power { - debounce-interval = <100>; -@@ -519,7 +519,7 @@ - }; - - rockchip-key { -- power_key: power-key { -+ key_pins: key-pins { - rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; diff --git a/target/linux/rockchip/patches-5.4/201-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch b/target/linux/rockchip/patches-5.4/200-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch similarity index 68% rename from target/linux/rockchip/patches-5.4/201-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch rename to target/linux/rockchip/patches-5.4/200-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch index 4e4459bf6f..9fb0b0eebe 100644 --- a/target/linux/rockchip/patches-5.4/201-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch +++ b/target/linux/rockchip/patches-5.4/200-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch @@ -1,6 +1,6 @@ -From 67180d1b17d881b5d545650ae2894139754f94e4 Mon Sep 17 00:00:00 2001 +From 11c2b38cf0a04b0edb3eabae24fb1484489725e2 Mon Sep 17 00:00:00 2001 From: Tianling Shen -Date: Fri, 25 Dec 2020 11:55:35 +0000 +Date: Fri, 8 Jan 2021 07:12:30 +0000 Subject: [PATCH] rockchip: rk3399: Add support for FriendlyARM NanoPi R4S This adds support for the NanoPi R4S from FriendlyArm. @@ -21,8 +21,8 @@ Co-authored-by: Marty Jones Signed-off-by: Marty Jones --- arch/arm64/boot/dts/rockchip/Makefile | 1 + - .../boot/dts/rockchip/rk3399-nanopi-r4s.dts | 163 ++++++++++++++++++ - 2 files changed, 164 insertions(+) + .../boot/dts/rockchip/rk3399-nanopi-r4s.dts | 178 ++++++++++++++++++ + 2 files changed, 179 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts --- a/arch/arm64/boot/dts/rockchip/Makefile @@ -37,7 +37,7 @@ Signed-off-by: Marty Jones dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts -@@ -0,0 +1,163 @@ +@@ -0,0 +1,178 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2020 Jensen Huang @@ -57,7 +57,42 @@ Signed-off-by: Marty Jones + led-failsafe = &sys_led; + led-running = &sys_led; + led-upgrade = &sys_led; -+ ethernet1 = &r8169; ++ }; ++ ++ /delete-node/ gpio-leds; ++ gpio-leds { ++ compatible = "gpio-leds"; ++ pinctrl-0 = <&lan_led_pin>, <&sys_led_pin>, <&wan_led_pin>; ++ pinctrl-names = "default"; ++ ++ lan_led: led-0 { ++ gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>; ++ label = "nanopi-r4s:green:lan"; ++ }; ++ ++ sys_led: led-1 { ++ gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; ++ label = "nanopi-r4s:red:sys"; ++ }; ++ ++ wan_led: led-2 { ++ gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; ++ label = "nanopi-r4s:green:wan"; ++ }; ++ }; ++ ++ /delete-node/ gpio-keys; ++ gpio-keys { ++ compatible = "gpio-keys"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&reset_button_pin>; ++ ++ reset { ++ debounce-interval = <50>; ++ gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>; ++ label = "reset"; ++ linux,code = ; ++ }; + }; + + vdd_5v: vdd-5v { @@ -116,47 +151,6 @@ Signed-off-by: Marty Jones + status = "disabled"; +}; + -+&keys { -+ reset { -+ label = "reset"; -+ gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>; -+ linux,code = ; -+ debounce-interval = <50>; -+ }; -+}; -+ -+&key_pins { -+ rockchip,pins = -+ <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>, -+ <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>; -+}; -+ -+&leds { -+ /delete-node/ status; -+ -+ lan_led: led-0 { -+ gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>; -+ label = "nanopi-r4s:green:lan"; -+ }; -+ -+ sys_led: led-1 { -+ gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; -+ label = "nanopi-r4s:red:sys"; -+ }; -+ -+ wan_led: led-2 { -+ gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; -+ label = "nanopi-r4s:green:wan"; -+ }; -+}; -+ -+&leds_gpio { -+ rockchip,pins = -+ <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, -+ <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>, -+ <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; -+}; -+ +&pcie0 { + max-link-speed = <1>; + num-lanes = <1>; @@ -166,10 +160,29 @@ Signed-off-by: Marty Jones + reg = <0x00000000 0 0 0 0>; + #address-cells = <3>; + #size-cells = <2>; ++ }; ++}; + -+ r8169: pcie@0,0 { -+ reg = <0x000000 0 0 0 0>; -+ local-mac-address = [ 00 00 00 00 00 00 ]; ++&pinctrl { ++ /delete-node/ gpio-leds; ++ gpio-leds { ++ 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>; ++ }; ++ }; ++ ++ /delete-node/ rockchip-key; ++ rockchip-key { ++ reset_button_pin: reset-button-pin { ++ rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; +}; @@ -183,7 +196,9 @@ Signed-off-by: Marty Jones +}; + +&sdmmc { -+ host-index-min = <1>; ++ sd-uhs-sdr12; ++ sd-uhs-sdr25; ++ sd-uhs-sdr50; +}; + +&u2phy0_host {