rockchip64-current: rewrite patches due to upstream changes

This commit is contained in:
EvilOlaf 2026-01-31 06:11:45 +00:00 committed by Igor
parent e9f1902134
commit b463f4f877
3 changed files with 10 additions and 10 deletions

View File

@ -669,15 +669,15 @@ index 111111111111..222222222222 100644
status = "okay";
};
@@ -427,6 +818,7 @@ &pcie0 {
max-link-speed = <2>;
@@ -426,6 +817,7 @@ &pcie0 {
ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
num-lanes = <2>;
pinctrl-names = "default";
+ pinctrl-0 = <&pcie_prst &pcie_clkreqn_cpm>;
status = "okay";
vpcie12v-supply = <&vcc12v_dcin>;
@@ -436,36 +828,116 @@ &pcie0 {
@@ -435,36 +827,116 @@ &pcie0 {
};
&pinctrl {
@ -802,7 +802,7 @@ index 111111111111..222222222222 100644
hdd_a_power_en: hdd-a-power-en {
rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
};
@@ -485,7 +957,7 @@ usb_lan_en: usb-lan-en {
@@ -484,7 +956,7 @@ usb_lan_en: usb-lan-en {
vcc3v0-sd {
sdmmc0_pwr_h: sdmmc0-pwr-h {
@ -811,7 +811,7 @@ index 111111111111..222222222222 100644
};
};
};
@@ -505,10 +977,28 @@ &pwm1 {
@@ -504,10 +976,28 @@ &pwm1 {
status = "okay";
};
@ -840,7 +840,7 @@ index 111111111111..222222222222 100644
vqmmc-supply = <&vcc1v8_sys_s0>;
status = "okay";
};
@@ -516,8 +1006,9 @@ &sdhci {
@@ -515,8 +1005,9 @@ &sdhci {
&sdmmc {
bus-width = <4>;
cap-sd-highspeed;
@ -851,7 +851,7 @@ index 111111111111..222222222222 100644
pinctrl-names = "default";
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
vmmc-supply = <&vcc3v0_sd>;
@@ -546,6 +1037,27 @@ &spi5 {
@@ -545,6 +1036,27 @@ &spi5 {
status = "okay";
};
@ -879,7 +879,7 @@ index 111111111111..222222222222 100644
&tcphy1 {
/* phy for &usbdrd_dwc3_1 */
status = "okay";
@@ -559,61 +1071,122 @@ &tsadc {
@@ -558,61 +1070,122 @@ &tsadc {
status = "okay";
};

View File

@ -19,7 +19,7 @@ index 111111111111..222222222222 100644
- ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
num-lanes = <2>;
pinctrl-names = "default";
status = "okay";
pinctrl-0 = <&pcie_prst &pcie_clkreqn_cpm>;
--
Armbian

View File

@ -20,7 +20,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
@@ -1242,7 +1242,7 @@ rknn_mmu_2: iommu@fdad9000 {
@@ -1242,7 +1242,7 @@ rknn_mmu_2: iommu@fdada000 {
};
vpu121: video-codec@fdb50000 {