rockchip64: adjust patches due to upstream changes in 6.19-rc7
This commit is contained in:
parent
cf13423d42
commit
a6d1719859
@ -669,14 +669,18 @@ index 111111111111..222222222222 100644
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
@@ -427,6 +818,7 @@ &pcie0 {
|
||||
max-link-speed = <2>;
|
||||
@@ -815,10 +815,11 @@ &pcie_phy {
|
||||
};
|
||||
|
||||
&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>;
|
||||
vpcie3v3-supply = <&pcie_power>;
|
||||
vpcie1v8-supply = <&avdd_1v8_s0>;
|
||||
@@ -436,36 +828,116 @@ &pcie0 {
|
||||
};
|
||||
|
||||
|
||||
@ -12,14 +12,18 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
|
||||
@@ -815,7 +815,6 @@ &pcie_phy {
|
||||
@@ -813,11 +813,10 @@ &io_domains {
|
||||
&pcie_phy {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pcie0 {
|
||||
- ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
|
||||
max-link-speed = <2>;
|
||||
num-lanes = <2>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pcie_prst &pcie_clkreqn_cpm>;
|
||||
status = "okay";
|
||||
|
||||
vpcie12v-supply = <&vcc12v_dcin>;
|
||||
--
|
||||
Armbian
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user