diff options
7 files changed, 24 insertions, 24 deletions
diff --git a/src/drivers/i2c/ptn3460/ptn3460.c b/src/drivers/i2c/ptn3460/ptn3460.c index d2df04d216..7dee2222a0 100644 --- a/src/drivers/i2c/ptn3460/ptn3460.c +++ b/src/drivers/i2c/ptn3460/ptn3460.c @@ -76,13 +76,13 @@ static void ptn3460_init(struct device *dev) } /* 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 @@ static void ptn3460_init(struct device *dev) } /* 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 @@ static void ptn3460_init(struct device *dev) 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 ecd2191f39..a3fa60bdc0 100644 --- a/src/drivers/i2c/ptn3460/ptn3460.h +++ b/src/drivers/i2c/ptn3460/ptn3460.h @@ -52,8 +52,8 @@ struct ptn_3460_flash { /* 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 8a20f364d5..bad4da79ea 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 @@ enum cb_err mb_get_edid(uint8_t edid_data[PTN_EDID_LEN]) * 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 @@ uint8_t mb_select_edid_table(void) * @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 39cc274e21..7f4334eb9e 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 @@ enum cb_err mb_get_edid(uint8_t edid_data[PTN_EDID_LEN]) * 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 @@ uint8_t mb_select_edid_table(void) * @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 c74e90ab61..320fcc7f47 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 @@ static void igd_disable(void) * @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 @@ enum cb_err mb_get_edid(uint8_t edid_data[PTN_EDID_LEN]) * 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 @@ uint8_t mb_select_edid_table(void) * @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 39cc274e21..7f4334eb9e 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 @@ enum cb_err mb_get_edid(uint8_t edid_data[PTN_EDID_LEN]) * 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 @@ uint8_t mb_select_edid_table(void) * @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 965f62d57d..a4985c1c21 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 @@ enum cb_err mb_get_edid(uint8_t edid_data[PTN_EDID_LEN]) * 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 @@ uint8_t mb_select_edid_table(void) * @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; |