diff --git a/package/lean/pcat-manager/Makefile b/package/lean/pcat-manager/Makefile index 2004114db..da2f02d87 100644 --- a/package/lean/pcat-manager/Makefile +++ b/package/lean/pcat-manager/Makefile @@ -6,14 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pcat-manager -PKG_VERSION:=1.0.16 -PKG_RELEASE:=2 +PKG_RELEASE:=1.0.16 PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2022-11-17 +PKG_SOURCE_DATE:=2023-03-17 PKG_SOURCE_URL:=https://github.com/photonicat/rockchip_rk3568_pcat_manager -PKG_SOURCE_VERSION:=b35d84e1636bbed8751d15f4b73c911912652435 -PKG_MIRROR_HASH:=f06ef0011ed28bb7c42c308f83b89c1f4b586950bdaf5c562a4b5708789e6746 +PKG_SOURCE_VERSION:=5b8d8e098205e92fe9587f03d8bc34f8383987b2 +PKG_MIRROR_HASH:=309ff9a0c73701af3428951d0df13e29525bcb5636262486b42f6a17eaebe2c0 PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILES:=LICENSE diff --git a/package/lean/pcat-manager/files/pcat-manager.conf b/package/lean/pcat-manager/files/pcat-manager.conf index 0d48d719c..454e6bb8e 100644 --- a/package/lean/pcat-manager/files/pcat-manager.conf +++ b/package/lean/pcat-manager/files/pcat-manager.conf @@ -24,5 +24,5 @@ ChargerLimitVoltage=0 ChargerFastVoltage=0 BatteryFullThreshold=4100 BatteryDischargeTableNormal=4100;4040;3980;3920;3870;3820;3790;3770;3740;3680;3450 -BatteryDischargeTable5G=4100;4040;3980;3920;3870;3820;3790;3770;3740;3680;3600 -BatteryChargeTable=4100;4060;4020;3980;3940;3900;3860;3820;3780;3740;3700 +BatteryDischargeTable5G=4050;3980;3930;3890;3850;3815;3780;3740;3700;3655;3610 +BatteryChargeTable=4100;4085;4067;4040;4003;3942;3880;3825;3780;3725;3600 diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-photonicat.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-photonicat.dts index 800422f3a..ac83d8fa0 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-photonicat.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-photonicat.dts @@ -2,7 +2,6 @@ /dts-v1/; #include -#include #include #include #include "rk3568.dtsi" @@ -47,8 +46,8 @@ compatible = "rfkill-gpio"; name = "modem-rfkill"; type = "wwan"; - reset-gpios = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>; - shutdown-gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_LOW>; + shutdown-gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_HIGH>; }; sdio_pwrseq: sdio-pwrseq { @@ -148,13 +147,10 @@ vcc3v3_ngff: vcc3v3-ngff { compatible = "regulator-fixed"; enable-active-high; - gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&ngffpcie_enable_h>; + gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>; regulator-name = "vcc3v3_ngff"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - vin-supply = <&vcc3v3_sys>; }; vcc3v3_sd: vcc3v3_sd { @@ -179,6 +175,17 @@ vin-supply = <&vcc_syson>; }; + vcc5v0_boost: vcc5v0-boost { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&vcc5v0_boost_en>; + regulator-name = "vcc5v0_boost"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + }; + vcc5v0_usb_otg: vcc5v0-usb-otg { compatible = "regulator-fixed"; enable-active-high; @@ -399,12 +406,12 @@ }; usb { - vcc5v0_usb_otg_en: vcc5v0_usb_otg_en { - rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; + vcc5v0_boost_en: vcc5v0_boost_en { + rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; }; - ngffpcie_enable_h: ngffpcie-enable-h { - rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; + vcc5v0_usb_otg_en: vcc5v0_usb_otg_en { + rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; }; }; diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index 455bc9bfa..b98e87ccb 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -8,7 +8,7 @@ define Device/ariaboard_photonicat SOC := rk3568 UBOOT_DEVICE_NAME := photonicat-rk3568 IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r5s | pine64-img | gzip | append-metadata - DEVICE_PACKAGES := ath10k-firmware-qca9377-sdio kmod-ath10k kmod-ath10k-sdio pcat-manager + DEVICE_PACKAGES := ath10k-firmware-qca9377-sdio kmod-ath10k kmod-ath10k-sdio pcat-manager wpad endef TARGET_DEVICES += ariaboard_photonicat