Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 11d2e98d7e75dfb40651eb95c32ca36778cd96d3

Authored by Adam Ford
Committed by Tom Rini
1 parent 76e22222d3
Exists in smarc_8mq_lf_v2020.04 and in 17 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_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.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

Convert CONFIG_SYS_OMAP24_I2C_SLAVE et al to Kconfig 

This converts the following to Kconfig:
   CONFIG_SYS_OMAP24_I2C_SLAVE
   CONFIG_SYS_OMAP24_I2C_SPEED

Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Paul Kocialkowski <contact@paulk.fr>

Showing 24 changed files with 21 additions and 32 deletions Side-by-side Diff

configs/am335x_baltos_defconfig
Diff comments   View file @ 11d2e98
... ... @@ -47,6 +47,7 @@
47 47 CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(SPL),128k(SPL.backup1),128k(SPL.backup2),128k(SPL.backup3),1920k(u-boot),-(UBI)"
48 48 CONFIG_CMD_UBI=y
49 49 CONFIG_ISO_PARTITION=y
  50 +CONFIG_SYS_OMAP24_I2C_SPEED=1000
50 51 CONFIG_MMC_OMAP_HS=y
51 52 CONFIG_NAND=y
52 53 CONFIG_PHYLIB=y
configs/cm_t3517_defconfig
Diff comments   View file @ 11d2e98
... ... @@ -31,6 +31,7 @@
31 31 CONFIG_MTDIDS_DEFAULT="nand0=nand"
32 32 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),256k(u-boot-env),4m(kernel),-(fs)"
33 33 CONFIG_ENV_IS_IN_NAND=y
  34 +CONFIG_SYS_OMAP24_I2C_SPEED=400000
34 35 CONFIG_LED_STATUS=y
35 36 CONFIG_LED_STATUS_GPIO=y
36 37 CONFIG_LED_STATUS0=y
configs/eco5pk_defconfig
Diff comments   View file @ 11d2e98
... ... @@ -26,6 +26,7 @@
26 26 CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(xloader-nand),1024k(uboot-nand),256k(params-nand),5120k(kernel),-(ubifs)"
27 27 CONFIG_CMD_UBI=y
28 28 CONFIG_ENV_IS_IN_NAND=y
  29 +CONFIG_SYS_OMAP24_I2C_SPEED=400000
29 30 CONFIG_MMC_OMAP_HS=y
30 31 CONFIG_NAND=y
31 32 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
configs/kc1_defconfig
Diff comments   View file @ 11d2e98
... ... @@ -34,6 +34,7 @@
34 34 CONFIG_CMD_FS_GENERIC=y
35 35 CONFIG_ISO_PARTITION=y
36 36 CONFIG_EFI_PARTITION=y
  37 +CONFIG_SYS_OMAP24_I2C_SPEED=400000
37 38 CONFIG_MMC_OMAP_HS=y
38 39 CONFIG_SYS_NS16550=y
39 40 CONFIG_USB=y
configs/mt_ventoux_defconfig
Diff comments   View file @ 11d2e98
... ... @@ -31,6 +31,7 @@
31 31 CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1m(u-boot),256k(env1),256k(env2),8m(ubisystem),-(rootfs)"
32 32 CONFIG_CMD_UBI=y
33 33 CONFIG_ENV_IS_IN_NAND=y
  34 +CONFIG_SYS_OMAP24_I2C_SPEED=400000
34 35 CONFIG_MMC_OMAP_HS=y
35 36 CONFIG_NAND=y
36 37 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
configs/sniper_defconfig
Diff comments   View file @ 11d2e98
... ... @@ -35,6 +35,7 @@
35 35 CONFIG_CMD_FS_GENERIC=y
36 36 CONFIG_ISO_PARTITION=y
37 37 CONFIG_EFI_PARTITION=y
  38 +CONFIG_SYS_OMAP24_I2C_SPEED=400000
