Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
master
Adam Ford 7 years ago committed by Heiko Schocher
parent 0bc8f640a4
commit 94d50bed65
24 changed files with 22 additions and 24 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      arch/arm/mach-omap2/omap3/clock.c
  2. 2
      board/compulab/cm_t35/cm_t35.c
  3. 2
      board/logicpd/am3517evm/am3517evm.c
  4. 2
      board/ti/am3517crane/am3517crane.c
  5. 2
      board/ti/evm/evm.c
  6. 1
      drivers/i2c/Makefile
  7. 2
      include/configs/am3517_crane.h
  8. 2
      include/configs/am3517_evm.h
  9. 2
      include/configs/cm_t35.h
  10. 2
      include/configs/cm_t3517.h
  11. 2
      include/configs/cm_t54.h
  12. 2
      include/configs/devkit8000.h
  13. 2
      include/configs/mcx.h
  14. 2
      include/configs/nokia_rx51.h
  15. 2
      include/configs/omap3_evm.h
  16. 2
      include/configs/omap3_logic.h
  17. 2
      include/configs/omap3_overo.h
  18. 2
      include/configs/omap3_pandora.h
  19. 2
      include/configs/omap3_zoom1.h
  20. 2
      include/configs/sniper.h
  21. 2
      include/configs/tam3517-common.h
  22. 2
      include/configs/tao3530.h
  23. 2
      include/configs/tricorder.h
  24. 1
      scripts/config_whitelist.txt

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

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

2
board/compulab/cm_t35/cm_t35.c
Unescape View File

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

2
board/logicpd/am3517evm/am3517evm.c
Unescape View File

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

2
board/ti/am3517crane/am3517crane.c
Unescape View File

@ -43,7 +43,7 @@ int board_init(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);
#endif

2
board/ti/evm/evm.c
Unescape View File

@ -147,7 +147,7 @@ void get_board_mem_timings(struct board_sdrc_timings *timings)
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);
#endif

1
drivers/i2c/Makefile
Unescape 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_MXS) += mxs_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_ROCKCHIP) += rk_i2c.o
obj-$(CONFIG_SYS_I2C_S3C24X0) += s3c24x0_i2c.o exynos_hs_i2c.o

2
include/configs/am3517_crane.h
Unescape View File

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

2
include/configs/am3517_evm.h
Unescape View File

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

2
include/configs/cm_t35.h
Unescape View File

@ -93,7 +93,7 @@
#define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
#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_LEN 1
#define CONFIG_SYS_I2C_EEPROM_BUS 0

2
include/configs/cm_t3517.h
Unescape View File

@ -101,7 +101,7 @@
#define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 400000
#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_LEN 1
#define CONFIG_SYS_I2C_EEPROM_BUS 0

2
include/configs/cm_t54.h
Unescape View File

@ -17,7 +17,7 @@
#include <configs/ti_omap5_common.h>
/* 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_LEN 1
#define CONFIG_SYS_I2C_EEPROM_BUS 0

2
include/configs/devkit8000.h
Unescape View File

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

2
include/configs/mcx.h
Unescape View File

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

2
include/configs/nokia_rx51.h
Unescape View File

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

2
include/configs/omap3_evm.h
Unescape View File

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

2
include/configs/omap3_logic.h
Unescape View File

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

2
include/configs/omap3_overo.h
Unescape View File

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

2
include/configs/omap3_pandora.h
Unescape View File

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

2
include/configs/omap3_zoom1.h
Unescape View File

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

2
include/configs/sniper.h
Unescape View File

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

2
include/configs/tam3517-common.h
Unescape View File

@ -71,7 +71,7 @@
#define CONFIG_SYS_I2C
#define CONFIG_SYS_OMAP24_I2C_SPEED 400000
#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_LEN 1 /* bytes of address */
#define CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW 0x07

2
include/configs/tao3530.h
Unescape View File

@ -69,7 +69,7 @@
"4m(kernel),-(fs)"
#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_SLAVE 1
#define CONFIG_I2C_MULTI_BUS

2
include/configs/tricorder.h
Unescape View File

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

1
scripts/config_whitelist.txt
Unescape View File

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

Write Preview
Loading…
Cancel
Save