Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 72898ac7b80b42060b30d17cf185ea7a01194840

Authored by Nikita Kiryanov
Committed by Stefano Babic
1 parent d9cbb264e8
Exists in v2017.01-smarct4x and in 33 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf-6.6.52-2.2.0, emb_lf_v2022.04, emb_lf_v2023.04, emb_lf_v2024.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

compulab: eeprom: select i2c bus when querying for board rev 

Add support for selecting which eeprom is queried for board revision by
extending cl_eeprom_get_board_rev() to accept an i2c bus number.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>

Showing 4 changed files with 6 additions and 6 deletions Side-by-side Diff

board/compulab/cm_fx6/cm_fx6.c
Diff comments   View file @ 72898ac
... ... @@ -689,7 +689,7 @@
689 689  
690 690 u32 get_board_rev(void)
691 691 {
692   - return cl_eeprom_get_board_rev();
  692 + return cl_eeprom_get_board_rev(CONFIG_SYS_I2C_EEPROM_BUS);
693 693 }
694 694  
695 695 static struct mxc_serial_platdata cm_fx6_mxc_serial_plat = {
board/compulab/cm_t35/cm_t35.c
Diff comments   View file @ 72898ac
... ... @@ -104,7 +104,7 @@
104 104 */
105 105 u32 get_board_rev(void)
106 106 {
107   - return cl_eeprom_get_board_rev();
  107 + return cl_eeprom_get_board_rev(CONFIG_SYS_I2C_EEPROM_BUS);
108 108 };
109 109  
110 110 int misc_init_r(void)
board/compulab/common/eeprom.c
Diff comments   View file @ 72898ac
... ... @@ -121,7 +121,7 @@
121 121 * Routine: cl_eeprom_get_board_rev
122 122 * Description: read system revision from eeprom
123 123 */
124   -u32 cl_eeprom_get_board_rev(void)
  124 +u32 cl_eeprom_get_board_rev(uint eeprom_bus)
125 125 {
126 126 char str[5]; /* Legacy representation can contain at most 4 digits */
127 127 uint offset = BOARD_REV_OFFSET_LEGACY;
... ... @@ -129,7 +129,7 @@
129 129 if (board_rev)
130 130 return board_rev;
131 131  
132   - if (cl_eeprom_setup(CONFIG_SYS_I2C_EEPROM_BUS))
  132 + if (cl_eeprom_setup(eeprom_bus))
133 133 return 0;
134 134  
135 135 if (cl_eeprom_layout != LAYOUT_LEGACY)
board/compulab/common/eeprom.h
Diff comments   View file @ 72898ac
... ... @@ -12,13 +12,13 @@
12 12  
13 13 #ifdef CONFIG_SYS_I2C
14 14 int cl_eeprom_read_mac_addr(uchar *buf, uint eeprom_bus);
15   -u32 cl_eeprom_get_board_rev(void);
  15 +u32 cl_eeprom_get_board_rev(uint eeprom_bus);
16 16 #else
17 17 static inline int cl_eeprom_read_mac_addr(uchar *buf, uint eeprom_bus)
18 18 {
19 19 return 1;
20 20 }
21   -static inline u32 cl_eeprom_get_board_rev(void)
  21 +static inline u32 cl_eeprom_get_board_rev(uint eeprom_bus)
22 22 {
23 23 return 0;
24 24 }