drv/i2c/ptn3460: Add 'mainboard' prefix to mainboard-level callbacks
As discused earlier, the callback name 'mb_adjust_cfg' was considered
too generic. The new naming is chosen to be consistent with other
drivers' callback names designed to be used at mainboard level.
Also other functions, namely 'mb_get_edid' and 'mb_select_edid_table'
are renamed accordingly.
BUG=none
TEST=Builds for siemens/mc_apl{1,4,5,7} and siemens/mc_ehl boards
complete successfully.
Change-Id: I4cbec0e72e5f03e94df0faa36765d1a6cd873a7a
Signed-off-by: Jan Samek <jan.samek@siemens.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72629
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Mario Scheithauer <mario.scheithauer@siemens.com>
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
diff --git a/src/drivers/i2c/ptn3460/ptn3460.c b/src/drivers/i2c/ptn3460/ptn3460.c
index d2df04d..7dee222 100644
--- a/src/drivers/i2c/ptn3460/ptn3460.c
+++ b/src/drivers/i2c/ptn3460/ptn3460.c
@@ -76,13 +76,13 @@
}
/* Mainboard provides EDID data. */
- if (mb_get_edid(edid_data) != CB_SUCCESS) {
+ if (mainboard_ptn3460_get_edid(edid_data) != CB_SUCCESS) {
printk(BIOS_ERR, "PTN3460 error: Unable to get EDID data from mainboard.\n");
return;
}
/* Mainboard decides which EDID table has to be used. */
- edid_tab = mb_select_edid_table();
+ edid_tab = mainboard_ptn3460_select_edid_table();
if (edid_tab > PTN_MAX_EDID_NUM) {
printk(BIOS_ERR, "PTN3460 error: invalid EDID table (%d) selected.\n",
edid_tab);
@@ -108,7 +108,7 @@
}
/* Mainboard can modify the configuration data.
Write back configuration data to PTN3460 if modified by mainboard */
- if (mb_adjust_cfg(&cfg) == CB_SUCCESS) {
+ if (mainboard_ptn3460_config(&cfg) == CB_SUCCESS) {
ptr = (uint8_t *)&cfg;
for (i = 0; i < sizeof(struct ptn_3460_config); i++) {
val = i2c_dev_writeb_at(dev, PTN_CONFIG_OFF + i, *ptr++);
@@ -123,15 +123,15 @@
init_done = true;
}
-__weak enum cb_err mb_get_edid(uint8_t edid_data[PTN_EDID_LEN])
+__weak enum cb_err mainboard_ptn3460_get_edid(uint8_t edid_data[PTN_EDID_LEN])
{
return CB_ERR;
}
-__weak uint8_t mb_select_edid_table(void)
+__weak uint8_t mainboard_ptn3460_select_edid_table(void)
{
return 0;
}
-__weak enum cb_err mb_adjust_cfg(struct ptn_3460_config *cfg_ptr)
+__weak enum cb_err mainboard_ptn3460_config(struct ptn_3460_config *cfg_ptr)
{
return CB_ERR;
}
diff --git a/src/drivers/i2c/ptn3460/ptn3460.h b/src/drivers/i2c/ptn3460/ptn3460.h
index ecd2191..a3fa60b 100644
--- a/src/drivers/i2c/ptn3460/ptn3460.h
+++ b/src/drivers/i2c/ptn3460/ptn3460.h
@@ -52,8 +52,8 @@
/* We need functions which we can call to get mainboard specific data */
/* These functions can be implemented somewhere else but must exist. */
-extern enum cb_err mb_get_edid(uint8_t edid_data[PTN_EDID_LEN]);
-extern uint8_t mb_select_edid_table(void);
-extern enum cb_err mb_adjust_cfg(struct ptn_3460_config *cfg_ptr);
+extern enum cb_err mainboard_ptn3460_get_edid(uint8_t edid_data[PTN_EDID_LEN]);
+extern uint8_t mainboard_ptn3460_select_edid_table(void);
+extern enum cb_err mainboard_ptn3460_config(struct ptn_3460_config *cfg_ptr);
#endif /* _I2C_PTN3460_H_ */
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl1/lcd_panel.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl1/lcd_panel.c
index 8a20f36..bad4da7 100644
--- a/src/mainboard/siemens/mc_apl1/variants/mc_apl1/lcd_panel.c
+++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl1/lcd_panel.c
@@ -10,7 +10,7 @@
* @param edid_data pointer to EDID data in driver
* @return CB_SUCCESS on successful EDID data retrieval, CB_ERR otherwise
*/
-enum cb_err mb_get_edid(uint8_t edid_data[PTN_EDID_LEN])
+enum cb_err mainboard_ptn3460_get_edid(uint8_t edid_data[PTN_EDID_LEN])
{
const char *hwi_block = "hwinfo.hex";
@@ -31,7 +31,7 @@
* which has to be used.
* @return Index of the EDID slot selected for EDID emulation
*/
-uint8_t mb_select_edid_table(void)
+uint8_t mainboard_ptn3460_select_edid_table(void)
{
return 6; /* With this mainboard we use EDID block 6 for emulation in PTN3460. */
}
@@ -41,7 +41,7 @@
* @param *cfg_ptr Pointer to the PTN config structure to modify
* @return CB_SUCCESS if data was modified and needs to be updated; CB_ERR on error
*/
-enum cb_err mb_adjust_cfg(struct ptn_3460_config *cfg)
+enum cb_err mainboard_ptn3460_config(struct ptn_3460_config *cfg)
{
const char *hwi_block = "hwinfo.hex";
uint8_t disp_con = 0, color_depth = 0;
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl4/lcd_panel.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl4/lcd_panel.c
index 39cc274..7f4334e 100644
--- a/src/mainboard/siemens/mc_apl1/variants/mc_apl4/lcd_panel.c
+++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl4/lcd_panel.c
@@ -10,7 +10,7 @@
* @param edid_data pointer to EDID data in driver
* @return CB_SUCCESS on successful EDID data retrieval, CB_ERR otherwise
*/
-enum cb_err mb_get_edid(uint8_t edid_data[PTN_EDID_LEN])
+enum cb_err mainboard_ptn3460_get_edid(uint8_t edid_data[PTN_EDID_LEN])
{
const char *hwi_block = "hwinfo.hex";
@@ -31,7 +31,7 @@
* which has to be used.
* @return Index of the EDID slot selected for EDID emulation
*/
-uint8_t mb_select_edid_table(void)
+uint8_t mainboard_ptn3460_select_edid_table(void)
{
return 6; /* With this mainboard we use EDID block 6 for emulation in PTN3460. */
}
@@ -41,7 +41,7 @@
* @param *cfg_ptr Pointer to the PTN config structure to modify
* @return CB_SUCCESS if data was modified and needs to be updated; CB_ERR on error
*/
-enum cb_err mb_adjust_cfg(struct ptn_3460_config *cfg)
+enum cb_err mainboard_ptn3460_config(struct ptn_3460_config *cfg)
{
const char *hwi_block = "hwinfo.hex";
uint8_t disp_con = 0, color_depth = 0;
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/lcd_panel.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/lcd_panel.c
index c74e90a..320fcc7 100644
--- a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/lcd_panel.c
+++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/lcd_panel.c
@@ -33,7 +33,7 @@
* @param edid_data pointer to EDID data in driver
* @return CB_SUCCESS on successful EDID data retrieval, CB_ERR otherwise
*/
-enum cb_err mb_get_edid(uint8_t edid_data[PTN_EDID_LEN])
+enum cb_err mainboard_ptn3460_get_edid(uint8_t edid_data[PTN_EDID_LEN])
{
const char *hwi_block = "hwinfo.hex";
@@ -56,7 +56,7 @@
* which has to be used.
* @return Index of the EDID slot selected for EDID emulation
*/
-uint8_t mb_select_edid_table(void)
+uint8_t mainboard_ptn3460_select_edid_table(void)
{
return 6; /* With this mainboard we use EDID block 6 for emulation in PTN3460. */
}
@@ -66,7 +66,7 @@
* @param *cfg_ptr Pointer to the PTN config structure to modify
* @return CB_SUCCESS if data was modified and needs to be updated; CB_ERR on error
*/
-enum cb_err mb_adjust_cfg(struct ptn_3460_config *cfg)
+enum cb_err mainboard_ptn3460_config(struct ptn_3460_config *cfg)
{
const char *hwi_block = "hwinfo.hex";
uint8_t disp_con = 0, color_depth = 0;
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl7/lcd_panel.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl7/lcd_panel.c
index 39cc274..7f4334e 100644
--- a/src/mainboard/siemens/mc_apl1/variants/mc_apl7/lcd_panel.c
+++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl7/lcd_panel.c
@@ -10,7 +10,7 @@
* @param edid_data pointer to EDID data in driver
* @return CB_SUCCESS on successful EDID data retrieval, CB_ERR otherwise
*/
-enum cb_err mb_get_edid(uint8_t edid_data[PTN_EDID_LEN])
+enum cb_err mainboard_ptn3460_get_edid(uint8_t edid_data[PTN_EDID_LEN])
{
const char *hwi_block = "hwinfo.hex";
@@ -31,7 +31,7 @@
* which has to be used.
* @return Index of the EDID slot selected for EDID emulation
*/
-uint8_t mb_select_edid_table(void)
+uint8_t mainboard_ptn3460_select_edid_table(void)
{
return 6; /* With this mainboard we use EDID block 6 for emulation in PTN3460. */
}
@@ -41,7 +41,7 @@
* @param *cfg_ptr Pointer to the PTN config structure to modify
* @return CB_SUCCESS if data was modified and needs to be updated; CB_ERR on error
*/
-enum cb_err mb_adjust_cfg(struct ptn_3460_config *cfg)
+enum cb_err mainboard_ptn3460_config(struct ptn_3460_config *cfg)
{
const char *hwi_block = "hwinfo.hex";
uint8_t disp_con = 0, color_depth = 0;
diff --git a/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/lcd_panel.c b/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/lcd_panel.c
index 965f62d..a4985c1 100644
--- a/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/lcd_panel.c
+++ b/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/lcd_panel.c
@@ -10,7 +10,7 @@
* @param edid_data pointer to EDID data in driver
* @return CB_SUCCESS on successful EDID data retrieval, CB_ERR otherwise
*/
-enum cb_err mb_get_edid(uint8_t edid_data[PTN_EDID_LEN])
+enum cb_err mainboard_ptn3460_get_edid(uint8_t edid_data[PTN_EDID_LEN])
{
const char *hwi_block = "hwinfo.hex";
@@ -31,7 +31,7 @@
* which has to be used.
* @return Index of the EDID slot selected for EDID emulation
*/
-uint8_t mb_select_edid_table(void)
+uint8_t mainboard_ptn3460_select_edid_table(void)
{
return 6; /* With this mainboard we use EDID block 6 for emulation in PTN3460. */
}
@@ -41,7 +41,7 @@
* @param *cfg_ptr Pointer to the PTN config structure to modify
* @return CB_SUCCESS if data was modified and needs to be updated; CB_ERR on error
*/
-enum cb_err mb_adjust_cfg(struct ptn_3460_config *cfg)
+enum cb_err mainboard_ptn3460_config(struct ptn_3460_config *cfg)
{
const char *hwi_block = "hwinfo.hex";
uint8_t disp_con = 0, color_depth = 0;