From 3ff761aa6db7979c63e9793e3c0fdde6f6a5ba30 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Sat, 26 Feb 2022 23:13:50 +0800 Subject: [PATCH] Revert "rockchip: fix build rk3328 with kernel 5.15" This reverts commit 60bd44ababa7a177f144892c73632832cfa33361. Fixes: copied messy commit 2923e80 ("rockchip: add support for FriendlyARM NanoPi NEO3") --- .../armv8/base-files/etc/board.d/01_leds | 3 - target/linux/rockchip/image/armv8.mk | 24 +++--- ...dd-support-for-FriendlyARM-NanoPi-R.patch} | 0 ...-rk3328-DoorNet1-Add-dts-wifi-enable.patch | 25 ------- ...support-for-FriendlyARM-NanoPi-Neo3.patch} | 54 +++++++------- ...dd-support-for-FriendlyARM-NanoPi-R.patch} | 2 +- ...-rk3328-DoorNet1-Add-dts-wifi-enable.patch | 25 ------- ...Add-support-for-OrangePi-R1-Plus-LTS.patch | 4 +- ...-support-for-FriendlyARM-NanoPi-Neo3.patch | 74 +++++++++---------- ...k3399-add-support-for-GuangMiao-G4C.patch} | 2 +- ...dd-support-for-FriendlyARM-NanoPi-R.patch} | 0 ...-rk3328-DoorNet1-Add-dts-wifi-enable.patch | 25 ------- ...-support-for-FriendlyARM-NanoPi-Neo3.patch | 54 +++++++------- 13 files changed, 107 insertions(+), 185 deletions(-) rename target/linux/rockchip/patches-5.10/{203-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch => 204-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch} (100%) delete mode 100644 target/linux/rockchip/patches-5.10/204-rockchip-rk3328-DoorNet1-Add-dts-wifi-enable.patch rename target/linux/rockchip/patches-5.10/{105-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch => 207-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch} (97%) rename target/linux/rockchip/patches-5.15/{203-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch => 204-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch} (96%) delete mode 100644 target/linux/rockchip/patches-5.15/204-rockchip-rk3328-DoorNet1-Add-dts-wifi-enable.patch rename target/linux/rockchip/patches-5.15/{203-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch => 208-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch} (89%) rename target/linux/rockchip/patches-5.4/{203-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch => 204-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch} (100%) delete mode 100644 target/linux/rockchip/patches-5.4/204-rockchip-rk3328-DoorNet1-Add-dts-wifi-enable.patch diff --git a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds b/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds index 93d5d1761..ee9f1fd18 100755 --- a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds +++ b/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds @@ -9,9 +9,6 @@ boardname="${board##*,}" board_config_update case $board in -friendlyarm,nanopi-neo3) - ucidef_set_led_netdev "stat" "STAT" "$boardname:green:stat" "eth0" - ;; embedfire,doornet1|\ friendlyarm,nanopi-r2c|\ friendlyarm,nanopi-r2s|\ diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index 4fe0be10c..c3b7e0e3b 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -10,7 +10,7 @@ define Device/embedfire_doornet1 IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r2s | pine64-bin | gzip | append-metadata DEVICE_PACKAGES := kmod-usb-net-rtl8152 kmod-rtl8821cu endef -TARGET_DEVICES += embedfire_doornet1 +#TARGET_DEVICES += embedfire_doornet1 define Device/embedfire_doornet2 DEVICE_VENDOR := EmbedFire @@ -20,7 +20,16 @@ define Device/embedfire_doornet2 IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r4s | pine64-bin | gzip | append-metadata DEVICE_PACKAGES := kmod-r8168 kmod-rtl8821cu -urngd endef -TARGET_DEVICES += embedfire_doornet2 +#TARGET_DEVICES += embedfire_doornet2 + +define Device/friendlyarm_nanopi-neo3 + DEVICE_VENDOR := FriendlyARM + DEVICE_MODEL := NanoPi NEO3 + SOC := rk3328 + UBOOT_DEVICE_NAME := nanopi-r2s-rk3328 + IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r2s | pine64-bin | gzip | append-metadata +endef +TARGET_DEVICES += friendlyarm_nanopi-neo3 define Device/friendlyarm_nanopi-r2c DEVICE_VENDOR := FriendlyARM @@ -32,15 +41,6 @@ define Device/friendlyarm_nanopi-r2c endef TARGET_DEVICES += friendlyarm_nanopi-r2c -define Device/friendlyarm_nanopi-neo3 - DEVICE_VENDOR := FriendlyARM - DEVICE_MODEL := NanoPi NEO3 - SOC := rk3328 - UBOOT_DEVICE_NAME := nanopi-r2s-rk3328 - IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r2s | pine64-bin | gzip | append-metadata -endef -TARGET_DEVICES += friendlyarm_nanopi-neo3 - define Device/friendlyarm_nanopi-r2s DEVICE_VENDOR := FriendlyARM DEVICE_MODEL := NanoPi R2S @@ -110,4 +110,4 @@ define Device/xunlong_orangepi-r1-plus-lts IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r2s | pine64-bin | gzip | append-metadata DEVICE_PACKAGES := kmod-usb-net-rtl8152 endef -#TARGET_DEVICES += xunlong_orangepi-r1-plus-lts +TARGET_DEVICES += xunlong_orangepi-r1-plus-lts diff --git a/target/linux/rockchip/patches-5.10/203-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch b/target/linux/rockchip/patches-5.10/204-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch similarity index 100% rename from target/linux/rockchip/patches-5.10/203-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch rename to target/linux/rockchip/patches-5.10/204-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch diff --git a/target/linux/rockchip/patches-5.10/204-rockchip-rk3328-DoorNet1-Add-dts-wifi-enable.patch b/target/linux/rockchip/patches-5.10/204-rockchip-rk3328-DoorNet1-Add-dts-wifi-enable.patch deleted file mode 100644 index 7c4258bf2..000000000 --- a/target/linux/rockchip/patches-5.10/204-rockchip-rk3328-DoorNet1-Add-dts-wifi-enable.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/arch/arm64/boot/dts/rockchip/rk3328-doornet1.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3328-doornet1.dts -@@ -75,6 +75,11 @@ - gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_HIGH>; - label = "doornet1:green:wan"; - }; -+ -+ wifi_enable: wifi_enable { -+ gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>; -+ label = "wifi-enable"; -+ }; - }; - - vcc_io_sdio: sdmmcio-regulator { -@@ -326,6 +331,10 @@ - wan_led_pin: wan-led-pin { - rockchip,pins = <2 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>; - }; -+ -+ wifi_pin: wifi_pin{ -+ rockchip,pins = <2 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; -+ }; - }; - - pmic { diff --git a/target/linux/rockchip/patches-5.10/105-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch b/target/linux/rockchip/patches-5.10/207-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch similarity index 97% rename from target/linux/rockchip/patches-5.10/105-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch rename to target/linux/rockchip/patches-5.10/207-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch index f3828dd2f..dffaf4395 100644 --- a/target/linux/rockchip/patches-5.10/105-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch +++ b/target/linux/rockchip/patches-5.10/207-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch @@ -26,7 +26,7 @@ which is now a year old. v2: Following up on Robin Murphy's comments, the NEO3 DTS is now standalone and no longer includes the nanopi R2S one. The lan_led and wan_len nodes have been removed, and the sys_led node has been renamed -to stat_led in accordance with the board schematics. +to status_led in accordance with the board schematics. arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3328-nanopi-neo3.dts | 396 ++++++++++++++++++ @@ -68,10 +68,10 @@ index 000000000..1eb7fd5f7 + compatible = "friendlyarm,nanopi-neo3", "rockchip,rk3328"; + + aliases { -+ led-boot = &stat_led; -+ led-failsafe = &stat_led; -+ led-running = &stat_led; -+ led-upgrade = &stat_led; ++ led-boot = &status_led; ++ led-failsafe = &status_led; ++ led-running = &status_led; ++ led-upgrade = &status_led; + }; + + chosen { @@ -98,26 +98,14 @@ index 000000000..1eb7fd5f7 + }; + }; + -+ 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-0 = <&stat_led_pin>; ++ pinctrl-0 = <&status_led_pin>; + pinctrl-names = "default"; + -+ stat_led: led-0 { ++ status_led: led-0 { + gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; -+ label = "nanopi-neo3:green:stat"; ++ label = "nanopi-neo3:green:status"; + }; + }; + @@ -159,6 +147,18 @@ index 000000000..1eb7fd5f7 + 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; ++ }; +}; + +&cpu0 { @@ -327,12 +327,6 @@ index 000000000..1eb7fd5f7 + }; + }; + }; -+ -+ usb { -+ rtl8153_en_drv: rtl8153-en-drv { -+ rockchip,pins = <2 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ }; +}; + +&io_domains { @@ -360,7 +354,7 @@ index 000000000..1eb7fd5f7 + }; + + leds { -+ stat_led_pin: stat-led-pin { ++ status_led_pin: status-led-pin { + rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; @@ -376,6 +370,12 @@ index 000000000..1eb7fd5f7 + rockchip,pins = <1 RK_PD4 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; ++ ++ usb { ++ rtl8153_en_drv: rtl8153-en-drv { ++ rockchip,pins = <2 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ }; +}; + +&pwm2 { diff --git a/target/linux/rockchip/patches-5.15/203-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch b/target/linux/rockchip/patches-5.15/204-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch similarity index 96% rename from target/linux/rockchip/patches-5.15/203-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch rename to target/linux/rockchip/patches-5.15/204-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch index f7e84c4ee..bdf78bc16 100644 --- a/target/linux/rockchip/patches-5.15/203-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch +++ b/target/linux/rockchip/patches-5.15/204-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch @@ -1,6 +1,6 @@ --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -7,6 +7,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-od +@@ -10,6 +10,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-od dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-doornet1.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb diff --git a/target/linux/rockchip/patches-5.15/204-rockchip-rk3328-DoorNet1-Add-dts-wifi-enable.patch b/target/linux/rockchip/patches-5.15/204-rockchip-rk3328-DoorNet1-Add-dts-wifi-enable.patch deleted file mode 100644 index 7c4258bf2..000000000 --- a/target/linux/rockchip/patches-5.15/204-rockchip-rk3328-DoorNet1-Add-dts-wifi-enable.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/arch/arm64/boot/dts/rockchip/rk3328-doornet1.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3328-doornet1.dts -@@ -75,6 +75,11 @@ - gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_HIGH>; - label = "doornet1:green:wan"; - }; -+ -+ wifi_enable: wifi_enable { -+ gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>; -+ label = "wifi-enable"; -+ }; - }; - - vcc_io_sdio: sdmmcio-regulator { -@@ -326,6 +331,10 @@ - wan_led_pin: wan-led-pin { - rockchip,pins = <2 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>; - }; -+ -+ wifi_pin: wifi_pin{ -+ rockchip,pins = <2 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; -+ }; - }; - - pmic { diff --git a/target/linux/rockchip/patches-5.15/206-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus-LTS.patch b/target/linux/rockchip/patches-5.15/206-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus-LTS.patch index eabd5bb3b..a21ec13a4 100644 --- a/target/linux/rockchip/patches-5.15/206-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus-LTS.patch +++ b/target/linux/rockchip/patches-5.15/206-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus-LTS.patch @@ -13,14 +13,14 @@ diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchi index 23373c752..552d97555 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -5,6 +5,7 @@ +@@ -13,6 +13,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2c.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus-lts.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock-pi-e.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts new file mode 100644 index 000000000..c65f7c417 diff --git a/target/linux/rockchip/patches-5.15/207-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch b/target/linux/rockchip/patches-5.15/207-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch index f3828dd2f..a07ad0ac7 100644 --- a/target/linux/rockchip/patches-5.15/207-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch +++ b/target/linux/rockchip/patches-5.15/207-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch @@ -26,7 +26,7 @@ which is now a year old. v2: Following up on Robin Murphy's comments, the NEO3 DTS is now standalone and no longer includes the nanopi R2S one. The lan_led and wan_len nodes have been removed, and the sys_led node has been renamed -to stat_led in accordance with the board schematics. +to status_led in accordance with the board schematics. arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3328-nanopi-neo3.dts | 396 ++++++++++++++++++ @@ -37,20 +37,22 @@ diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchi index 479906f3a..5f6ffb496 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -3,6 +3,7 @@ - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-doornet1.dtb +@@ -8,8 +8,8 @@ + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a95x-z2.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb +-dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-doornet1.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-neo3.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2c.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-neo3.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-neo3.dts new file mode 100644 index 000000000..1eb7fd5f7 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-neo3.dts -@@ -0,0 +1,396 @@ +@@ -0,0 +1,394 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2020 David Bauer @@ -68,10 +70,10 @@ index 000000000..1eb7fd5f7 + compatible = "friendlyarm,nanopi-neo3", "rockchip,rk3328"; + + aliases { -+ led-boot = &stat_led; -+ led-failsafe = &stat_led; -+ led-running = &stat_led; -+ led-upgrade = &stat_led; ++ led-boot = &status_led; ++ led-failsafe = &status_led; ++ led-running = &status_led; ++ led-upgrade = &status_led; + }; + + chosen { @@ -98,26 +100,14 @@ index 000000000..1eb7fd5f7 + }; + }; + -+ 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-0 = <&stat_led_pin>; ++ pinctrl-0 = <&status_led_pin>; + pinctrl-names = "default"; + -+ stat_led: led-0 { ++ status_led: led-0 { + gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; -+ label = "nanopi-neo3:green:stat"; ++ label = "nanopi-neo3:green:status"; + }; + }; + @@ -159,6 +149,18 @@ index 000000000..1eb7fd5f7 + 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; ++ }; +}; + +&cpu0 { @@ -327,12 +329,6 @@ index 000000000..1eb7fd5f7 + }; + }; + }; -+ -+ usb { -+ rtl8153_en_drv: rtl8153-en-drv { -+ rockchip,pins = <2 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ }; +}; + +&io_domains { @@ -360,7 +356,7 @@ index 000000000..1eb7fd5f7 + }; + + leds { -+ stat_led_pin: stat-led-pin { ++ status_led_pin: status-led-pin { + rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; @@ -376,6 +372,12 @@ index 000000000..1eb7fd5f7 + rockchip,pins = <1 RK_PD4 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; ++ ++ usb { ++ rtl8153_en_drv: rtl8153-en-drv { ++ rockchip,pins = <2 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ }; +}; + +&pwm2 { @@ -433,12 +435,10 @@ index 000000000..1eb7fd5f7 +}; + +&usbdrd3 { -+ status = "okay"; -+}; -+ -+&usbdrd_dwc3 { + dr_mode = "host"; + status = "okay"; ++ #address-cells = <1>; ++ #size-cells = <0>; + + usb-eth@2 { + compatible = "realtek,rtl8153"; diff --git a/target/linux/rockchip/patches-5.15/203-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch b/target/linux/rockchip/patches-5.15/208-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch similarity index 89% rename from target/linux/rockchip/patches-5.15/203-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch rename to target/linux/rockchip/patches-5.15/208-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch index 73ecc2f78..886ce0f3a 100644 --- a/target/linux/rockchip/patches-5.15/203-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch +++ b/target/linux/rockchip/patches-5.15/208-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch @@ -1,6 +1,6 @@ --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -27,6 +27,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a9 +@@ -31,6 +31,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a9 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-inx.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-kd.dtb diff --git a/target/linux/rockchip/patches-5.4/203-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch b/target/linux/rockchip/patches-5.4/204-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch similarity index 100% rename from target/linux/rockchip/patches-5.4/203-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch rename to target/linux/rockchip/patches-5.4/204-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch diff --git a/target/linux/rockchip/patches-5.4/204-rockchip-rk3328-DoorNet1-Add-dts-wifi-enable.patch b/target/linux/rockchip/patches-5.4/204-rockchip-rk3328-DoorNet1-Add-dts-wifi-enable.patch deleted file mode 100644 index 7c4258bf2..000000000 --- a/target/linux/rockchip/patches-5.4/204-rockchip-rk3328-DoorNet1-Add-dts-wifi-enable.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/arch/arm64/boot/dts/rockchip/rk3328-doornet1.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3328-doornet1.dts -@@ -75,6 +75,11 @@ - gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_HIGH>; - label = "doornet1:green:wan"; - }; -+ -+ wifi_enable: wifi_enable { -+ gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>; -+ label = "wifi-enable"; -+ }; - }; - - vcc_io_sdio: sdmmcio-regulator { -@@ -326,6 +331,10 @@ - wan_led_pin: wan-led-pin { - rockchip,pins = <2 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>; - }; -+ -+ wifi_pin: wifi_pin{ -+ rockchip,pins = <2 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; -+ }; - }; - - pmic { diff --git a/target/linux/rockchip/patches-5.4/207-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch b/target/linux/rockchip/patches-5.4/207-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch index 365d46e9a..438c7f1f2 100644 --- a/target/linux/rockchip/patches-5.4/207-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch +++ b/target/linux/rockchip/patches-5.4/207-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch @@ -26,7 +26,7 @@ which is now a year old. v2: Following up on Robin Murphy's comments, the NEO3 DTS is now standalone and no longer includes the nanopi R2S one. The lan_led and wan_len nodes have been removed, and the sys_led node has been renamed -to stat_led in accordance with the board schematics. +to status_led in accordance with the board schematics. arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3328-nanopi-neo3.dts | 396 ++++++++++++++++++ @@ -68,10 +68,10 @@ index 000000000..1eb7fd5f7 + compatible = "friendlyarm,nanopi-neo3", "rockchip,rk3328"; + + aliases { -+ led-boot = &stat_led; -+ led-failsafe = &stat_led; -+ led-running = &stat_led; -+ led-upgrade = &stat_led; ++ led-boot = &status_led; ++ led-failsafe = &status_led; ++ led-running = &status_led; ++ led-upgrade = &status_led; + }; + + chosen { @@ -98,26 +98,14 @@ index 000000000..1eb7fd5f7 + }; + }; + -+ 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-0 = <&stat_led_pin>; ++ pinctrl-0 = <&status_led_pin>; + pinctrl-names = "default"; + -+ stat_led: led-0 { ++ status_led: led-0 { + gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; -+ label = "nanopi-neo3:green:stat"; ++ label = "nanopi-neo3:green:status"; + }; + }; + @@ -159,6 +147,18 @@ index 000000000..1eb7fd5f7 + 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; ++ }; +}; + +&cpu0 { @@ -327,12 +327,6 @@ index 000000000..1eb7fd5f7 + }; + }; + }; -+ -+ usb { -+ rtl8153_en_drv: rtl8153-en-drv { -+ rockchip,pins = <2 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ }; +}; + +&io_domains { @@ -360,7 +354,7 @@ index 000000000..1eb7fd5f7 + }; + + leds { -+ stat_led_pin: stat-led-pin { ++ status_led_pin: status-led-pin { + rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; @@ -376,6 +370,12 @@ index 000000000..1eb7fd5f7 + rockchip,pins = <1 RK_PD4 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; ++ ++ usb { ++ rtl8153_en_drv: rtl8153-en-drv { ++ rockchip,pins = <2 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ }; +}; + +&pwm2 {