From 5fbd6e2385615a225453562361c4bdab3b15fda1 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Fri, 09 Aug 2024 02:05:24 +0000
Subject: [PATCH] 支持切换edp/mipi显示
---
kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi | 1 +
u-boot/arch/arm/mach-rockchip/kernel_dtb.c | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi b/kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
index fe99e3e..a4bfda9 100755
--- a/kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
+++ b/kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
@@ -465,6 +465,7 @@
&dsi0_panel {
power-supply = <&vcc3v3_lcd1_n>; //LCD_PWREN_H
+ vcc-5v-gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
reset-gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_LOW>; //MIPIDIS_RST_GPIO1_A0_d_1V8
vddio-mipi = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //MIPIDIS_PWR_EN_1V8
pinctrl-names = "default";
diff --git a/u-boot/arch/arm/mach-rockchip/kernel_dtb.c b/u-boot/arch/arm/mach-rockchip/kernel_dtb.c
index b7110dc..a34c51f 100644
--- a/u-boot/arch/arm/mach-rockchip/kernel_dtb.c
+++ b/u-boot/arch/arm/mach-rockchip/kernel_dtb.c
@@ -491,16 +491,16 @@
static void fdt_fixup_display_route(void *blob, const struct display_fixup_data *data)
{
if (data->type == PANEL_TYPE_DSI) {
- fdt_fixup_display_sub_route(blob, "dsi1", FDT_STATUS_OKAY, data);
+ fdt_fixup_display_sub_route(blob, "dsi0", FDT_STATUS_OKAY, data);
fdt_fixup_display_sub_route(blob, "edp1", FDT_STATUS_DISABLED, data);
fdt_fixup_display_sub_route(blob, "lvds", FDT_STATUS_DISABLED, data);
} else if (data->type == PANEL_TYPE_EDP) {
- fdt_fixup_display_sub_route(blob, "dsi1", FDT_STATUS_DISABLED, data);
+ fdt_fixup_display_sub_route(blob, "dsi0", FDT_STATUS_DISABLED, data);
fdt_fixup_display_sub_route(blob, "edp1", FDT_STATUS_OKAY, data);
fdt_fixup_display_sub_route(blob, "lvds", FDT_STATUS_DISABLED, data);
} else if (data->type == PANEL_TYPE_LVDS) {
fdt_fixup_display_sub_route(blob, "lvds", FDT_STATUS_OKAY, data);
- fdt_fixup_display_sub_route(blob, "dsi1", FDT_STATUS_DISABLED, data);
+ fdt_fixup_display_sub_route(blob, "dsi0", FDT_STATUS_DISABLED, data);
fdt_fixup_display_sub_route(blob, "edp1", FDT_STATUS_DISABLED, data);
}
}
--
Gitblit v1.6.2