forked from armbian/build
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rockchip-rk3588-6.11: rebase/rewrite patches onto v6.11-rc7
- automatic / no conflicts
- Loading branch information
1 parent
3875290
commit ef537a6
Showing
6 changed files
with
41 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,19 @@ | ||
| From 3d447d15299c7eab3058e259c2514d4b407d8de1 Mon Sep 17 00:00:00 2001 | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Joshua Riek <[email protected]> | ||
| Date: Wed, 7 Aug 2024 10:19:47 -0400 | ||
| Subject: [PATCH 05/15] arm64: dts: rockchip: Split pcie30x1m1 pinctrl | ||
| Subject: arm64: dts: rockchip: Split pcie30x1m1 pinctrl | ||
|
|
||
| The PCIe 3.0 PHYs need an external clock and will assert CLKREQ# to | ||
| get it. Some RK3588 boards such as the Turning RK1, Mixtile 3588E, | ||
| and the ArmSoM AIM7 only provide this clock when CLKREQ# is asserted. | ||
|
|
||
| Signed-off-by: Joshua Riek <[email protected]> | ||
| --- | ||
| .../boot/dts/rockchip/rk3588-base-pinctrl.dtsi | 16 +++++++++++++--- | ||
| arch/arm64/boot/dts/rockchip/rk3588-base-pinctrl.dtsi | 16 ++++++++-- | ||
| 1 file changed, 13 insertions(+), 3 deletions(-) | ||
|
|
||
| diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base-pinctrl.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base-pinctrl.dtsi | ||
| index ca006f5a4c90..6de5729d2e65 100644 | ||
| index 111111111111..222222222222 100644 | ||
| --- a/arch/arm64/boot/dts/rockchip/rk3588-base-pinctrl.dtsi | ||
| +++ b/arch/arm64/boot/dts/rockchip/rk3588-base-pinctrl.dtsi | ||
| @@ -1799,12 +1799,22 @@ pcie30x4m0_pins: pcie30x4m0-pins { | ||
|
|
@@ -43,5 +43,5 @@ index ca006f5a4c90..6de5729d2e65 100644 | |
| <4 RK_PB5 4 &pcfg_pull_none>; | ||
| }; | ||
| -- | ||
| 2.25.1 | ||
| Armbian | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,7 @@ | ||
| From b8322ec8dc89b0020bb4d552e79f99fac04fa3aa Mon Sep 17 00:00:00 2001 | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Joshua Riek <[email protected]> | ||
| Date: Wed, 7 Aug 2024 10:30:50 -0400 | ||
| Subject: [PATCH 06/15] arm64: dts: rockchip: Add PCIe 3.0 pinctrl to Turing | ||
| RK1 | ||
| Subject: arm64: dts: rockchip: Add PCIe 3.0 pinctrl to Turing RK1 | ||
|
|
||
| The Turning RK1 needs to assert CLKREQ# to provide an external | ||
| clock to the PCIe 3.0 PHYs. | ||
|
|
@@ -13,7 +12,7 @@ Signed-off-by: Joshua Riek <[email protected]> | |
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | ||
| index dbaa94ca69f4..5d0053ee3d45 100644 | ||
| index 111111111111..222222222222 100644 | ||
| --- a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | ||
| +++ b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | ||
| @@ -223,7 +223,7 @@ &pcie30phy { | ||
|
|
@@ -26,5 +25,5 @@ index dbaa94ca69f4..5d0053ee3d45 100644 | |
| vpcie3v3-supply = <&vcc3v3_pcie30>; | ||
| status = "okay"; | ||
| -- | ||
| 2.25.1 | ||
| Armbian | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From 82e3d9c7dc918bb4278bdce7e9a0c4579781818d Mon Sep 17 00:00:00 2001 | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Joshua Riek <[email protected]> | ||
| Date: Wed, 7 Aug 2024 10:34:35 -0400 | ||
| Subject: [PATCH 07/15] arm64: dts: rockchip: Enable GPU node on Turing RK1 | ||
| Subject: arm64: dts: rockchip: Enable GPU node on Turing RK1 | ||
|
|
||
| Enables the Mali G610 GPU. | ||
|
|
||
|
|
@@ -11,7 +11,7 @@ Signed-off-by: Joshua Riek <[email protected]> | |
| 1 file changed, 5 insertions(+) | ||
|
|
||
| diff --git a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | ||
| index 5d0053ee3d45..e157c5acfcb5 100644 | ||
| index 111111111111..222222222222 100644 | ||
| --- a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | ||
| +++ b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | ||
| @@ -101,6 +101,11 @@ &cpu_l3 { | ||
|
|
@@ -27,5 +27,5 @@ index 5d0053ee3d45..e157c5acfcb5 100644 | |
| clock_in_out = "output"; | ||
| phy-handle = <&rgmii_phy>; | ||
| -- | ||
| 2.25.1 | ||
| Armbian | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,17 @@ | ||
| From ec302349e26ce4bc00b2d438348d302bd468cb11 Mon Sep 17 00:00:00 2001 | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Joshua Riek <[email protected]> | ||
| Date: Thu, 22 Aug 2024 22:32:47 -0400 | ||
| Subject: [PATCH 12/15] arm64: dts: rockchip: Enable automatic fan control on | ||
| the Turing RK1 | ||
| Subject: arm64: dts: rockchip: Enable automatic fan control on the Turing RK1 | ||
|
|
||
| --- | ||
| .../boot/dts/rockchip/rk3588-turing-rk1.dtsi | 32 ++++++++++++++++++- | ||
| arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | 32 +++++++++- | ||
| 1 file changed, 31 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | ||
| index f56a6a10c2ad..18b687a30e94 100644 | ||
| index 111111111111..222222222222 100644 | ||
| --- a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | ||
| +++ b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | ||
| @@ -24,7 +24,7 @@ aliases { | ||
| @@ -23,7 +23,7 @@ aliases { | ||
|
|
||
| fan: pwm-fan { | ||
| compatible = "pwm-fan"; | ||
|
|
@@ -21,7 +20,7 @@ index f56a6a10c2ad..18b687a30e94 100644 | |
| fan-supply = <&vcc5v0_sys>; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&pwm0m2_pins &fan_int>; | ||
| @@ -234,6 +234,36 @@ rgmii_phy: ethernet-phy@1 { | ||
| @@ -213,6 +213,36 @@ rgmii_phy: ethernet-phy@1 { | ||
| }; | ||
| }; | ||
|
|
||
|
|
@@ -59,5 +58,5 @@ index f56a6a10c2ad..18b687a30e94 100644 | |
| linux,pci-domain = <1>; | ||
| pinctrl-names = "default"; | ||
| -- | ||
| 2.25.1 | ||
| Armbian | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| From 8fa9e89184e736af4b81fdb67d5efa35f5d1996e Mon Sep 17 00:00:00 2001 | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Joshua Riek <[email protected]> | ||
| Date: Wed, 7 Aug 2024 14:12:21 -0400 | ||
| Subject: [PATCH 08/15] arm64: dts: rockchip: Add missing hym8563 | ||
| clock-frequency for Turing RK1 | ||
| Subject: arm64: dts: rockchip: Add missing hym8563 clock-frequency for Turing | ||
| RK1 | ||
|
|
||
| Signed-off-by: Joshua Riek <[email protected]> | ||
| --- | ||
| arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | 1 + | ||
| 1 file changed, 1 insertion(+) | ||
|
|
||
| diff --git a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | ||
| index e157c5acfcb5..dc36a7e048da 100644 | ||
| index 111111111111..222222222222 100644 | ||
| --- a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | ||
| +++ b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | ||
| @@ -191,6 +191,7 @@ hym8563: rtc@51 { | ||
|
|
@@ -22,5 +22,5 @@ index e157c5acfcb5..dc36a7e048da 100644 | |
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&hym8563_int>; | ||
| -- | ||
| 2.25.1 | ||
| Armbian | ||
|
|
||