Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 03544c6640e8a969f8409eac637f4780e1eabb1d

Authored by Albert ARIBAUD \\(3ADEV\\)
Committed by Stefano Babic
1 parent 3f353ceccb
Exists in v2017.01-smarct4x and in 30 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.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

I2C: mxc_i2c: make I2C1 and I2C2 optional 

The driver assumed that I2C1 and I2C2 were always enabled,
and if they were not, then an asynchronous abort was (silently)
raised, to be caught much later on in the Linux kernel.

Fix this by making I2C1 and I2C2 optional just like I2C3 and I2C4
are.

To make the change binary-invariant, declare I2C1 and I2C2 in
every include/configs/ file which defines CONFIG_SYS_I2C_MXC.

Also, while updating README about CONFIG_SYS_I2C_MXC_I2C1 and
CONFIG_SYS_I2C_MXC_I2C2, add missing descriptions for I2C4 speed
(CONFIG_SYS_MXC_I2C4_SPEED) and slave (CONFIG_SYS_MXC_I2C4_SLAVE)
config options.

Signed-off-by: Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr>

Showing 38 changed files with 83 additions and 3 deletions Side-by-side Diff

... ... @@ -2359,16 +2359,20 @@
2359 2359  
2360 2360 - drivers/i2c/i2c_mxc.c
2361 2361 - activate this driver with CONFIG_SYS_I2C_MXC
  2362 + - enable bus 1 with CONFIG_SYS_I2C_MXC_I2C1
  2363 + - enable bus 2 with CONFIG_SYS_I2C_MXC_I2C2
  2364 + - enable bus 3 with CONFIG_SYS_I2C_MXC_I2C3
  2365 + - enable bus 4 with CONFIG_SYS_I2C_MXC_I2C4
2362 2366 - define speed for bus 1 with CONFIG_SYS_MXC_I2C1_SPEED
2363 2367 - define slave for bus 1 with CONFIG_SYS_MXC_I2C1_SLAVE
2364 2368 - define speed for bus 2 with CONFIG_SYS_MXC_I2C2_SPEED
2365 2369 - define slave for bus 2 with CONFIG_SYS_MXC_I2C2_SLAVE
2366 2370 - define speed for bus 3 with CONFIG_SYS_MXC_I2C3_SPEED
2367 2371 - define slave for bus 3 with CONFIG_SYS_MXC_I2C3_SLAVE
  2372 + - define speed for bus 4 with CONFIG_SYS_MXC_I2C4_SPEED
  2373 + - define slave for bus 4 with CONFIG_SYS_MXC_I2C4_SLAVE
2368 2374 If those defines are not set, default value is 100000
2369 2375 for speed, and 0 for slave.
2370   - - enable bus 3 with CONFIG_SYS_I2C_MXC_I2C3
2371   - - enable bus 4 with CONFIG_SYS_I2C_MXC_I2C4
2372 2376  
2373 2377 - drivers/i2c/rcar_i2c.c:
2374 2378 - activate this driver with CONFIG_SYS_I2C_RCAR
drivers/i2c/mxc_i2c.c
Diff comments   View file @ 03544c6
... ... @@ -612,16 +612,22 @@
612 612 /*
613 613 * Register mxc i2c adapters
614 614 */
  615 +#ifdef CONFIG_SYS_I2C_MXC_I2C1
615 616 U_BOOT_I2C_ADAP_COMPLETE(mxc0, mxc_i2c_init, mxc_i2c_probe,
616 617 mxc_i2c_read, mxc_i2c_write,
617 618 mxc_i2c_set_bus_speed,
618 619 CONFIG_SYS_MXC_I2C1_SPEED,
619 620 CONFIG_SYS_MXC_I2C1_SLAVE, 0)
  621 +#endif
  622 +
  623 +#ifdef CONFIG_SYS_I2C_MXC_I2C2
