Minor tweaks to NanoPi R4S configuration (#2543)
This commit is contained in:
Piotr Szczepanik
GitHub
parent
93bad09e93
commit
d5ab47bff7
@ -4,5 +4,5 @@ BOARDFAMILY="rk3399"
|
||||
BOOTCONFIG="nanopi-r4s-rk3399_defconfig"
|
||||
KERNEL_TARGET="current,dev"
|
||||
DEFAULT_CONSOLE="serial"
|
||||
MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu"
|
||||
MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
|
||||
BUILD_DESKTOP="no"
|
||||
|
||||
@ -1,36 +1,17 @@
|
||||
From 7117f55d19dc3b902b8ce7e28b944d30105069a5 Mon Sep 17 00:00:00 2001
|
||||
From: jensen <jensenhuang@friendlyarm.com>
|
||||
Date: Fri, 6 Nov 2020 10:40:23 +0800
|
||||
Subject: [PATCH] arm64: dts: rk3399: Add dts file for nanopi-r4s
|
||||
This patch is an adapted version of:
|
||||
https://github.com/friendlyarm/kernel-rockchip/commit/0e2cbeb4b1e645f5827b54bf50c65577be3eb7b4
|
||||
|
||||
Change-Id: I95cc83e6c4f7234d6ef7bb9ba98e1c65eebd8e73
|
||||
Signed-off-by: jensen <jensenhuang@friendlyarm.com>
|
||||
---
|
||||
arch/arm64/boot/dts/rockchip/Makefile | 2 +
|
||||
.../dts/rockchip/rk3399-nanopi-r4s1.dts | 170 +++++++++++++++
|
||||
.../dts/rockchip/rk3399-nanopi-r4s2.dts | 203 ++++++++++++++++++
|
||||
3 files changed, 375 insertions(+)
|
||||
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s1.dts
|
||||
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s2.dts
|
||||
Adjusted:
|
||||
- do not mess with common Nano{Pi,PC}4 device tree (rk3399-nanopi4.dtsi)
|
||||
- disabled non existent bluetooth node at uart0
|
||||
- disabled usb_host1
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
|
||||
index 71e33037e..eabf39e71 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/Makefile
|
||||
+++ b/arch/arm64/boot/dts/rockchip/Makefile
|
||||
@@ -34,6 +34,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-v.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-leez-p710.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopc-t4.dtb
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-r4s.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4v2.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
|
||||
new file mode 100644
|
||||
index 000000000000..b932e3bb6396
|
||||
index 000000000000..7b136d4707c8
|
||||
--- /dev/null
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
|
||||
@@ -0,0 +1,131 @@
|
||||
@@ -0,0 +1,148 @@
|
||||
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||
+/*
|
||||
+ * Copyright (c) 2020 FriendlyElec Computer Tech. Co., Ltd.
|
||||
@ -47,6 +28,17 @@ index 000000000000..b932e3bb6396
|
||||
+ aliases {
|
||||
+ ethernet1 = &r8169;
|
||||
+ };
|
||||
+
|
||||
+ gpio-keys {
|
||||
+ button@1 {
|
||||
+ debounce-interval = <50>;
|
||||
+ gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>;
|
||||
+ label = "K1";
|
||||
+ linux,code = <BTN_1>;
|
||||
+ wakeup-source;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ vdd_5v: vdd-5v {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ regulator-name = "vdd_5v";
|
||||
@ -54,14 +46,6 @@ index 000000000000..b932e3bb6396
|
||||
+ 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";
|
||||
@ -83,21 +67,39 @@ index 000000000000..b932e3bb6396
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+
|
||||
+&sdhci {
|
||||
+&fusb0 {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+
|
||||
+&sdio0 {
|
||||
+ status = "disabled";
|
||||
+&leds {
|
||||
+ lan_led: led-2 {
|
||||
+ gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
|
||||
+ label = "lan_led";
|
||||
+ };
|
||||
+
|
||||
+ wan_len: led-3 {
|
||||
+ gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
|
||||
+ label = "wan_led";
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&sdmmc {
|
||||
+ host-index-min = <1>;
|
||||
+&pinctrl {
|
||||
+ key_pins {
|
||||
+ rockchip,pins =
|
||||
+ <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
|
||||
+ };
|
||||
+
|
||||
+ network_leds_pins {
|
||||
+ rockchip,pins =
|
||||
+ <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,
|
||||
+ <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&i2s0 {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+/*&mach {
|
||||
+ hwrev = <0x09>;
|
||||
+ model = "NanoPi R4S";
|
||||
+};*/
|
||||
+
|
||||
+&pcie0 {
|
||||
+ max-link-speed = <1>;
|
||||
@ -116,49 +118,45 @@ index 000000000000..b932e3bb6396
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&fusb0 {
|
||||
+&sdhci {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+
|
||||
+&cdn_dp {
|
||||
+ /delete-property/ extcon;
|
||||
+&sdio0 {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+
|
||||
+&tcphy0 {
|
||||
+ /delete-property/ extcon;
|
||||
+};
|
||||
+
|
||||
+&u2phy0 {
|
||||
+ /delete-property/ extcon;
|
||||
+};
|
||||
+
|
||||
+&usbdrd_dwc3_0 {
|
||||
+ /delete-property/ extcon;
|
||||
+ extcon = <&u2phy0>;
|
||||
+};
|
||||
+
|
||||
+&isp0_mmu {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+
|
||||
+&isp1_mmu {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+
|
||||
+&vcc3v3_sys {
|
||||
+ vin-supply = <&vcc5v0_core>;
|
||||
+&sdmmc {
|
||||
+ host-index-min = <1>;
|
||||
+};
|
||||
+
|
||||
+&u2phy0_host {
|
||||
+ phy-supply = <&vcc5v0_usb1>;
|
||||
+ phy-supply = <&vdd_5v>;
|
||||
+};
|
||||
+
|
||||
+&u2phy1_host {
|
||||
+ phy-supply = <&vcc5v0_usb2>;
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+
|
||||
+&vbus_typec {
|
||||
+ regulator-always-on;
|
||||
+ vin-supply = <&vdd_5v>;
|
||||
+&usbdrd_dwc3_0 {
|
||||
+ dr_mode = "host";
|
||||
+};
|
||||
+
|
||||
+&vcc3v3_sys {
|
||||
+ vin-supply = <&vcc5v0_sys>;
|
||||
+};
|
||||
+
|
||||
+// Armbian tweaks
|
||||
+&uart0 {
|
||||
+ bluetooth {
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&usb_host1_ehci {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+
|
||||
+&usb_host1_ohci {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
|
||||
@ -2,7 +2,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchi
|
||||
index 26661c7b7..1462ed38b 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/Makefile
|
||||
+++ b/arch/arm64/boot/dts/rockchip/Makefile
|
||||
@@ -1,4 +1,15 @@
|
||||
@@ -1,4 +1,16 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-rock-pi-s.dtb
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2-rev00.dtb
|
||||
@ -13,6 +13,7 @@ index 26661c7b7..1462ed38b 100644
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-z28pro.dtb
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-kobol-helios64.dtb
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4v2.dtb
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-r4s.dtb
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-orangepi-4.dtb
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-evb.dtb
|
||||
|
||||
@ -1,36 +1,17 @@
|
||||
From 7117f55d19dc3b902b8ce7e28b944d30105069a5 Mon Sep 17 00:00:00 2001
|
||||
From: jensen <jensenhuang@friendlyarm.com>
|
||||
Date: Fri, 6 Nov 2020 10:40:23 +0800
|
||||
Subject: [PATCH] arm64: dts: rk3399: Add dts file for nanopi-r4s
|
||||
This patch is an adapted version of:
|
||||
https://github.com/friendlyarm/kernel-rockchip/commit/0e2cbeb4b1e645f5827b54bf50c65577be3eb7b4
|
||||
|
||||
Change-Id: I95cc83e6c4f7234d6ef7bb9ba98e1c65eebd8e73
|
||||
Signed-off-by: jensen <jensenhuang@friendlyarm.com>
|
||||
---
|
||||
arch/arm64/boot/dts/rockchip/Makefile | 2 +
|
||||
.../dts/rockchip/rk3399-nanopi-r4s1.dts | 170 +++++++++++++++
|
||||
.../dts/rockchip/rk3399-nanopi-r4s2.dts | 203 ++++++++++++++++++
|
||||
3 files changed, 375 insertions(+)
|
||||
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s1.dts
|
||||
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s2.dts
|
||||
Adjusted:
|
||||
- do not mess with common Nano{Pi,PC}4 device tree (rk3399-nanopi4.dtsi)
|
||||
- disabled non existent bluetooth node at uart0
|
||||
- disabled usb_host1
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
|
||||
index 71e33037e..eabf39e71 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/Makefile
|
||||
+++ b/arch/arm64/boot/dts/rockchip/Makefile
|
||||
@@ -34,6 +34,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-v.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-leez-p710.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopc-t4.dtb
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-r4s.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4v2.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
|
||||
new file mode 100644
|
||||
index 000000000000..b932e3bb6396
|
||||
index 000000000000..7b136d4707c8
|
||||
--- /dev/null
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
|
||||
@@ -0,0 +1,131 @@
|
||||
@@ -0,0 +1,148 @@
|
||||
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||
+/*
|
||||
+ * Copyright (c) 2020 FriendlyElec Computer Tech. Co., Ltd.
|
||||
@ -47,6 +28,17 @@ index 000000000000..b932e3bb6396
|
||||
+ aliases {
|
||||
+ ethernet1 = &r8169;
|
||||
+ };
|
||||
+
|
||||
+ gpio-keys {
|
||||
+ button@1 {
|
||||
+ debounce-interval = <50>;
|
||||
+ gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>;
|
||||
+ label = "K1";
|
||||
+ linux,code = <BTN_1>;
|
||||
+ wakeup-source;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ vdd_5v: vdd-5v {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ regulator-name = "vdd_5v";
|
||||
@ -54,14 +46,6 @@ index 000000000000..b932e3bb6396
|
||||
+ 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";
|
||||
@ -83,21 +67,39 @@ index 000000000000..b932e3bb6396
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+
|
||||
+&sdhci {
|
||||
+&fusb0 {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+
|
||||
+&sdio0 {
|
||||
+ status = "disabled";
|
||||
+&leds {
|
||||
+ lan_led: led-2 {
|
||||
+ gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
|
||||
+ label = "lan_led";
|
||||
+ };
|
||||
+
|
||||
+ wan_len: led-3 {
|
||||
+ gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
|
||||
+ label = "wan_led";
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&sdmmc {
|
||||
+ host-index-min = <1>;
|
||||
+&pinctrl {
|
||||
+ key_pins {
|
||||
+ rockchip,pins =
|
||||
+ <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
|
||||
+ };
|
||||
+
|
||||
+ network_leds_pins {
|
||||
+ rockchip,pins =
|
||||
+ <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,
|
||||
+ <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&i2s0 {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+/*&mach {
|
||||
+ hwrev = <0x09>;
|
||||
+ model = "NanoPi R4S";
|
||||
+};*/
|
||||
+
|
||||
+&pcie0 {
|
||||
+ max-link-speed = <1>;
|
||||
@ -116,49 +118,45 @@ index 000000000000..b932e3bb6396
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&fusb0 {
|
||||
+&sdhci {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+
|
||||
+&cdn_dp {
|
||||
+ /delete-property/ extcon;
|
||||
+&sdio0 {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+
|
||||
+&tcphy0 {
|
||||
+ /delete-property/ extcon;
|
||||
+};
|
||||
+
|
||||
+&u2phy0 {
|
||||
+ /delete-property/ extcon;
|
||||
+};
|
||||
+
|
||||
+&usbdrd_dwc3_0 {
|
||||
+ /delete-property/ extcon;
|
||||
+ extcon = <&u2phy0>;
|
||||
+};
|
||||
+
|
||||
+&isp0_mmu {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+
|
||||
+&isp1_mmu {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+
|
||||
+&vcc3v3_sys {
|
||||
+ vin-supply = <&vcc5v0_core>;
|
||||
+&sdmmc {
|
||||
+ host-index-min = <1>;
|
||||
+};
|
||||
+
|
||||
+&u2phy0_host {
|
||||
+ phy-supply = <&vcc5v0_usb1>;
|
||||
+ phy-supply = <&vdd_5v>;
|
||||
+};
|
||||
+
|
||||
+&u2phy1_host {
|
||||
+ phy-supply = <&vcc5v0_usb2>;
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+
|
||||
+&vbus_typec {
|
||||
+ regulator-always-on;
|
||||
+ vin-supply = <&vdd_5v>;
|
||||
+&usbdrd_dwc3_0 {
|
||||
+ dr_mode = "host";
|
||||
+};
|
||||
+
|
||||
+&vcc3v3_sys {
|
||||
+ vin-supply = <&vcc5v0_sys>;
|
||||
+};
|
||||
+
|
||||
+// Armbian tweaks
|
||||
+&uart0 {
|
||||
+ bluetooth {
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&usb_host1_ehci {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+
|
||||
+&usb_host1_ohci {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
|
||||
@ -2,7 +2,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchi
|
||||
index 26661c7b7..1462ed38b 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/Makefile
|
||||
+++ b/arch/arm64/boot/dts/rockchip/Makefile
|
||||
@@ -1,4 +1,15 @@
|
||||
@@ -1,4 +1,16 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-rock-pi-s.dtb
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2-rev00.dtb
|
||||
@ -13,6 +13,7 @@ index 26661c7b7..1462ed38b 100644
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-z28pro.dtb
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-kobol-helios64.dtb
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4v2.dtb
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-r4s.dtb
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-orangepi-4.dtb
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-evb.dtb
|
||||
|
||||
Loading…
Reference in New Issue
Block a user