mirrors/armbian_build
1
0
Fork 0
mirror of https://github.com/armbian/build.git synced 2025-12-24 10:41:41 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove deprecated patches (#5187)

Browse Source
This commit is contained in:
igorpecovnik 2023-05-18 19:52:36 +02:00 committed by GitHub
parent 5b3aba795b
commit c7fc14a7b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 456 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

228
patch/kernel/archive/rockchip64-6.1/add-board-nanopi-r4s.patch
View File

@ -1,228 +0,0 @@
From baad3620b42d91baa729b6f5c959657b93e76bda Mon Sep 17 00:00:00 2001
From: Paolo Sabatino <paolo.sabatino@gmail.com>
Date: Sat, 7 Jan 2023 12:09:38 +0000
Subject: [PATCH] rockchip64: consolidate nanopi-r4s dts patch
---
.../boot/dts/rockchip/rk3399-nanopi-r4s.dts | 149 ++++++++++--------
1 file changed, 86 insertions(+), 63 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
index fe5b5261001..41bd45763d2 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
@@ -1,15 +1,7 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
- * FriendlyElec NanoPC-T4 board device tree source
- *
* Copyright (c) 2020 FriendlyElec Computer Tech. Co., Ltd.
* (http://www.friendlyarm.com)
- *
- * Copyright (c) 2018 Collabora Ltd.
- *
- * Copyright (c) 2020 Jensen Huang <jensenhuang@friendlyarm.com>
- * Copyright (c) 2020 Marty Jones <mj8263788@gmail.com>
- * Copyright (c) 2021 Tianling Shen <cnsztl@gmail.com>
*/
/dts-v1/;
@@ -17,42 +9,19 @@
/ {
model = "FriendlyElec NanoPi R4S";
- compatible = "friendlyarm,nanopi-r4s", "rockchip,rk3399";
+ compatible = "friendlyelec,nanopi-r4s", "rockchip,rk3399";
- /delete-node/ display-subsystem;
-
- gpio-leds {
- pinctrl-0 = <&lan_led_pin>, <&sys_led_pin>, <&wan_led_pin>;
-
- /delete-node/ led-0;
-
- lan_led: led-lan {
- gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
- label = "green:lan";
- };
-
- sys_led: led-sys {
- gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
- label = "red:power";
- default-state = "on";
- };
-
- wan_led: led-wan {
- gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
- label = "green:wan";
- };
+ aliases {
+ ethernet1 = &r8169;
};
gpio-keys {
- pinctrl-0 = <&reset_button_pin>;
-
- /delete-node/ key-power;
-
- key-reset {
+ button@1 {
debounce-interval = <50>;
gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>;
- label = "reset";
- linux,code = <KEY_RESTART>;
+ label = "K1";
+ linux,code = <BTN_1>;
+ wakeup-source;
};
};
@@ -62,44 +31,75 @@ vdd_5v: vdd-5v {
regulator-always-on;
regulator-boot-on;
};
+
+ vcc5v0_usb1: vcc5v0-usb1 {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc5v0_usb1";
+ regulator-always-on;
+ regulator-boot-on;
+ vin-supply = <&vcc5v0_sys>;
+ };
+
+ vcc5v0_usb2: vcc5v0-usb2 {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc5v0_usb2";
+ regulator-always-on;
+ regulator-boot-on;
+ vin-supply = <&vcc5v0_sys>;
+ };
};
&emmc_phy {
status = "disabled";
};
-&i2c4 {
+&fusb0 {
status = "disabled";
};
-&pcie0 {
- max-link-speed = <1>;
- num-lanes = <1>;
- vpcie3v3-supply = <&vcc3v3_sys>;
+&leds {
+ lan_led: led-2 {
+ gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
+ label = "lan_led";
+ };
+
+ wan_led: led-3 {
+ gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
+ label = "wan_led";
+ };
};
&pinctrl {
- gpio-leds {
- /delete-node/ status-led-pin;
+ key_pins {
+ rockchip,pins =
+ <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
+ };
- lan_led_pin: lan-led-pin {
- rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
- };
+ network_leds_pins {
+ rockchip,pins =
+ <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,
+ <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>;
- };
+/*&mach {
+ hwrev = <0x09>;
+ model = "NanoPi R4S";
+};*/
- wan_led_pin: wan-led-pin {
- rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
- };
- };
+&pcie0 {
+ max-link-speed = <1>;
+ num-lanes = <1>;
+ vpcie3v3-supply = <&vcc3v3_sys>;
- rockchip-key {
- /delete-node/ power-key;
+ pcie@0 {
+ reg = <0x00000000 0 0 0 0>;
+ #address-cells = <3>;
+ #size-cells = <2>;
- reset_button_pin: reset-button-pin {
- rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
+ r8169: pcie@0,0 {
+ reg = <0x000000 0 0 0 0>;
+ local-mac-address = [ 00 00 00 00 00 00 ];
};
};
};
@@ -112,6 +112,10 @@ &sdio0 {
status = "disabled";
};
+&sdmmc {
+ host-index-min = <1>;
+};
+
&u2phy0_host {
phy-supply = <&vdd_5v>;
};
@@ -120,10 +124,6 @@ &u2phy1_host {
status = "disabled";
};
-&uart0 {
- status = "disabled";
-};
-
&usbdrd_dwc3_0 {
dr_mode = "host";
};
@@ -131,3 +131,26 @@ &usbdrd_dwc3_0 {
&vcc3v3_sys {
vin-supply = <&vcc5v0_sys>;
};
+
+// Armbian tweaks
+&lan_led {
+ linux,default-trigger = "r8169-100:00:link";
+};
+
+&wan_led {
+ linux,default-trigger = "stmmac-0:01:link";
+};
+
+&uart0 {
+ bluetooth {
+ status = "disabled";
+ };
+};
+
+&usb_host1_ehci {
+ status = "disabled";
+};
+
+&usb_host1_ohci {
+ status = "disabled";
+};
--
2.34.1

228
patch/kernel/archive/rockchip64-6.3/add-board-nanopi-r4s.patch
View File

@ -1,228 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Paolo Sabatino <paolo.sabatino@gmail.com>
Date: Sat, 7 Jan 2023 12:09:38 +0000
Subject: rockchip64: consolidate nanopi-r4s dts patch
---
arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts | 149 ++++++----
1 file changed, 86 insertions(+), 63 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
index fe5b52610010..41bd45763d2e 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
@@ -1,15 +1,7 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
- * FriendlyElec NanoPC-T4 board device tree source
- *
* Copyright (c) 2020 FriendlyElec Computer Tech. Co., Ltd.
* (http://www.friendlyarm.com)
- *
- * Copyright (c) 2018 Collabora Ltd.
- *
- * Copyright (c) 2020 Jensen Huang <jensenhuang@friendlyarm.com>
- * Copyright (c) 2020 Marty Jones <mj8263788@gmail.com>
- * Copyright (c) 2021 Tianling Shen <cnsztl@gmail.com>
*/
/dts-v1/;
@@ -17,42 +9,19 @@
/ {
model = "FriendlyElec NanoPi R4S";
- compatible = "friendlyarm,nanopi-r4s", "rockchip,rk3399";
+ compatible = "friendlyelec,nanopi-r4s", "rockchip,rk3399";
- /delete-node/ display-subsystem;
-
- gpio-leds {
- pinctrl-0 = <&lan_led_pin>, <&sys_led_pin>, <&wan_led_pin>;
-
- /delete-node/ led-0;
-
- lan_led: led-lan {
- gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
- label = "green:lan";
- };
-
- sys_led: led-sys {
- gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
- label = "red:power";
- default-state = "on";
- };
-
- wan_led: led-wan {
- gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
- label = "green:wan";
- };
+ aliases {
+ ethernet1 = &r8169;
};
gpio-keys {
- pinctrl-0 = <&reset_button_pin>;
-
- /delete-node/ key-power;
-
- key-reset {
+ button@1 {
debounce-interval = <50>;
gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>;
- label = "reset";
- linux,code = <KEY_RESTART>;
+ label = "K1";
+ linux,code = <BTN_1>;
+ wakeup-source;
};
};
@@ -62,44 +31,75 @@ vdd_5v: vdd-5v {
regulator-always-on;
regulator-boot-on;
};
+
+ vcc5v0_usb1: vcc5v0-usb1 {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc5v0_usb1";
+ regulator-always-on;
+ regulator-boot-on;
+ vin-supply = <&vcc5v0_sys>;
+ };
+
+ vcc5v0_usb2: vcc5v0-usb2 {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc5v0_usb2";
+ regulator-always-on;
+ regulator-boot-on;
+ vin-supply = <&vcc5v0_sys>;
+ };
};
&emmc_phy {
status = "disabled";
};
-&i2c4 {
+&fusb0 {
status = "disabled";
};
-&pcie0 {
- max-link-speed = <1>;
- num-lanes = <1>;
- vpcie3v3-supply = <&vcc3v3_sys>;
+&leds {
+ lan_led: led-2 {
+ gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
+ label = "lan_led";
+ };
+
+ wan_led: led-3 {
+ gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
+ label = "wan_led";
+ };
};
&pinctrl {
- gpio-leds {
- /delete-node/ status-led-pin;
+ key_pins {
+ rockchip,pins =
+ <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
+ };
- lan_led_pin: lan-led-pin {
- rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
- };
+ network_leds_pins {
+ rockchip,pins =
+ <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,
+ <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>;
- };
+/*&mach {
+ hwrev = <0x09>;
+ model = "NanoPi R4S";
+};*/
- wan_led_pin: wan-led-pin {
- rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
- };
- };
+&pcie0 {
+ max-link-speed = <1>;
+ num-lanes = <1>;
+ vpcie3v3-supply = <&vcc3v3_sys>;
- rockchip-key {
- /delete-node/ power-key;
+ pcie@0 {
+ reg = <0x00000000 0 0 0 0>;
+ #address-cells = <3>;
+ #size-cells = <2>;
- reset_button_pin: reset-button-pin {
- rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
+ r8169: pcie@0,0 {
+ reg = <0x000000 0 0 0 0>;
+ local-mac-address = [ 00 00 00 00 00 00 ];
};
};
};
@@ -112,6 +112,10 @@ &sdio0 {
status = "disabled";
};
+&sdmmc {
+ host-index-min = <1>;
+};
+
&u2phy0_host {
phy-supply = <&vdd_5v>;
};
@@ -120,10 +124,6 @@ &u2phy1_host {
status = "disabled";
};
-&uart0 {
- status = "disabled";
-};
-
&usbdrd_dwc3_0 {
dr_mode = "host";
};
@@ -131,3 +131,26 @@ &usbdrd_dwc3_0 {
&vcc3v3_sys {
vin-supply = <&vcc5v0_sys>;
};
+
+// Armbian tweaks
+&lan_led {
+ linux,default-trigger = "r8169-100:00:link";
+};
+
+&wan_led {
+ linux,default-trigger = "stmmac-0:01:link";
+};
+
+&uart0 {
+ bluetooth {
+ status = "disabled";
+ };
+};
+
+&usb_host1_ehci {
+ status = "disabled";
+};
+
+&usb_host1_ohci {
+ status = "disabled";
+};
--
Armbian