Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-20 11:55:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Configs: Migrate CONFIG_SYS_I2C_OMAP34XX to CONFIG_SYS_I2C_OMAP24XX

Browse source 
The driver is for all boards 24XX and up, so let's eliminate the
extra option called CONFIG_SYS_I2C_OMAP34XX since the driver checks
for CONFIG_OMAP34XX we don't need CONFIG_SYS_I2C_OMAP34XX.

Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
This commit is contained in:
Adam Ford 2017-08-07 13:11:19 -05:00 • committed by Heiko Schocher
parent 0bc8f640a4
commit 94d50bed65
24 changed files with 22 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-omap2/omap3/clock.c
View file

@ -772,7 +772,7 @@ void per_clocks_enable(void)
setbits_le32(&prcm_base->iclken_per, 0x00020000); setbits_le32(&prcm_base->iclken_per, 0x00020000);
#endif #endif
#ifdef CONFIG_SYS_I2C_OMAP34XX #ifdef CONFIG_SYS_I2C_OMAP24XX
/* Turn on all 3 I2C clocks */ /* Turn on all 3 I2C clocks */
setbits_le32(&prcm_base->fclken1_core, 0x00038000); setbits_le32(&prcm_base->fclken1_core, 0x00038000);
setbits_le32(&prcm_base->iclken1_core, 0x00038000); /* I2C1,2,3 = on */ setbits_le32(&prcm_base->iclken1_core, 0x00038000); /* I2C1,2,3 = on */

2
board/compulab/cm_t35/cm_t35.c
View file

@ -398,7 +398,7 @@ void board_mmc_power_init(void)
} }
#endif #endif
#ifdef CONFIG_SYS_I2C_OMAP34XX #ifdef CONFIG_SYS_I2C_OMAP24XX
/* /*
* Routine: reset_net_chip * Routine: reset_net_chip
* Description: reset the Ethernet controller via TPS65930 GPIO * Description: reset the Ethernet controller via TPS65930 GPIO

2
board/logicpd/am3517evm/am3517evm.c
View file

@ -105,7 +105,7 @@ int misc_init_r(void)
volatile unsigned int ctr; volatile unsigned int ctr;
u32 reset; u32 reset;
#ifdef CONFIG_SYS_I2C_OMAP34XX #ifdef CONFIG_SYS_I2C_OMAP24XX
i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE); i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
#endif #endif

2
board/ti/am3517crane/am3517crane.c
View file

@ -43,7 +43,7 @@ int board_init(void)
*/ */
int misc_init_r(void) int misc_init_r(void)
{ {
#ifdef CONFIG_SYS_I2C_OMAP34XX #ifdef CONFIG_SYS_I2C_OMAP24XX
i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE); i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
#endif #endif

2
board/ti/evm/evm.c
View file

@ -147,7 +147,7 @@ void get_board_mem_timings(struct board_sdrc_timings *timings)
int misc_init_r(void) int misc_init_r(void)
{ {
#ifdef CONFIG_SYS_I2C_OMAP34XX #ifdef CONFIG_SYS_I2C_OMAP24XX
i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE); i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
#endif #endif

1
drivers/i2c/Makefile
View file

@ -31,7 +31,6 @@ obj-$(CONFIG_SYS_I2C_MVTWSI) += mvtwsi.o
obj-$(CONFIG_SYS_I2C_MXC) += mxc_i2c.o obj-$(CONFIG_SYS_I2C_MXC) += mxc_i2c.o
obj-$(CONFIG_SYS_I2C_MXS) += mxs_i2c.o obj-$(CONFIG_SYS_I2C_MXS) += mxs_i2c.o
obj-$(CONFIG_SYS_I2C_OMAP24XX) += omap24xx_i2c.o obj-$(CONFIG_SYS_I2C_OMAP24XX) += omap24xx_i2c.o
obj-$(CONFIG_SYS_I2C_OMAP34XX) += omap24xx_i2c.o
obj-$(CONFIG_SYS_I2C_RCAR) += rcar_i2c.o obj-$(CONFIG_SYS_I2C_RCAR) += rcar_i2c.o
obj-$(CONFIG_SYS_I2C_ROCKCHIP) += rk_i2c.o obj-$(CONFIG_SYS_I2C_ROCKCHIP) += rk_i2c.o
obj-$(CONFIG_SYS_I2C_S3C24X0) += s3c24x0_i2c.o exynos_hs_i2c.o obj-$(CONFIG_SYS_I2C_S3C24X0) += s3c24x0_i2c.o exynos_hs_i2c.o

2
include/configs/am3517_crane.h
View file

@ -103,7 +103,7 @@
#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 #define CONFIG_SYS_OMAP24_I2C_SPEED 100000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_I2C_OMAP24XX
/* /*
* Board NAND Info. * Board NAND Info.

2
include/configs/am3517_evm.h
View file

@ -91,7 +91,7 @@
#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 #define CONFIG_SYS_OMAP24_I2C_SPEED 100000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_I2C_OMAP24XX
/* Ethernet */ /* Ethernet */
#define CONFIG_DRIVER_TI_EMAC #define CONFIG_DRIVER_TI_EMAC

2
include/configs/cm_t35.h
View file

@ -93,7 +93,7 @@
#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 #define CONFIG_SYS_OMAP24_I2C_SPEED 100000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_I2C_OMAP24XX
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
#define CONFIG_SYS_I2C_EEPROM_BUS 0 #define CONFIG_SYS_I2C_EEPROM_BUS 0

2
include/configs/cm_t3517.h
View file

@ -101,7 +101,7 @@
#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 400000 #define CONFIG_SYS_OMAP24_I2C_SPEED 400000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_I2C_OMAP24XX
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
#define CONFIG_SYS_I2C_EEPROM_BUS 0 #define CONFIG_SYS_I2C_EEPROM_BUS 0

2
include/configs/cm_t54.h
View file

@ -17,7 +17,7 @@
#include <configs/ti_omap5_common.h> #include <configs/ti_omap5_common.h>
/* EEPROM related defines */ /* EEPROM related defines */
#define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_I2C_OMAP24XX
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
#define CONFIG_SYS_I2C_EEPROM_BUS 0 #define CONFIG_SYS_I2C_EEPROM_BUS 0

2
include/configs/devkit8000.h
View file

@ -66,7 +66,7 @@
/* I2C */ /* I2C */
#undef CONFIG_SYS_I2C_OMAP24XX #undef CONFIG_SYS_I2C_OMAP24XX
#define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_I2C_OMAP24XX
/* TWL4030 */ /* TWL4030 */
#define CONFIG_TWL4030_LED 1 #define CONFIG_TWL4030_LED 1

2
include/configs/mcx.h
View file

@ -86,7 +86,7 @@
#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 #define CONFIG_SYS_OMAP24_I2C_SPEED 100000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_I2C_OMAP24XX
/* RTC */ /* RTC */
#define CONFIG_RTC_DS1337 #define CONFIG_RTC_DS1337

2
include/configs/nokia_rx51.h
View file

@ -112,7 +112,7 @@
#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 #define CONFIG_SYS_OMAP24_I2C_SPEED 100000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_I2C_OMAP24XX
/* /*
* TWL4030 * TWL4030

2
include/configs/omap3_evm.h
View file

@ -143,7 +143,7 @@
#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 #define CONFIG_SYS_OMAP24_I2C_SPEED 100000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_I2C_OMAP24XX
/* /*
* PISMO support * PISMO support

2
include/configs/omap3_logic.h
View file

@ -53,7 +53,7 @@
#define CONFIG_USB_OMAP3 #define CONFIG_USB_OMAP3
/* I2C */ /* I2C */
#define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_I2C_OMAP24XX
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* EEPROM AT24C64 */ #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* EEPROM AT24C64 */
/* USB */ /* USB */

2
include/configs/omap3_overo.h
View file

@ -34,7 +34,7 @@
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 15)) #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 15))
/* I2C Support */ /* I2C Support */
#define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_I2C_OMAP24XX
/* TWL4030 LED */ /* TWL4030 LED */
#define CONFIG_TWL4030_LED #define CONFIG_TWL4030_LED

