dev: gcdb: add pinfo into target_ldo_ctrl
Add pinfo as parameter into target_ldo_ctrl() so that
target_ldo_ctrl() can be customized base on panel info.
Change-Id: Ibc291e01d98e5725c1b8ee35917f7c678915ce53
diff --git a/dev/gcdb/display/gcdb_display.c b/dev/gcdb/display/gcdb_display.c
index f41277f..d1695f2 100755
--- a/dev/gcdb/display/gcdb_display.c
+++ b/dev/gcdb/display/gcdb_display.c
@@ -90,12 +90,13 @@
return ret;
}
-static int mdss_dsi_panel_power(uint8_t enable)
+static int mdss_dsi_panel_power(uint8_t enable,
+ struct msm_panel_info *pinfo)
{
int ret = NO_ERROR;
if (enable) {
- ret = target_ldo_ctrl(enable);
+ ret = target_ldo_ctrl(enable, pinfo);
if (ret) {
dprintf(CRITICAL, "LDO control enable failed\n");
return ret;
@@ -118,7 +119,7 @@
return ret;
}
- ret = target_ldo_ctrl(enable);
+ ret = target_ldo_ctrl(enable, pinfo);
if (ret) {
dprintf(CRITICAL, "ldo control disable failed\n");
return ret;
@@ -297,12 +298,13 @@
return target_edp_panel_disable();
}
-static int mdss_edp_panel_power(uint8_t enable)
+static int mdss_edp_panel_power(uint8_t enable,
+ struct msm_panel_info *pinfo)
{
int ret = NO_ERROR;
if (enable) {
- ret = target_ldo_ctrl(enable);
+ ret = target_ldo_ctrl(enable, pinfo);
if (ret) {
dprintf(CRITICAL, "LDO control enable failed\n");
return ret;
@@ -322,7 +324,7 @@
return ret;
}
- ret = target_ldo_ctrl(enable);
+ ret = target_ldo_ctrl(enable, pinfo);
if (ret) {
dprintf(CRITICAL, "%s: ldo control disable failed\n", __func__);
return ret;
diff --git a/dev/gcdb/display/gcdb_display.h b/dev/gcdb/display/gcdb_display.h
index 23c2811..3b112e3 100755
--- a/dev/gcdb/display/gcdb_display.h
+++ b/dev/gcdb/display/gcdb_display.h
@@ -54,7 +54,7 @@
int target_panel_clock(uint8_t enable, struct msm_panel_info *pinfo);
int target_panel_reset(uint8_t enable, struct panel_reset_sequence *resetseq,
struct msm_panel_info *pinfo);
-int target_ldo_ctrl(uint8_t enable);
+int target_ldo_ctrl(uint8_t enable, struct msm_panel_info *pinfo);
int gcdb_display_init(const char *panel_name, uint32_t rev, void *base);
bool gcdb_display_cmdline_arg(char *panel_name, char *pbuf, uint16_t buf_size);
diff --git a/platform/msm_shared/display.c b/platform/msm_shared/display.c
index c73b06f..7d4df26 100644
--- a/platform/msm_shared/display.c
+++ b/platform/msm_shared/display.c
@@ -248,7 +248,7 @@
/* Turn on panel */
if (pdata->power_func)
- ret = pdata->power_func(1);
+ ret = pdata->power_func(1, &(panel->panel_info));
if (ret)
goto msm_display_init_out;
@@ -390,7 +390,7 @@
/* Disable panel */
if (panel->power_func)
- ret = panel->power_func(0);
+ ret = panel->power_func(0, pinfo);
msm_display_off_out:
return ret;
diff --git a/platform/msm_shared/include/msm_panel.h b/platform/msm_shared/include/msm_panel.h
index 8b7af72..c596021 100755
--- a/platform/msm_shared/include/msm_panel.h
+++ b/platform/msm_shared/include/msm_panel.h
@@ -224,7 +224,7 @@
int rotate;
/* function entry chain */
- int (*power_func) (int enable);
+ int (*power_func) (int enable, struct msm_panel_info *);
int (*clk_func) (int enable);
int (*bl_func) (int enable);
int (*pll_clk_func) (int enable, struct msm_panel_info *);
diff --git a/target/apq8084/target_display.c b/target/apq8084/target_display.c
index 1dd3a66..6cd8e5d 100755
--- a/target/apq8084/target_display.c
+++ b/target/apq8084/target_display.c
@@ -233,7 +233,7 @@
return NO_ERROR;
}
-int target_ldo_ctrl(uint8_t enable)
+int target_ldo_ctrl(uint8_t enable, struct msm_panel_info *pinfo)
{
uint32_t ldocounter = 0;
uint32_t pm8x41_ldo_base = 0x13F00;
diff --git a/target/msm8226/target_display.c b/target/msm8226/target_display.c
index 355d8c9..5265f7d 100755
--- a/target/msm8226/target_display.c
+++ b/target/msm8226/target_display.c
@@ -356,7 +356,7 @@
return ret;
}
-int target_ldo_ctrl(uint8_t enable)
+int target_ldo_ctrl(uint8_t enable, struct msm_panel_info *pinfo)
{
uint32_t ret = NO_ERROR;
uint32_t ldocounter = 0;
diff --git a/target/msm8610/target_display.c b/target/msm8610/target_display.c
index 66dbbdd..0db3e9e 100755
--- a/target/msm8610/target_display.c
+++ b/target/msm8610/target_display.c
@@ -135,7 +135,7 @@
return 0;
}
-int target_ldo_ctrl(uint8_t enable)
+int target_ldo_ctrl(uint8_t enable, struct msm_panel_info *pinfo)
{
uint32_t ldocounter = 0;
uint32_t pm8x41_ldo_base = 0x13F00;
diff --git a/target/msm8916/target_display.c b/target/msm8916/target_display.c
index ba16ac1..644b750 100755
--- a/target/msm8916/target_display.c
+++ b/target/msm8916/target_display.c
@@ -352,7 +352,7 @@
return ret;
}
-int target_ldo_ctrl(uint8_t enable)
+int target_ldo_ctrl(uint8_t enable, struct msm_panel_info *pinfo)
{
/*
* The PMIC regulators needed for display are enabled in SBL.
diff --git a/target/msm8974/target_display.c b/target/msm8974/target_display.c
index 1c236b6..fab0122 100755
--- a/target/msm8974/target_display.c
+++ b/target/msm8974/target_display.c
@@ -279,7 +279,7 @@
return NO_ERROR;
}
-int target_ldo_ctrl(uint8_t enable)
+int target_ldo_ctrl(uint8_t enable, struct msm_panel_info *pinfo)
{
uint32_t ldocounter = 0;
uint32_t pm8x41_ldo_base = 0x13F00;
diff --git a/target/msm8994/target_display.c b/target/msm8994/target_display.c
index 57dfe20..56f5be9 100644
--- a/target/msm8994/target_display.c
+++ b/target/msm8994/target_display.c
@@ -250,7 +250,7 @@
return NO_ERROR;
}
-int target_ldo_ctrl(uint8_t enable)
+int target_ldo_ctrl(uint8_t enable, struct msm_panel_info *pinfo)
{
if (enable) {
regulator_enable(); /* L2, L12, L14, and L28 */
diff --git a/target/target_display.c b/target/target_display.c
index bac8a52..9333e2d 100644
--- a/target/target_display.c
+++ b/target/target_display.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -62,6 +62,10 @@
{
return 0;
}
+__WEAK int target_ldo_ctrl(uint8_t enable, struct msm_panel_info *pinfo)
+{
+ return 0;
+}
__WEAK void target_edp_panel_init(struct msm_panel_info *pinfo)
{