From 705d40946ddfd67d8d444bfe8b59d06cfa1367ca Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Wed, 22 Feb 2023 10:04:28 +0800 Subject: [PATCH] rockchip: add wireless driver for NanoPi R5C The NanoPi R5C has a (optional) wireless chip RTL8822CE connected to the M.2 slot (PCIe2), add the driver for it. Signed-off-by: Tianling Shen --- .../src/arch/arm/dts/rk3568-nanopi-r5c.dts | 10 +++++----- .../src/arch/arm/dts/rk3568-nanopi-r5s.dts | 2 +- .../src/arch/arm/dts/rk3568-nanopi-r5s.dtsi | 2 +- .../arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5c.dts | 10 +++++----- .../arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts | 2 +- .../arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi | 2 +- target/linux/rockchip/image/armv8.mk | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-nanopi-r5c.dts b/package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-nanopi-r5c.dts index b0632f53b1..7e485e6c8a 100644 --- a/package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-nanopi-r5c.dts +++ b/package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-nanopi-r5c.dts @@ -3,7 +3,7 @@ * Copyright (c) 2022 FriendlyElec Computer Tech. Co., Ltd. * (http://www.friendlyelec.com) * - * Copyright (c) 2023 Tianling Shen + * Copyright (c) 2023 Tianling Shen */ /dts-v1/; @@ -29,7 +29,7 @@ gpio-leds { compatible = "gpio-leds"; pinctrl-names = "default"; - pinctrl-0 = <&lan_led_pin>, <&power_led_pin>, <&wan_led_pin>, <&wifi_led_pin>; + pinctrl-0 = <&lan_led_pin>, <&power_led_pin>, <&wan_led_pin>, <&wlan_led_pin>; led-lan { label = "green:lan"; @@ -46,8 +46,8 @@ gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; }; - led-wifi { - label = "green:wifi"; + led-wlan { + label = "green:wlan"; gpios = <&gpio3 RK_PA5 GPIO_ACTIVE_HIGH>; }; }; @@ -74,7 +74,7 @@ rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; }; - wifi_led_pin: wifi-led-pin { + wlan_led_pin: wlan-led-pin { rockchip,pins = <3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; }; }; diff --git a/package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-nanopi-r5s.dts b/package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-nanopi-r5s.dts index f97c03c8dd..10fa2eac62 100644 --- a/package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-nanopi-r5s.dts +++ b/package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-nanopi-r5s.dts @@ -3,7 +3,7 @@ * Copyright (c) 2022 FriendlyElec Computer Tech. Co., Ltd. * (http://www.friendlyelec.com) * - * Copyright (c) 2023 Tianling Shen + * Copyright (c) 2023 Tianling Shen */ /dts-v1/; diff --git a/package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-nanopi-r5s.dtsi b/package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-nanopi-r5s.dtsi index 0c84598f5b..9d695a5a7c 100644 --- a/package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-nanopi-r5s.dtsi +++ b/package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-nanopi-r5s.dtsi @@ -3,7 +3,7 @@ * Copyright (c) 2022 FriendlyElec Computer Tech. Co., Ltd. * (http://www.friendlyelec.com) * - * Copyright (c) 2023 Tianling Shen + * Copyright (c) 2023 Tianling Shen */ /dts-v1/; diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5c.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5c.dts index 5f025149a9..4d29a8d01d 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5c.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5c.dts @@ -3,7 +3,7 @@ * Copyright (c) 2022 FriendlyElec Computer Tech. Co., Ltd. * (http://www.friendlyelec.com) * - * Copyright (c) 2023 Tianling Shen + * Copyright (c) 2023 Tianling Shen */ /dts-v1/; @@ -34,7 +34,7 @@ gpio-leds { compatible = "gpio-leds"; pinctrl-names = "default"; - pinctrl-0 = <&lan_led_pin>, <&power_led_pin>, <&wan_led_pin>, <&wifi_led_pin>; + pinctrl-0 = <&lan_led_pin>, <&power_led_pin>, <&wan_led_pin>, <&wlan_led_pin>; led-lan { label = "green:lan"; @@ -51,8 +51,8 @@ gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; }; - led-wifi { - label = "green:wifi"; + led-wlan { + label = "green:wlan"; gpios = <&gpio3 RK_PA5 GPIO_ACTIVE_HIGH>; }; }; @@ -119,7 +119,7 @@ rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; }; - wifi_led_pin: wifi-led-pin { + wlan_led_pin: wlan-led-pin { rockchip,pins = <3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; }; }; diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts index 553ea7340f..2293e3d6c3 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts @@ -3,7 +3,7 @@ * Copyright (c) 2022 FriendlyElec Computer Tech. Co., Ltd. * (http://www.friendlyelec.com) * - * Copyright (c) 2023 Tianling Shen + * Copyright (c) 2023 Tianling Shen */ /dts-v1/; diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi index bfcdbb198a..dd37bed7d0 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi @@ -3,7 +3,7 @@ * Copyright (c) 2022 FriendlyElec Computer Tech. Co., Ltd. * (http://www.friendlyelec.com) * - * Copyright (c) 2023 Tianling Shen + * Copyright (c) 2023 Tianling Shen */ /dts-v1/; diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index 01aff18766..ae0d871387 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -51,7 +51,7 @@ define Device/friendlyarm_nanopi-r5c SOC := rk3568 UBOOT_DEVICE_NAME := nanopi-r5c-rk3568 IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata - DEVICE_PACKAGES := kmod-r8125 + DEVICE_PACKAGES := kmod-r8125 kmod-rtw88 wpad-basic-openssl endef TARGET_DEVICES += friendlyarm_nanopi-r5c