mirror of https://github.com/armbian/build.git
rockchip-rk3588-6.11: rewrite/rebase patches onto v6.11 final
- no changes
This commit is contained in:
parent
5342f8489d
commit
9dacbd0ec3
|
@ -2547,7 +2547,7 @@ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockc
|
||||||
index 111111111111..222222222222 100644
|
index 111111111111..222222222222 100644
|
||||||
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
|
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
|
||||||
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
|
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
|
||||||
@@ -503,6 +503,8 @@ static int __init rockchip_drm_init(void)
|
@@ -507,6 +507,8 @@ static int __init rockchip_drm_init(void)
|
||||||
ADD_ROCKCHIP_SUB_DRIVER(cdn_dp_driver, CONFIG_ROCKCHIP_CDN_DP);
|
ADD_ROCKCHIP_SUB_DRIVER(cdn_dp_driver, CONFIG_ROCKCHIP_CDN_DP);
|
||||||
ADD_ROCKCHIP_SUB_DRIVER(dw_hdmi_rockchip_pltfm_driver,
|
ADD_ROCKCHIP_SUB_DRIVER(dw_hdmi_rockchip_pltfm_driver,
|
||||||
CONFIG_ROCKCHIP_DW_HDMI);
|
CONFIG_ROCKCHIP_DW_HDMI);
|
||||||
|
|
|
@ -4,8 +4,8 @@ Date: Thu, 6 Jun 2024 23:28:01 +0800
|
||||||
Subject: arm64: dts: rockchip: Add HDMI support to ArmSoM Sige7
|
Subject: arm64: dts: rockchip: Add HDMI support to ArmSoM Sige7
|
||||||
|
|
||||||
---
|
---
|
||||||
arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts | 30 ++++++++++
|
arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts | 35 ++++++++++
|
||||||
1 file changed, 30 insertions(+)
|
1 file changed, 35 insertions(+)
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts b/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts b/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
|
||||||
index 111111111111..222222222222 100644
|
index 111111111111..222222222222 100644
|
||||||
|
|
|
@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts b/arch/arm64/b
|
||||||
index 111111111111..222222222222 100644
|
index 111111111111..222222222222 100644
|
||||||
--- a/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
|
--- a/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
|
||||||
+++ b/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
|
+++ b/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
|
||||||
@@ -283,6 +283,22 @@ &pcie2x1l0 {
|
@@ -288,6 +288,22 @@ &pcie2x1l0 {
|
||||||
&pcie2x1l1 {
|
&pcie2x1l1 {
|
||||||
reset-gpios = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>;
|
reset-gpios = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
|
Loading…
Reference in New Issue