rockchip: fix Photonicat 2 support

This commit is contained in:
coolsnowwolf 2025-08-01 15:00:22 +08:00
parent 8c0898a465
commit ef9c10391d
7 changed files with 92 additions and 64 deletions

View File

@ -1,11 +1,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=photonicat-firmware
PKG_NAME:=pcat-firmware
PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk
define Package/photonicat-firmware
define Package/pcat-firmware
SECTION:=firmware
CATEGORY:=Firmware
TITLE:=Photonicat WiFi Firmware
@ -15,7 +15,7 @@ endef
define Build/Compile
endef
define Package/photonicat-firmware/install
define Package/pcat-firmware/install
$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9377/hw1.0
$(INSTALL_DATA) \
./files/board.bin \
@ -25,4 +25,4 @@ define Package/photonicat-firmware/install
$(1)/lib/firmware/ath10k/QCA9377/hw1.0/firmware-sdio-5.bin
endef
$(eval $(call BuildPackage,photonicat-firmware))
$(eval $(call BuildPackage,pcat-firmware))

View File

@ -632,10 +632,10 @@ CONFIG_SERIAL_8250_DWLIB=y
CONFIG_SERIAL_8250_EXAR=y
CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_FSL=y
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_NR_UARTS=12
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PCILIB=y
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
CONFIG_SERIAL_8250_RUNTIME_UARTS=12
CONFIG_SERIAL_8250_SHARE_IRQ=y
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

View File