38 39 CONFIG_MMC_OMAP_HS=y
39 40 CONFIG_SYS_NS16550=y
40 41 CONFIG_USB=y
configs/twister_defconfig
Diff comments   View file @ 11d2e98
... ... @@ -31,6 +31,7 @@
31 31 CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1m(u-boot),256k(env1),256k(env2),6m(kernel),-(rootfs)"
32 32 CONFIG_CMD_UBI=y
33 33 CONFIG_ENV_IS_IN_NAND=y
  34 +CONFIG_SYS_OMAP24_I2C_SPEED=400000
34 35 CONFIG_MMC_OMAP_HS=y
35 36 CONFIG_NAND=y
36 37 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
... ... @@ -162,6 +162,20 @@
162 162 help
163 163 Add support for the OMAP2+ I2C driver.
164 164  
  165 +if SYS_I2C_OMAP24XX
  166 +config SYS_OMAP24_I2C_SLAVE
  167 + int "I2C Slave addr channel 0"
  168 + default 1
  169 + help
  170 + OMAP24xx I2C Slave address channel 0
  171 +
  172 +config SYS_OMAP24_I2C_SPEED
  173 + int "I2C Slave channel 0 speed"
  174 + default 100000
  175 + help
  176 + OMAP24xx Slave speed channel 0
  177 +endif
  178 +