620 624 U_BOOT_I2C_ADAP_COMPLETE(mxc1, mxc_i2c_init, mxc_i2c_probe,
621 625 mxc_i2c_read, mxc_i2c_write,
622 626 mxc_i2c_set_bus_speed,
623 627 CONFIG_SYS_MXC_I2C2_SPEED,
624 628 CONFIG_SYS_MXC_I2C2_SLAVE, 1)
  629 +#endif
  630 +
625 631 #ifdef CONFIG_SYS_I2C_MXC_I2C3
626 632 U_BOOT_I2C_ADAP_COMPLETE(mxc2, mxc_i2c_init, mxc_i2c_probe,
627 633 mxc_i2c_read, mxc_i2c_write,
include/configs/apf27.h
Diff comments   View file @ 03544c6
... ... @@ -317,6 +317,8 @@
317 317 #ifdef CONFIG_CMD_I2C
318 318 #define CONFIG_SYS_I2C
319 319 #define CONFIG_SYS_I2C_MXC
  320 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  321 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
320 322 #define CONFIG_SYS_MXC_I2C1_SPEED 100000 /* 100 kHz */
321 323 #define CONFIG_SYS_MXC_I2C1_SLAVE 0x7F
322 324 #define CONFIG_SYS_MXC_I2C2_SPEED 100000 /* 100 kHz */
include/configs/aristainetos-common.h
Diff comments   View file @ 03544c6
... ... @@ -189,6 +189,8 @@
189 189 #define CONFIG_CMD_I2C
190 190 #define CONFIG_SYS_I2C
191 191 #define CONFIG_SYS_I2C_MXC
  192 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  193 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
192 194 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
193 195 #define CONFIG_SYS_I2C_SPEED 100000
194 196 #define CONFIG_SYS_I2C_SLAVE 0x7f
include/configs/cgtqmx6eval.h
Diff comments   View file @ 03544c6
... ... @@ -39,6 +39,8 @@
39 39 #define CONFIG_CMD_I2C
40 40 #define CONFIG_SYS_I2C
41 41 #define CONFIG_SYS_I2C_MXC
  42 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  43 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
42 44 #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
43 45 #define CONFIG_SYS_I2C_SPEED 100000
44 46  
include/configs/cm_fx6.h
Diff comments   View file @ 03544c6
... ... @@ -198,6 +198,8 @@
198 198 /* I2C */
199 199 #define CONFIG_SYS_I2C
200 200 #define CONFIG_SYS_I2C_MXC
  201 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  202 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
201 203 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
202 204 #define CONFIG_SYS_I2C_SPEED 100000
203 205 #define CONFIG_SYS_MXC_I2C3_SPEED 400000
include/configs/embestmx6boards.h
Diff comments   View file @ 03544c6
... ... @@ -33,6 +33,8 @@
33 33 #define CONFIG_CMD_I2C
34 34 #define CONFIG_SYS_I2C
35 35 #define CONFIG_SYS_I2C_MXC
  36 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  37 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
36 38 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
37 39 #define CONFIG_SYS_I2C_SPEED 100000
38 40  
include/configs/flea3.h
Diff comments   View file @ 03544c6
... ... @@ -52,6 +52,8 @@
52 52 */
53 53 #define CONFIG_SYS_I2C
54 54 #define CONFIG_SYS_I2C_MXC
  55 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  56 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
55 57 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
56 58 #define CONFIG_SYS_SPD_BUS_NUM 2 /* I2C3 */
57 59 #define CONFIG_SYS_MXC_I2C3_SLAVE 0xfe
include/configs/gw_ventana.h
Diff comments   View file @ 03544c6
... ... @@ -107,6 +107,8 @@
107 107 #define CONFIG_CMD_I2C
108 108 #define CONFIG_SYS_I2C
109 109 #define CONFIG_SYS_I2C_MXC
  110 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  111 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
110 112 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
111 113 #define CONFIG_SYS_I2C_SPEED 100000
112 114 #define CONFIG_I2C_GSC 0
include/configs/imx31_phycore.h
Diff comments   View file @ 03544c6
... ... @@ -38,6 +38,8 @@
38 38  
39 39 #define CONFIG_SYS_I2C
40 40 #define CONFIG_SYS_I2C_MXC
  41 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  42 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
41 43 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
42 44 #define CONFIG_SYS_I2C_CLK_OFFSET I2C2_CLK_OFFSET
43 45  
include/configs/ls1021aqds.h
Diff comments   View file @ 03544c6
... ... @@ -389,6 +389,8 @@
389 389 #define CONFIG_CMD_I2C
390 390 #define CONFIG_SYS_I2C
391 391 #define CONFIG_SYS_I2C_MXC
  392 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  393 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
392 394 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
393 395  
394 396 /*
include/configs/ls1021atwr.h
Diff comments   View file @ 03544c6
... ... @@ -275,6 +275,8 @@
275 275 #define CONFIG_CMD_I2C
276 276 #define CONFIG_SYS_I2C
277 277 #define CONFIG_SYS_I2C_MXC
  278 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  279 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
278 280 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
279 281  
280 282 /* EEPROM */
include/configs/ls2085a_common.h
Diff comments   View file @ 03544c6
... ... @@ -97,6 +97,8 @@
97 97 #define CONFIG_CMD_I2C
98 98 #define CONFIG_SYS_I2C
99 99 #define CONFIG_SYS_I2C_MXC
  100 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  101 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
100 102 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
101 103 #define CONFIG_SYS_I2C_MXC_I2C4 /* enable I2C bus 4 */
102 104  
include/configs/m53evk.h
Diff comments   View file @ 03544c6
... ... @@ -172,6 +172,8 @@
172 172 #ifdef CONFIG_CMD_I2C
173 173 #define CONFIG_SYS_I2C
174 174 #define CONFIG_SYS_I2C_MXC
  175 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  176 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
175 177 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
176 178 #define CONFIG_SYS_RTC_BUS_NUM 1 /* I2C2 */
177 179 #endif
include/configs/mx25pdk.h
Diff comments   View file @ 03544c6
... ... @@ -115,6 +115,8 @@
115 115 #define CONFIG_CMD_I2C
116 116 #define CONFIG_SYS_I2C
117 117 #define CONFIG_SYS_I2C_MXC
  118 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  119 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
118 120  
119 121 /* RTC */
120 122 #define CONFIG_RTC_IMXDI
include/configs/mx35pdk.h
Diff comments   View file @ 03544c6
... ... @@ -42,6 +42,8 @@
42 42 */
43 43 #define CONFIG_SYS_I2C
44 44 #define CONFIG_SYS_I2C_MXC
  45 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  46 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
45 47 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
46 48 #define CONFIG_MXC_SPI
47 49 #define CONFIG_MXC_GPIO
include/configs/mx53ard.h
Diff comments   View file @ 03544c6
... ... @@ -48,6 +48,8 @@
48 48 #define CONFIG_CMD_I2C
49 49 #define CONFIG_SYS_I2C
50 50 #define CONFIG_SYS_I2C_MXC
  51 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  52 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
51 53 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
52 54  
53 55 /* MMC Configs */
include/configs/mx53evk.h
Diff comments   View file @ 03544c6
... ... @@ -41,6 +41,8 @@
41 41 #define CONFIG_CMD_I2C
42 42 #define CONFIG_SYS_I2C
43 43 #define CONFIG_SYS_I2C_MXC
  44 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  45 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
44 46 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
45 47  
46 48 /* PMIC Configs */
include/configs/mx53loco.h
Diff comments   View file @ 03544c6
... ... @@ -76,6 +76,8 @@
76 76 /* I2C Configs */
77 77 #define CONFIG_SYS_I2C
78 78 #define CONFIG_SYS_I2C_MXC
  79 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  80 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
79 81 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
80 82  
81 83 /* PMIC Controller */
include/configs/mx53smd.h
Diff comments   View file @ 03544c6
... ... @@ -38,6 +38,8 @@
38 38 #define CONFIG_CMD_I2C
39 39 #define CONFIG_SYS_I2C
40 40 #define CONFIG_SYS_I2C_MXC
  41 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  42 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
41 43 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
42 44  
43 45 /* MMC Configs */
include/configs/mx6qsabreauto.h
Diff comments   View file @ 03544c6
... ... @@ -51,6 +51,8 @@
51 51 #define CONFIG_CMD_I2C
52 52 #define CONFIG_SYS_I2C
53 53 #define CONFIG_SYS_I2C_MXC
  54 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  55 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
54 56 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
55 57 #define CONFIG_SYS_I2C_SPEED 100000
56 58  
include/configs/mx6sabresd.h
Diff comments   View file @ 03544c6
... ... @@ -44,6 +44,8 @@
44 44 #define CONFIG_CMD_I2C
45 45 #define CONFIG_SYS_I2C
46 46 #define CONFIG_SYS_I2C_MXC
  47 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  48 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
47 49 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
48 50 #define CONFIG_SYS_I2C_SPEED 100000
49 51  
include/configs/mx6slevk.h
Diff comments   View file @ 03544c6
... ... @@ -35,6 +35,8 @@
35 35 #define CONFIG_CMD_I2C
36 36 #define CONFIG_SYS_I2C
37 37 #define CONFIG_SYS_I2C_MXC
  38 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  39 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
38 40 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
39 41 #define CONFIG_SYS_I2C_SPEED 100000
40 42  
include/configs/mx6sxsabresd.h
Diff comments   View file @ 03544c6
... ... @@ -127,6 +127,8 @@
127 127 #define CONFIG_CMD_I2C
128 128 #define CONFIG_SYS_I2C
129 129 #define CONFIG_SYS_I2C_MXC
  130 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  131 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
130 132 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
131 133 #define CONFIG_SYS_I2C_SPEED 100000
132 134  
include/configs/mx6ul_14x14_evk.h
Diff comments   View file @ 03544c6
... ... @@ -54,6 +54,8 @@
54 54 #ifdef CONFIG_CMD_I2C
55 55 #define CONFIG_SYS_I2C
56 56 #define CONFIG_SYS_I2C_MXC
  57 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  58 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
57 59 #define CONFIG_SYS_I2C_SPEED 100000
58 60  
59 61 /* PMIC only for 9X9 EVK */
include/configs/mx7dsabresd.h
Diff comments   View file @ 03544c6
... ... @@ -47,7 +47,7 @@
47 47 #define CONFIG_CMD_I2C
48 48 #define CONFIG_SYS_I2C
49 49 #define CONFIG_SYS_I2C_MXC
50   -#define CONFIG_SYS_I2C_MXC_I2C1
  50 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
51 51 #define CONFIG_SYS_I2C_SPEED 100000
52 52  
53 53 #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
include/configs/nitrogen6x.h
Diff comments   View file @ 03544c6
... ... @@ -43,6 +43,8 @@
43 43 #define CONFIG_CMD_I2C
44 44 #define CONFIG_SYS_I2C
45 45 #define CONFIG_SYS_I2C_MXC
  46 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  47 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
46 48 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
47 49 #define CONFIG_SYS_I2C_SPEED 100000
48 50 #define CONFIG_I2C_EDID
include/configs/novena.h
Diff comments   View file @ 03544c6
... ... @@ -102,6 +102,8 @@
102 102 /* I2C */
103 103 #define CONFIG_SYS_I2C
104 104 #define CONFIG_SYS_I2C_MXC
  105 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  106 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
105 107 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
106 108 #define CONFIG_I2C_MULTI_BUS
107 109 #define CONFIG_I2C_MXC
include/configs/ot1200.h
Diff comments   View file @ 03544c6
... ... @@ -44,6 +44,8 @@
44 44 #define CONFIG_CMD_I2C
45 45 #define CONFIG_SYS_I2C
46 46 #define CONFIG_SYS_I2C_MXC
  47 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  48 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
47 49 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
48 50 #define CONFIG_SYS_I2C_SPEED 100000
49 51  
include/configs/platinum.h
Diff comments   View file @ 03544c6
... ... @@ -45,6 +45,8 @@
45 45 /* I2C config */
46 46 #define CONFIG_SYS_I2C
47 47 #define CONFIG_SYS_I2C_MXC
  48 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  49 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
48 50 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
49 51 #define CONFIG_SYS_I2C_SPEED 100000
50 52  
include/configs/tbs2910.h
Diff comments   View file @ 03544c6
... ... @@ -167,6 +167,8 @@
167 167 #ifdef CONFIG_CMD_I2C
168 168 #define CONFIG_SYS_I2C
169 169 #define CONFIG_SYS_I2C_MXC
  170 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  171 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
170 172 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
171 173 #define CONFIG_SYS_I2C_SPEED 100000
172 174 #define CONFIG_I2C_EDID
include/configs/titanium.h
Diff comments   View file @ 03544c6
... ... @@ -33,6 +33,8 @@
33 33 #define CONFIG_CMD_I2C
34 34 #define CONFIG_SYS_I2C
35 35 #define CONFIG_SYS_I2C_MXC
  36 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  37 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
36 38 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
37 39 #define CONFIG_SYS_I2C_SPEED 100000
38 40  
include/configs/tqma6.h
Diff comments   View file @ 03544c6
... ... @@ -62,6 +62,8 @@
62 62 #define CONFIG_CMD_I2C
63 63 #define CONFIG_SYS_I2C
64 64 #define CONFIG_SYS_I2C_MXC
  65 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  66 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
65 67 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
66 68 #define CONFIG_I2C_MULTI_BUS
67 69 #define CONFIG_SYS_I2C_SPEED 100000
include/configs/usbarmory.h
Diff comments   View file @ 03544c6
... ... @@ -67,6 +67,8 @@
67 67 #define CONFIG_CMD_I2C
68 68 #define CONFIG_SYS_I2C
69 69 #define CONFIG_SYS_I2C_MXC
  70 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  71 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
70 72  
71 73 /* Fuse */
72 74 #define CONFIG_CMD_FUSE
include/configs/vf610twr.h
Diff comments   View file @ 03544c6
... ... @@ -110,6 +110,8 @@
110 110 #define CONFIG_CMD_I2C
111 111 #define CONFIG_SYS_I2C
112 112 #define CONFIG_SYS_I2C_MXC
  113 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  114 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
113 115 #define CONFIG_SYS_SPD_BUS_NUM 0
114 116  
115 117 #define CONFIG_BOOTDELAY 3
include/configs/wandboard.h
Diff comments   View file @ 03544c6
... ... @@ -37,6 +37,8 @@
37 37 #define CONFIG_CMD_I2C
38 38 #define CONFIG_SYS_I2C
39 39 #define CONFIG_SYS_I2C_MXC
  40 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  41 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
40 42 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
41 43 #define CONFIG_SYS_I2C_SPEED 100000
42 44  
include/configs/warp.h
Diff comments   View file @ 03544c6
... ... @@ -98,6 +98,8 @@
98 98 #define CONFIG_CMD_I2C
99 99 #define CONFIG_SYS_I2C
100 100 #define CONFIG_SYS_I2C_MXC
  101 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  102 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
101 103 #define CONFIG_SYS_I2C_SPEED 100000
102 104  
103 105 /* PMIC */
include/configs/woodburn_common.h
Diff comments   View file @ 03544c6
... ... @@ -47,6 +47,8 @@
47 47 */
48 48 #define CONFIG_SYS_I2C
49 49 #define CONFIG_SYS_I2C_MXC
  50 +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
  51 +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
50 52 #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
51 53 #define CONFIG_SYS_SPD_BUS_NUM 0
52 54 #define CONFIG_MXC_SPI