@ -74,8 +74,8 @@
vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
compatible = "regulator-fixed";
regulator-name = "vcc_1v1_nldo_s3";
regulator-boot-on;
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
vin-supply = <&vcc_5v0_sys>;
@ -84,8 +84,8 @@
vcc_1v8_s0: regulator-vcc-1v8-s0 {
compatible = "regulator-fixed";
regulator-name = "vcc_1v8_s0";
regulator-boot-on;
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
vin-supply = <&vcc_1v8_s3>;
@ -94,8 +94,8 @@
vcc_2v0_pldo_s3: regulator-vcc-2v0-pldo-s3 {
compatible = "regulator-fixed";
regulator-name = "vcc_2v0_pldo_s3";
regulator-boot-on;
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <2000000>;
regulator-max-microvolt = <2000000>;
vin-supply = <&vcc_5v0_sys>;
@ -130,8 +130,8 @@
vcc_3v3_rtc_s5: regulator-vcc-3v3-rtc-s5 {
compatible = "regulator-fixed";
regulator-name = "vcc_3v3_rtc_s5";
regulator-boot-on;
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
vin-supply = <&vcc_5v0_sys>;
@ -140,8 +140,8 @@
vcc_3v3_s0: regulator-vcc-3v3-s0 {
compatible = "regulator-fixed";
regulator-name = "vcc_3v3_s0";
regulator-boot-on;
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
vin-supply = <&vcc_3v3_s3>;
@ -173,7 +173,6 @@
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
startup-delay-us = <100000>;
gpio = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&usb_hub_switch>;
@ -192,45 +191,42 @@
vin-supply = <&vcc5v0_usb_switch>;
};
rfkill-usb-wlan {
compatible = "rfkill-gpio";
pinctrl-names = "default";
pinctrl-0 = <&rfkill_usb_wlan>;
label = "rfkill-usb-wlan";
radio-type = "wlan";
shutdown-gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>;
};
rfkill-pcie-wlan {
compatible = "rfkill-gpio";
pinctrl-names = "default";
pinctrl-0 = <&rfkill_pcie_wlan>;
label = "rfkill-pcie-wlan";
radio-type = "wlan";
shutdown-gpios = <&gpio0 RK_PD1 GPIO_ACTIVE_HIGH>;
};
rfkill-pcie-bluetooth {
compatible = "rfkill-gpio";
label = "rfkill-pcie-bluetooth";
pinctrl-names = "default";
pinctrl-0 = <&rfkill_pcie_bluetooth>;
label = "rfkill-pcie-bluetooth";
radio-type = "bluetooth";
shutdown-gpios = <&gpio0 RK_PD0 GPIO_ACTIVE_HIGH>;
};
modem-rfkill {
compatible = "rfkill-gpio-neo";
rfkill-pcie-wlan {
compatible = "rfkill-gpio";
label = "rfkill-pcie-wlan";
pinctrl-names = "default";
pinctrl-0 = <&rfkill_pcie_wlan>;
radio-type = "wlan";
shutdown-gpios = <&gpio0 RK_PD1 GPIO_ACTIVE_HIGH>;
};
rfkill-usb-wlan {
compatible = "rfkill-gpio";
label = "rfkill-usb-wlan";
pinctrl-names = "default";
pinctrl-0 = <&rfkill_usb_wlan>;
radio-type = "wlan";
reset-gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>;
shutdown-gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>;
};
rfkill-usb-wwan {
compatible = "rfkill-gpio";
label = "rfkill-usb-wwan";
pinctrl-names = "default";
pinctrl-0 = <&rfkill_usb_wwan>;
name = "modem-rfkill";
type = "wwan";
power-gpio = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>;
reset-gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
block-gpio = <&gpio0 RK_PB5 GPIO_ACTIVE_LOW>;
power-on-wait-time = <500>;
reset-wait-time = <0>;
reset-active-time = <800>;
radio-type = "wwan";
reset-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_LOW>;
shutdown-gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
};
};
@ -752,13 +748,16 @@
rockchip,pins = <4 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;
};
usb_hub_reset: usb-hub-reset {
rockchip,pins = <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
};
usb_hub_switch: usb-hub-switch {
rockchip,pins = <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
spi1 {
/omit-if-no-ref/
spi1m2_1_pins: spi1m2-1-pins {
rockchip,pins =
/* spi1_clk_m2 */
@ -784,19 +783,17 @@
};
rfkill {
rfkill_usb_wlan: rfkill-usb-wlan {
rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_down>;
rfkill_pcie_bluetooth: rfkill-pcie-bluetooth {
rockchip,pins = <0 RK_PD0 RK_FUNC_GPIO &pcfg_pull_down>;
};
rfkill_pcie_wlan: rfkill-pcie-wlan {
rockchip,pins = <0 RK_PD1 RK_FUNC_GPIO &pcfg_pull_down>;
};
rfkill_pcie_bluetooth: rfkill-pcie-bluetooth {
rockchip,pins = <0 RK_PD0 RK_FUNC_GPIO &pcfg_pull_down>;
rfkill_usb_wlan: rfkill-usb-wlan {
rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_down>;
};
rfkill_usb_wwan: rfkill-usb-wwan {
rockchip,pins = <0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_down>,
<0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>,
<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};
@ -864,7 +861,27 @@
&usb_drd0_dwc3 {
dr_mode = "host";
pinctrl-names = "default";
pinctrl-0 = <&usb_hub_reset>;
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
hub_2_0: hub@1 {
compatible = "usb5e3,610";
reg = <1>;
peer-hub = <&hub_3_0>;
reset-gpios = <&gpio3 RK_PB0 GPIO_ACTIVE_LOW>;
vdd-supply = <&vcc_3v3_s3>;
};
hub_3_0: hub@2 {
compatible = "usb5e3,620";
reg = <2>;
peer-hub = <&hub_2_0>;
reset-gpios = <&gpio3 RK_PB0 GPIO_ACTIVE_LOW>;
vdd-supply = <&vcc_3v3_s3>;
};
};
&u2phy0_otg {
@ -872,10 +889,6 @@
status = "okay";
};
&usbdp_phy {
status = "okay";
};
&uart0 {
pinctrl-0 = <&uart0m0_xfer>;
status = "okay";
@ -903,6 +916,10 @@
};
};
&usbdp_phy {
status = "okay";
};
&vop {
status = "okay";
};

View File

@ -18,7 +18,7 @@ define Device/ariaboard_photonicat
SOC := rk3568
UBOOT_DEVICE_NAME := photonicat-rk3568
IMAGE/sysupgrade.img.gz := boot-common | boot-script vop | pine64-img | gzip | append-metadata
DEVICE_PACKAGES := photonicat-firmware kmod-drm-rockchip kmod-ath10k kmod-ath10k-sdio pcat-manager wpad
DEVICE_PACKAGES := kmod-drm-rockchip kmod-ath10k kmod-ath10k-sdio pcat-firmware pcat-manager wpad
endef
TARGET_DEVICES += ariaboard_photonicat
@ -29,6 +29,7 @@ define Device/ariaboard_photonicat2
DEVICE_DTS := rockchip/rk3576-photonicat2
UBOOT_DEVICE_NAME := evb-rk3576
IMAGE/sysupgrade.img.gz := boot-common | boot-script rk3576 | pine64-img | gzip | append-metadata
DEVICE_PACKAGES := kmod-aic8800u wpad-openssl
endef
TARGET_DEVICES += ariaboard_photonicat2
@ -622,16 +623,6 @@ define Device/xunlong_orangepi-5
endef
TARGET_DEVICES += xunlong_orangepi-5
define Device/xunlong_orangepi-5-plus
DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi 5 Plus
SOC := rk3588
UBOOT_DEVICE_NAME := orangepi-5-plus-rk3588
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
DEVICE_PACKAGES := kmod-r8125-rss
endef
TARGET_DEVICES += xunlong_orangepi-5-plus
define Device/xunlong_orangepi-5-max
DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi 5 Max
@ -642,6 +633,16 @@ define Device/xunlong_orangepi-5-max
endef
TARGET_DEVICES += xunlong_orangepi-5-max
define Device/xunlong_orangepi-5-plus
DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi 5 Plus
SOC := rk3588
UBOOT_DEVICE_NAME := orangepi-5-plus-rk3588
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
DEVICE_PACKAGES := kmod-r8125-rss
endef
TARGET_DEVICES += xunlong_orangepi-5-plus
define Device/xunlong_orangepi-5-ultra
DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi 5 Ultra

View File

@ -41,3 +41,13 @@ Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
+ };
+ };
+};
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
@@ -14,6 +14,7 @@
/dts-v1/;
#include <dt-bindings/input/linux-event-codes.h>
#include "rk3399.dtsi"
+#include "rk3399-opp.dtsi"
/ {
aliases {