165 179 config SYS_I2C_RCAR_IIC
166 180 bool "Renesas RCar Gen3 IIC driver"
167 181 depends on RCAR_GEN3 && DM_I2C
include/configs/am3517_crane.h
Diff comments   View file @ 11d2e98
... ... @@ -97,8 +97,6 @@
97 97 #endif /* CONFIG_USB_AM35X */
98 98  
99 99 #define CONFIG_SYS_I2C
100   -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
101   -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
102 100  
103 101 /*
104 102 * Board NAND Info.
include/configs/am3517_evm.h
Diff comments   View file @ 11d2e98
... ... @@ -56,8 +56,6 @@
56 56 #endif /* CONFIG_USB_MUSB_AM35X */
57 57  
58 58 /* I2C */
59   -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
60   -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
61 59  
62 60 /* Ethernet */
63 61 #define CONFIG_DRIVER_TI_EMAC
include/configs/baltos.h
Diff comments   View file @ 11d2e98
... ... @@ -39,8 +39,6 @@
39 39 #define CONFIG_MTD_DEVICE
40 40  
41 41 /* I2C configuration */
42   -#undef CONFIG_SYS_OMAP24_I2C_SPEED
43   -#define CONFIG_SYS_OMAP24_I2C_SPEED 1000
44 42  
45 43 #ifdef CONFIG_NAND
46 44 #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00080000
include/configs/bur_am335x_common.h
Diff comments   View file @ 11d2e98
... ... @@ -70,8 +70,6 @@
70 70  
71 71 /* I2C */
72 72 #define CONFIG_SYS_I2C
73   -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
74   -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
75 73  
76 74 /*
77 75 * Our platforms make use of SPL to initalize the hardware (primarily
include/configs/cm_t35.h
Diff comments   View file @ 11d2e98
... ... @@ -80,8 +80,6 @@
80 80 #define CONFIG_MTD_PARTITIONS
81 81  
82 82 #define CONFIG_SYS_I2C
83   -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
84   -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
85 83 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
86 84 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
87 85 #define CONFIG_SYS_I2C_EEPROM_BUS 0
include/configs/cm_t3517.h
Diff comments   View file @ 11d2e98
... ... @@ -89,8 +89,6 @@
89 89 #define CONFIG_MTD_PARTITIONS
90 90  
91 91 #define CONFIG_SYS_I2C
92   -#define CONFIG_SYS_OMAP24_I2C_SPEED 400000
93   -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
94 92 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
95 93 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
96 94 #define CONFIG_SYS_I2C_EEPROM_BUS 0
include/configs/kc1.h
Diff comments   View file @ 11d2e98
... ... @@ -58,8 +58,6 @@
58 58 */
59 59  
60 60 #define CONFIG_SYS_I2C
61   -#define CONFIG_SYS_OMAP24_I2C_SPEED 400000
62   -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
63 61 #define CONFIG_I2C_MULTI_BUS
64 62  
65 63 /*
include/configs/mcx.h
Diff comments   View file @ 11d2e98
... ... @@ -79,8 +79,6 @@
79 79 #define CONFIG_MTD_DEVICE
80 80  
81 81 #define CONFIG_SYS_I2C
82   -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
83   -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
84 82  
85 83 /* RTC */
86 84 #define CONFIG_RTC_DS1337
include/configs/nokia_rx51.h
Diff comments   View file @ 11d2e98
... ... @@ -95,8 +95,6 @@
95 95 #define CONFIG_AUTO_COMPLETE /* add autocompletion support */
96 96  
97 97 #define CONFIG_SYS_I2C
98   -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
99   -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
100 98  
101 99 /*
102 100 * TWL4030
include/configs/siemens-am33x-common.h
Diff comments   View file @ 11d2e98
... ... @@ -97,8 +97,6 @@
97 97 /* I2C Configuration */
98 98 #define CONFIG_I2C
99 99 #define CONFIG_SYS_I2C
100   -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
101   -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
102 100  
103 101 /* Defines for SPL */
104 102 #define CONFIG_SPL_FRAMEWORK
include/configs/sniper.h
Diff comments   View file @ 11d2e98
... ... @@ -59,8 +59,6 @@
59 59 */
60 60  
61 61 #define CONFIG_SYS_I2C
62   -#define CONFIG_SYS_OMAP24_I2C_SPEED 400000
63   -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
64 62 #define CONFIG_I2C_MULTI_BUS
65 63  
66 64 /*
include/configs/tam3517-common.h
Diff comments   View file @ 11d2e98
... ... @@ -67,8 +67,6 @@
67 67 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 25
68 68  
69 69 #define CONFIG_SYS_I2C
70   -#define CONFIG_SYS_OMAP24_I2C_SPEED 400000
71   -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
72 70 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* base address */
73 71 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 /* bytes of address */
74 72 #define CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW 0x07
include/configs/tao3530.h
Diff comments   View file @ 11d2e98
... ... @@ -63,8 +63,6 @@
63 63 #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
64 64  
65 65 #define CONFIG_SYS_I2C
66   -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
67   -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
68 66 #define CONFIG_I2C_MULTI_BUS
69 67  
70 68 /*
include/configs/ti_armv7_omap.h
Diff comments   View file @ 11d2e98
... ... @@ -13,8 +13,6 @@
13 13 #define __CONFIG_TI_ARMV7_OMAP_H__
14 14  
15 15 /* I2C IP block */
16   -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
17   -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
18 16  
19 17 /*
20 18 * GPMC NAND block. We support 1 device and the physical address to
include/configs/tricorder.h
Diff comments   View file @ 11d2e98
... ... @@ -58,8 +58,6 @@
58 58  
59 59 /* I2C */
60 60 #define CONFIG_SYS_I2C
61   -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
62   -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
63 61  
64 62  
65 63 /* EEPROM */
scripts/config_whitelist.txt
Diff comments   View file @ 11d2e98
... ... @@ -3881,12 +3881,10 @@
3881 3881 CONFIG_SYS_OBIR
3882 3882 CONFIG_SYS_OHCI_BE_CONTROLLER
3883 3883 CONFIG_SYS_OHCI_SWAP_REG_ACCESS
3884   -CONFIG_SYS_OMAP24_I2C_SLAVE
3885 3884 CONFIG_SYS_OMAP24_I2C_SLAVE1
3886 3885 CONFIG_SYS_OMAP24_I2C_SLAVE2
3887 3886 CONFIG_SYS_OMAP24_I2C_SLAVE3
3888 3887 CONFIG_SYS_OMAP24_I2C_SLAVE4
3889   -CONFIG_SYS_OMAP24_I2C_SPEED
3890 3888 CONFIG_SYS_OMAP24_I2C_SPEED1
3891 3889 CONFIG_SYS_OMAP24_I2C_SPEED2
3892 3890 CONFIG_SYS_OMAP24_I2C_SPEED3