From adfe3ae026676c465c19f2219236cd062b05fa95 Mon Sep 17 00:00:00 2001 From: Joshua Riek Date: Fri, 26 Jan 2024 09:51:24 -0500 Subject: [PATCH 1/2] drivers: wireless: aic8800_sdio: disable debug info --- drivers/net/wireless/aic8800_sdio/aic8800_fdrv/rwnx_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/aic8800_sdio/aic8800_fdrv/rwnx_main.c b/drivers/net/wireless/aic8800_sdio/aic8800_fdrv/rwnx_main.c index ce4354ace20a4..61b7efa5fe02b 100755 --- a/drivers/net/wireless/aic8800_sdio/aic8800_fdrv/rwnx_main.c +++ b/drivers/net/wireless/aic8800_sdio/aic8800_fdrv/rwnx_main.c @@ -502,7 +502,7 @@ static const int rwnx_hwq2uapsd[NL80211_NUM_ACS] = { extern uint8_t scanning; -int aicwf_dbg_level = LOGERROR|LOGINFO|LOGDEBUG|LOGTRACE; +int aicwf_dbg_level = LOGERROR; module_param(aicwf_dbg_level, int, 0660); int testmode = 0; char aic_fw_path[200]; From 0d2b929ec0289cb6015d9061831a5c2159300742 Mon Sep 17 00:00:00 2001 From: Joshua Riek Date: Fri, 26 Jan 2024 11:07:18 -0500 Subject: [PATCH 2/2] arm64: dts: rockchip: Add Radxa Zero 3 overlays --- arch/arm64/boot/dts/rockchip/overlay/Makefile | 5 + .../overlay/radxa-zero3-disabled-ethernet.dts | 31 ++++ .../overlay/radxa-zero3-disabled-wireless.dts | 31 ++++ .../overlay/radxa-zero3-external-antenna.dts | 46 +++++ .../overlay/radxa-zero3-rpi-camera-v1.3.dts | 156 +++++++++++++++++ .../overlay/radxa-zero3-rpi-camera-v2.dts | 165 ++++++++++++++++++ 6 files changed, 434 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/overlay/radxa-zero3-disabled-ethernet.dts create mode 100644 arch/arm64/boot/dts/rockchip/overlay/radxa-zero3-disabled-wireless.dts create mode 100644 arch/arm64/boot/dts/rockchip/overlay/radxa-zero3-external-antenna.dts create mode 100644 arch/arm64/boot/dts/rockchip/overlay/radxa-zero3-rpi-camera-v1.3.dts create mode 100644 arch/arm64/boot/dts/rockchip/overlay/radxa-zero3-rpi-camera-v2.dts diff --git a/arch/arm64/boot/dts/rockchip/overlay/Makefile b/arch/arm64/boot/dts/rockchip/overlay/Makefile index 475e740c8406d..98cef6977074a 100644 --- a/arch/arm64/boot/dts/rockchip/overlay/Makefile +++ b/arch/arm64/boot/dts/rockchip/overlay/Makefile @@ -47,6 +47,11 @@ dtbo-$(CONFIG_ARCH_ROCKCHIP) += \ radxa-nx5-io-rpi-camera-v2-cam1.dtbo \ turing-rk1-sata2.dtbo \ mixtile-blade3-sata2.dtbo \ + radxa-zero3-rpi-camera-v2.dtbo \ + radxa-zero3-rpi-camera-v1.3.dtbo \ + radxa-zero3-external-antenna.dtbo \ + radxa-zero3-disabled-ethernet.dtbo \ + radxa-zero3-disabled-wireless.dtbo \ yy3568-camera.dtbo \ yy3568-display-dsi0.dtbo \ yy3568-display-dsi1.dtbo \ diff --git a/arch/arm64/boot/dts/rockchip/overlay/radxa-zero3-disabled-ethernet.dts b/arch/arm64/boot/dts/rockchip/overlay/radxa-zero3-disabled-ethernet.dts new file mode 100644 index 0000000000000..c8b84be08e2c4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/overlay/radxa-zero3-disabled-ethernet.dts @@ -0,0 +1,31 @@ +/dts-v1/; +/plugin/; + +#include +#include + + +/ { + metadata { + title = "Disabled Zero 3W Ethernet"; + compatible = "radxa,zero3"; + category = "misc"; + description = "Disabled Zero 3W Ethernet."; + }; + + fragment@0 { + target = <&mdio1>; + + __overlay__ { + status = "disabled"; + }; + }; + + fragment@1 { + target = <&gmac1>; + + __overlay__ { + status = "disabled"; + }; + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/overlay/radxa-zero3-disabled-wireless.dts b/arch/arm64/boot/dts/rockchip/overlay/radxa-zero3-disabled-wireless.dts new file mode 100644 index 0000000000000..7b1fc065c0c43 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/overlay/radxa-zero3-disabled-wireless.dts @@ -0,0 +1,31 @@ +/dts-v1/; +/plugin/; + +#include +#include + + +/ { + metadata { + title = "Disabled Zero 3E Wireless"; + compatible = "radxa,zero3"; + category = "misc"; + description = "Disabled Zero 3E Wireless."; + }; + + fragment@0 { + target = <&uart1>; + + __overlay__ { + status = "disabled"; + }; + }; + + fragment@1 { + target = <&sdmmc1>; + + __overlay__ { + status = "disabled"; + }; + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/overlay/radxa-zero3-external-antenna.dts b/arch/arm64/boot/dts/rockchip/overlay/radxa-zero3-external-antenna.dts new file mode 100644 index 0000000000000..196ab187c372a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/overlay/radxa-zero3-external-antenna.dts @@ -0,0 +1,46 @@ +/dts-v1/; +/plugin/; + +#include +#include + + +/ { + metadata { + title = "Enable external antenna"; + compatible = "radxa,zero3"; + category = "misc"; + exclusive = "GPIO3_D2"; + description = "Enable external antenna."; + }; + + fragment@0 { + target-path = "/"; + + __overlay__ { + board_antenna: board-antenna { + status = "okay"; + compatible = "regulator-fixed"; + enable-active-low; + gpio = <&gpio3 RK_PD2 GPIO_ACTIVE_LOW>; + regulator-always-on; + regulator-boot-on; + pinctrl-0 = <&ant_1>; + pinctrl-names = "default"; + regulator-name = "board_antenna"; + }; + }; + }; + + fragment@1 { + target = <&pinctrl>; + + __overlay__ { + antenna { + ant_1: ant-1 { + rockchip,pins = <3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_down>; + }; + }; + }; + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/overlay/radxa-zero3-rpi-camera-v1.3.dts b/arch/arm64/boot/dts/rockchip/overlay/radxa-zero3-rpi-camera-v1.3.dts new file mode 100644 index 0000000000000..7c96d28970ad5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/overlay/radxa-zero3-rpi-camera-v1.3.dts @@ -0,0 +1,156 @@ +/dts-v1/; +/plugin/; + +#include +#include + + +/ { + metadata { + title = "Enable Raspberry Pi Camera v1.3"; + compatible = "radxa,zero3"; + category = "camera"; + exclusive = "csi2_dphy0"; + description = "Enable Raspberry Pi Camera v1.3."; + }; + + fragment@0 { + target-path = "/"; + + __overlay__ { + clk_cam_25m: external-camera-clock-25m { + status = "okay"; + compatible = "fixed-clock"; + clock-frequency = <25000000>; + clock-output-names = "clk_cam_25m"; + #clock-cells = <0>; + }; + }; + }; + + fragment@1 { + target = <&i2c2>; + + __overlay__ { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c2m1_xfer>; + #address-cells = <1>; + #size-cells = <0>; + + camera_ov5647: camera-ov5647@36 { + status = "okay"; + compatible = "ovti,ov5647"; + reg = <0x36>; + clocks = <&clk_cam_25m>; + clock-names = "xvclk"; + pwdn-gpios = <&gpio3 RK_PC6 GPIO_ACTIVE_LOW>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "rpi-camera-v1p3"; + rockchip,camera-module-lens-name = "default"; + + port { + ucam_out0: endpoint { + remote-endpoint = <&mipi_in_ucam0>; + data-lanes = <1 2>; + }; + }; + }; + }; + }; + + fragment@2 { + target = <&csi2_dphy_hw>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@3 { + target = <&csi2_dphy0>; + + __overlay__ { + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + mipi_in_ucam0: endpoint@1 { + reg = <1>; + remote-endpoint = <&ucam_out0>; + data-lanes = <1 2>; + }; + }; + + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + dphy0_out: endpoint@1 { + reg = <1>; + remote-endpoint = <&isp0_in>; + }; + }; + }; + }; + }; + + fragment@4 { + target = <&rkisp_vir0>; + + __overlay__ { + status = "okay"; + + port { + #address-cells = <1>; + #size-cells = <0>; + + isp0_in: endpoint@0 { + reg = <0>; + remote-endpoint = <&dphy0_out>; + }; + }; + }; + }; + + fragment@5 { + target = <&rkisp>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@6 { + target = <&rkisp_mmu>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@7 { + target = <&rkcif_mmu>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@8 { + target = <&rkcif>; + + __overlay__ { + status = "okay"; + }; + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/overlay/radxa-zero3-rpi-camera-v2.dts b/arch/arm64/boot/dts/rockchip/overlay/radxa-zero3-rpi-camera-v2.dts new file mode 100644 index 0000000000000..6b1121af68c74 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/overlay/radxa-zero3-rpi-camera-v2.dts @@ -0,0 +1,165 @@ +/dts-v1/; +/plugin/; + +#include +#include + + +/ { + metadata { + title = "Enable Raspberry Pi Camera v2"; + compatible = "radxa,zero3"; + category = "camera"; + exclusive = "csi2_dphy0"; + description = "Enable Raspberry Pi Camera v2."; + }; + + fragment@0 { + target-path = "/"; + + __overlay__ { + clk_cam_24m: external-camera-clock-24m { + status = "okay"; + compatible = "fixed-clock"; + clock-frequency = <24000000>; + clock-output-names = "clk_cam_24m"; + #clock-cells = <0>; + }; + + camera_pwdn_gpio: camera-pwdn-gpio { + status = "okay"; + compatible = "regulator-fixed"; + regulator-name = "camera_pwdn_gpio"; + regulator-always-on; + regulator-boot-on; + enable-active-high; + gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; + }; + }; + }; + + fragment@1 { + target = <&i2c2>; + + __overlay__ { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c2m1_xfer>; + #address-cells = <1>; + #size-cells = <0>; + + camera_imx219: camera-imx219@10 { + status = "okay"; + compatible = "sony,imx219"; + reg = <0x10>; + clocks = <&clk_cam_24m>; + clock-names = "xvclk"; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "rpi-camera-v2"; + rockchip,camera-module-lens-name = "default"; + + port { + ucam_out0: endpoint { + remote-endpoint = <&mipi_in_ucam0>; + data-lanes = <1 2>; + }; + }; + }; + }; + }; + + fragment@2 { + target = <&csi2_dphy_hw>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@3 { + target = <&csi2_dphy0>; + + __overlay__ { + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + mipi_in_ucam0: endpoint@1 { + reg = <1>; + remote-endpoint = <&ucam_out0>; + data-lanes = <1 2>; + }; + }; + + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + dphy0_out: endpoint@1 { + reg = <1>; + remote-endpoint = <&isp0_in>; + }; + }; + }; + }; + }; + + fragment@4 { + target = <&rkisp_vir0>; + + __overlay__ { + status = "okay"; + + port { + #address-cells = <1>; + #size-cells = <0>; + + isp0_in: endpoint@0 { + reg = <0>; + remote-endpoint = <&dphy0_out>; + }; + }; + }; + }; + + fragment@5 { + target = <&rkisp>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@6 { + target = <&rkisp_mmu>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@7 { + target = <&rkcif_mmu>; + + __overlay__ { + status = "okay"; + }; + }; + + fragment@8 { + target = <&rkcif>; + + __overlay__ { + status = "okay"; + }; + }; +};