From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 03 Jan 2024 09:43:39 +0000
Subject: [PATCH] update kernel to 5.10.198
---
kernel/drivers/mfd/rkx110_x120/rkx110.c | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/kernel/drivers/mfd/rkx110_x120/rkx110.c b/kernel/drivers/mfd/rkx110_x120/rkx110.c
index 0e3fc4f..7a670ce 100644
--- a/kernel/drivers/mfd/rkx110_x120/rkx110.c
+++ b/kernel/drivers/mfd/rkx110_x120/rkx110.c
@@ -15,21 +15,30 @@
.base = RKX110_PATTERN_GEN_DSI0_BASE,
.link_src_reg = SER_GRF_SOC_CON4,
.link_src_offset = 12,
+ .type = RK_SERDES_DSI_RX0,
}, {
.name = "dsi1",
.base = RKX110_PATTERN_GEN_DSI1_BASE,
.link_src_reg = SER_GRF_SOC_CON4,
.link_src_offset = 13,
+ .type = RK_SERDES_DSI_RX1,
+ }, {
+ .name = "dual-lvds",
+ .link_src_reg = SER_GRF_SOC_CON1,
+ .link_src_offset = 14,
+ .type = RK_SERDES_DUAL_LVDS_RX,
}, {
.name = "lvds0",
.base = RKX110_PATTERN_GEN_LVDS0_BASE,
.link_src_reg = SER_GRF_SOC_CON4,
.link_src_offset = 14,
+ .type = RK_SERDES_LVDS_RX0,
}, {
.name = "lvds1",
.base = RKX110_PATTERN_GEN_LVDS1_BASE,
.link_src_reg = SER_GRF_SOC_CON4,
.link_src_offset = 15,
+ .type = RK_SERDES_LVDS_RX1,
},
{ /* sentinel */ }
};
@@ -295,9 +304,11 @@
int rkx110_lvds_rx_enable(struct rk_serdes *serdes, struct rk_serdes_route *route, int id)
{
- rkx110_combrxphy_set_mode(serdes, COMBRX_PHY_MODE_VIDEO_LVDS);
+ struct rk_serdes_panel *sd_panel = container_of(route, struct rk_serdes_panel, route);
+ struct rkx110_combrxphy *combrxphy = &sd_panel->combrxphy;
- rkx110_combrxphy_power_on(serdes, id ? COMBPHY_1 : COMBPHY_0);
+ rkx110_combrxphy_set_mode(combrxphy, COMBRX_PHY_MODE_VIDEO_LVDS);
+ rkx110_combrxphy_power_on(serdes, combrxphy, DEVICE_LOCAL, id ? COMBPHY_1 : COMBPHY_0);
return 0;
}
--
Gitblit v1.6.2