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>
This commit is contained in:
parent
70089e9814
commit
a3b29d7bd0
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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_ */
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue