-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rockchip64/rockchip-rk3588: rewrite/rebase patches against 6.12 final…
…, no changes
- Loading branch information
Showing
55 changed files
with
215 additions
and
230 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
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
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 |
|---|---|---|
|
|
@@ -7,14 +7,14 @@ Add support for the HDMI0 output port found on RK3588 SoC. | |
|
|
||
| Signed-off-by: Cristian Ciocaltea <[email protected]> | ||
| --- | ||
| arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 41 +++++++++++++++++++ | ||
| arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 41 ++++++++++ | ||
| 1 file changed, 41 insertions(+) | ||
|
|
||
| diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | ||
| index d97d84b88..bef584795 100644 | ||
| index 111111111111..222222222222 100644 | ||
| --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | ||
| +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | ||
| @@ -1366,6 +1366,47 @@ i2s9_8ch: i2s@fddfc000 { | ||
| @@ -1370,6 +1370,47 @@ i2s9_8ch: i2s@fddfc000 { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
|
|
@@ -80,7 +80,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 | ||
| @@ -2868,6 +2868,7 @@ hdptxphy_hdmi0: phy@fed60000 { | ||
| @@ -2822,6 +2822,7 @@ hdptxphy_hdmi0: phy@fed60000 { | ||
| reg = <0x0 0xfed60000 0x0 0x2000>; | ||
| clocks = <&cru CLK_USB2PHY_HDPTXRXPHY_REF>, <&cru PCLK_HDPTX0>; | ||
| clock-names = "ref", "apb"; | ||
|
|
||
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
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 |
|---|---|---|
|
|
@@ -9,24 +9,18 @@ Signed-off-by: SuperKali <[email protected]> | |
| 1 file changed, 36 insertions(+) | ||
|
|
||
| diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | ||
| index ac537e3b9c35..f35dc55423d2 100644 | ||
| index 111111111111..222222222222 100644 | ||
| --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | ||
| +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | ||
| @@ -9,10 +9,11 @@ | ||
|
|
||
| #include <dt-bindings/gpio/gpio.h> | ||
| @@ -11,6 +11,7 @@ | ||
| #include <dt-bindings/input/input.h> | ||
| #include <dt-bindings/pinctrl/rockchip.h> | ||
| #include <dt-bindings/usb/pd.h> | ||
| +#include <dt-bindings/soc/rockchip,vop2.h> | ||
| #include "rk3588.dtsi" | ||
|
|
||
| / { | ||
| model = "FriendlyElec NanoPC-T6"; | ||
| compatible = "friendlyarm,nanopc-t6", "rockchip,rk3588"; | ||
| @@ -257,10 +258,15 @@ &cpu_b2 { | ||
|
|
||
| &cpu_b3 { | ||
| @@ -259,6 +260,11 @@ &cpu_b3 { | ||
| cpu-supply = <&vdd_cpu_big1_s0>; | ||
| }; | ||
|
|
||
|
|
@@ -38,11 +32,7 @@ index ac537e3b9c35..f35dc55423d2 100644 | |
| &gpio0 { | ||
| gpio-line-names = /* GPIO0 A0-A7 */ | ||
| "", "", "", "", | ||
| "", "", "", "", | ||
| /* GPIO0 B0-B7 */ | ||
| @@ -337,10 +343,25 @@ &gpio4 { | ||
| &gpu { | ||
| mali-supply = <&vdd_gpu_s0>; | ||
| @@ -339,6 +345,21 @@ &gpu { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
|
|
@@ -64,11 +54,7 @@ index ac537e3b9c35..f35dc55423d2 100644 | |
| &i2c0 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&i2c0m2_xfer>; | ||
| status = "okay"; | ||
|
|
||
| @@ -1095,5 +1116,20 @@ &usb_host1_ehci { | ||
| }; | ||
|
|
||
| @@ -1097,3 +1118,18 @@ &usb_host1_ehci { | ||
| &usb_host1_ohci { | ||
| status = "okay"; | ||
| }; | ||
|
|
@@ -89,3 +75,4 @@ index ac537e3b9c35..f35dc55423d2 100644 | |
| +}; | ||
| -- | ||
| 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
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,14 +1,14 @@ | ||
| From eb044a5c32274d48f0b62ab111213e930942b503 Mon Sep 17 00:00:00 2001 | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: amazingfate <[email protected]> | ||
| Date: Wed, 6 Nov 2024 19:57:53 +0800 | ||
| Subject: [PATCH] tools: disable sched_ext_clean | ||
| Subject: tools: disable sched_ext_clean | ||
|
|
||
| --- | ||
| tools/Makefile | 3 +-- | ||
| 1 file changed, 1 insertion(+), 2 deletions(-) | ||
|
|
||
| diff --git a/tools/Makefile b/tools/Makefile | ||
| index 278d24723..d84b76dbe 100644 | ||
| index 111111111111..222222222222 100644 | ||
| --- a/tools/Makefile | ||
| +++ b/tools/Makefile | ||
| @@ -220,7 +220,6 @@ clean: acpi_clean counter_clean cpupower_clean hv_clean firewire_clean \ | ||
|
|
@@ -21,5 +21,5 @@ index 278d24723..d84b76dbe 100644 | |
|
|
||
| .PHONY: FORCE | ||
| -- | ||
| 2.43.0 | ||
| 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 |
|---|---|---|
|
|
@@ -8,8 +8,8 @@ Subject: Adding support for the fine3399 board | |
| > X-Git-Archeology: From: Lemon1151 <[email protected]> | ||
| > X-Git-Archeology: Subject: Adding support for the fine3399 board | ||
| --- | ||
| arch/arm64/boot/dts/rockchip/rk3399-fine3399.dts | 871 ++++++++++ | ||
| 1 file changed, 871 insertions(+) | ||
| arch/arm64/boot/dts/rockchip/rk3399-fine3399.dts | 870 ++++++++++ | ||
| 1 file changed, 870 insertions(+) | ||
|
|
||
| diff --git a/arch/arm64/boot/dts/rockchip/rk3399-fine3399.dts b/arch/arm64/boot/dts/rockchip/rk3399-fine3399.dts | ||
| new file mode 100644 | ||
|
|
||
Oops, something went wrong.