2
include/configs/omap3_pandora.h
View file

@ -30,7 +30,7 @@
*/ */
/* I2C Support */ /* I2C Support */
#define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_I2C_OMAP24XX
/* TWL4030 LED */ /* TWL4030 LED */
#define CONFIG_TWL4030_LED #define CONFIG_TWL4030_LED

2
include/configs/omap3_zoom1.h
View file

@ -64,7 +64,7 @@
#endif #endif
#undef CONFIG_SYS_I2C_OMAP24XX #undef CONFIG_SYS_I2C_OMAP24XX
#define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_I2C_OMAP24XX
/* /*
* TWL4030 * TWL4030

2
include/configs/sniper.h
View file

@ -62,7 +62,7 @@
#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 400000 #define CONFIG_SYS_OMAP24_I2C_SPEED 400000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_I2C_OMAP24XX
#define CONFIG_I2C_MULTI_BUS #define CONFIG_I2C_MULTI_BUS
/* /*

2
include/configs/tam3517-common.h
View file

@ -71,7 +71,7 @@
#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 400000 #define CONFIG_SYS_OMAP24_I2C_SPEED 400000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_I2C_OMAP24XX
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* base address */ #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* base address */
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 /* bytes of address */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 /* bytes of address */
#define CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW 0x07 #define CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW 0x07

2
include/configs/tao3530.h
View file

@ -69,7 +69,7 @@
"4m(kernel),-(fs)" "4m(kernel),-(fs)"
#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C
#define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_I2C_OMAP24XX
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 #define CONFIG_SYS_OMAP24_I2C_SPEED 100000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_I2C_MULTI_BUS #define CONFIG_I2C_MULTI_BUS

2
include/configs/tricorder.h
View file

@ -62,7 +62,7 @@
#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 #define CONFIG_SYS_OMAP24_I2C_SPEED 100000
#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_SYS_OMAP24_I2C_SLAVE 1
#define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_I2C_OMAP24XX
/* EEPROM */ /* EEPROM */

1
scripts/config_whitelist.txt
View file

@ -3531,7 +3531,6 @@ CONFIG_SYS_I2C_NCT72_ADDR
CONFIG_SYS_I2C_NOPROBES CONFIG_SYS_I2C_NOPROBES
CONFIG_SYS_I2C_OFFSET CONFIG_SYS_I2C_OFFSET
CONFIG_SYS_I2C_OMAP24XX CONFIG_SYS_I2C_OMAP24XX
CONFIG_SYS_I2C_OMAP34XX
CONFIG_SYS_I2C_PCA953X_ADDR CONFIG_SYS_I2C_PCA953X_ADDR
CONFIG_SYS_I2C_PCA953X_ADDR0 CONFIG_SYS_I2C_PCA953X_ADDR0
CONFIG_SYS_I2C_PCA953X_ADDR1 CONFIG_SYS_I2C_PCA953X_ADDR1