diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 548e045e9266a994501bcd51e45b8c7971c0b9aa..97e600138c70411babd48319ef6a653bf21cb363 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -47,6 +47,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(SPL),128k(SPL.backup1),128k(SPL.backup2),128k(SPL.backup3),1920k(u-boot),-(UBI)" CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y +CONFIG_SYS_OMAP24_I2C_SPEED=1000 CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_PHYLIB=y diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig index fa78bde0bb11603cf8c7da670cb1328e62cd9442..c1e1153a7c9efff86e6ce6663d49262a8ca5f899 100644 --- a/configs/cm_t3517_defconfig +++ b/configs/cm_t3517_defconfig @@ -31,6 +31,7 @@ CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),256k(u-boot-env),4m(kernel),-(fs)" CONFIG_ENV_IS_IN_NAND=y +CONFIG_SYS_OMAP24_I2C_SPEED=400000 CONFIG_LED_STATUS=y CONFIG_LED_STATUS_GPIO=y CONFIG_LED_STATUS0=y diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig index c5b5c9b92711caca235e60436987cb120b8ba41d..c371020079f069bbca570aba86b162c581a41608 100644 --- a/configs/eco5pk_defconfig +++ b/configs/eco5pk_defconfig @@ -26,6 +26,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(xloader-nand),1024k(uboot-nand),256k(params-nand),5120k(kernel),-(ubifs)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_SYS_OMAP24_I2C_SPEED=400000 CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y diff --git a/configs/kc1_defconfig b/configs/kc1_defconfig index e8284051561d69e0588119d0efcb2c415255d029..b4a5ce610b6e9e0e68604c0b5a483033ff525247 100644 --- a/configs/kc1_defconfig +++ b/configs/kc1_defconfig @@ -34,6 +34,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y +CONFIG_SYS_OMAP24_I2C_SPEED=400000 CONFIG_MMC_OMAP_HS=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig index 3dd8adb5ce1c93ef96a1c320dbf0fd410a3d8be8..d7e54441b56e903727d1d22c4bd37768cf43b9e3 100644 --- a/configs/mt_ventoux_defconfig +++ b/configs/mt_ventoux_defconfig @@ -31,6 +31,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1m(u-boot),256k(env1),256k(env2),8m(ubisystem),-(rootfs)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_SYS_OMAP24_I2C_SPEED=400000 CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig index a3bae56cdaf671cd440ad3e45f49d2bb4b0155cb..84ba175f6aa310feb18f21396ecef897f06ca2f5 100644 --- a/configs/sniper_defconfig +++ b/configs/sniper_defconfig @@ -35,6 +35,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y +CONFIG_SYS_OMAP24_I2C_SPEED=400000 CONFIG_MMC_OMAP_HS=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/twister_defconfig b/configs/twister_defconfig index 03db9df15038107f5307ee2783d7362d947b20b2..f49c234ac8b94a44d6e060670059a144a2ba8785 100644 --- a/configs/twister_defconfig +++ b/configs/twister_defconfig @@ -31,6 +31,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1m(u-boot),256k(env1),256k(env2),6m(kernel),-(rootfs)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_SYS_OMAP24_I2C_SPEED=400000 CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index 0630712e4a4a473ab25211800a679f6df0142745..17d21bbc423fe4abb9cb192a799dca2e52ff789f 100644 --- a/drivers/i2c/Kconfig +++ b/drivers/i2c/Kconfig @@ -162,6 +162,20 @@ config SYS_I2C_OMAP24XX help Add support for the OMAP2+ I2C driver. +if SYS_I2C_OMAP24XX +config SYS_OMAP24_I2C_SLAVE + int "I2C Slave addr channel 0" + default 1 + help + OMAP24xx I2C Slave address channel 0 + +config SYS_OMAP24_I2C_SPEED + int "I2C Slave channel 0 speed" + default 100000 + help + OMAP24xx Slave speed channel 0 +endif + config SYS_I2C_RCAR_IIC bool "Renesas RCar Gen3 IIC driver" depends on RCAR_GEN3 && DM_I2C diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 16212ef9fb211564203be821d33ca5093c50300b..35e7f9df587a80c26ae57c4f89271ee5c2794f80 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -97,8 +97,6 @@ #endif /* CONFIG_USB_AM35X */ #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 /* * Board NAND Info. diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index ac5070d8cfe5ec8eb6a520629f10c4da1a040a98..4d94078d1ce6e87b497e8d60abfa11c1e6343dc7 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -56,8 +56,6 @@ #endif /* CONFIG_USB_MUSB_AM35X */ /* I2C */ -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 /* Ethernet */ #define CONFIG_DRIVER_TI_EMAC diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 939ee3b4ad6d8f5478335ee9f39f468cff65cce5..75dd0c5e2671480c3efaae1f486d9ba0f7c6a8f4 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -39,8 +39,6 @@ #define CONFIG_MTD_DEVICE /* I2C configuration */ -#undef CONFIG_SYS_OMAP24_I2C_SPEED -#define CONFIG_SYS_OMAP24_I2C_SPEED 1000 #ifdef CONFIG_NAND #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00080000 diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 15c481d421de97878469dce09578d270d7e36ada..ca0440ecfe62b75afe2ea213173206e018d97ade 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -70,8 +70,6 @@ /* I2C */ #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 /* * Our platforms make use of SPL to initalize the hardware (primarily diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 3c64cb575cfaf89f6f5e2f7b7bcb5d729cb2ff57..deb26fbaffcebfed6b229b8d90604999211f65eb 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -80,8 +80,6 @@ #define CONFIG_MTD_PARTITIONS #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_I2C_EEPROM_BUS 0 diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index fe8b39a65b7389cb959423a19f39b79b43ee6905..12fa1861a2df6c4001b0d814ccd259e61c75d8d7 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -89,8 +89,6 @@ #define CONFIG_MTD_PARTITIONS #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 400000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_I2C_EEPROM_BUS 0 diff --git a/include/configs/kc1.h b/include/configs/kc1.h index 94c3d0ad297f067975ed4f37a0e71607dc7a85d0..1d1f2dbb22626e9e9f837699232fc43d0eb5494b 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -58,8 +58,6 @@ */ #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 400000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_I2C_MULTI_BUS /* diff --git a/include/configs/mcx.h b/include/configs/mcx.h index f0ab990e14fd8c081ff40f19562c710982942b6a..552b51704c2e867cd649866e97b179aaf97d15cd 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -79,8 +79,6 @@ #define CONFIG_MTD_DEVICE #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 /* RTC */ #define CONFIG_RTC_DS1337 diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 00509e8508ade5df9d7d6161cfe28bb75f53c649..6312ed737c7104b331c11c8e88808fcc10654718 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -95,8 +95,6 @@ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 /* * TWL4030 diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 85b64123a0eb7fe8ee2c22ceb9a22d1a81b1478d..44c85cd7faa64a535aae60a5d66c70e5a7b9f0d5 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -97,8 +97,6 @@ /* I2C Configuration */ #define CONFIG_I2C #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 0ed72cf901b2f9531b4c9e94aa3579eea5af0fb6..1966a72f6be4cb7c63da5ece5451dddfc68d793a 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -59,8 +59,6 @@ */ #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 400000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_I2C_MULTI_BUS /* diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 7f05cb07caf21d0c867b4cc6e47304bdaeea0a72..f266c3948529f7924340e6830efdd2ee96f24a87 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -67,8 +67,6 @@ #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 25 #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 400000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #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 diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 0e9fe681750b7a08cdf56a9a918431219fc59b49..eb89e561514321efe614f04dcfabef2699f3dc79 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -63,8 +63,6 @@ #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_I2C_MULTI_BUS /* diff --git a/include/configs/ti_armv7_omap.h b/include/configs/ti_armv7_omap.h index da5fc8108fe5826f6864fc4b399b69a3795fb473..80d4476cf06fed9f3cca964f647fe9fce82e1a53 100644 --- a/include/configs/ti_armv7_omap.h +++ b/include/configs/ti_armv7_omap.h @@ -13,8 +13,6 @@ #define __CONFIG_TI_ARMV7_OMAP_H__ /* I2C IP block */ -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 /* * GPMC NAND block. We support 1 device and the physical address to diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index f892a5712ca84c14bc31e78560124c208a7c8345..0298b5635364b142c9f1bf58a2a842b19f841a1c 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -58,8 +58,6 @@ /* I2C */ #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 /* EEPROM */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ec7300ae04665901c3e6911c4105d7b4106b4ac7..ef83c00c1b620b7fa0001d9d74513dea8e919922 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3881,12 +3881,10 @@ CONFIG_SYS_NVRAM_SIZE CONFIG_SYS_OBIR CONFIG_SYS_OHCI_BE_CONTROLLER CONFIG_SYS_OHCI_SWAP_REG_ACCESS -CONFIG_SYS_OMAP24_I2C_SLAVE CONFIG_SYS_OMAP24_I2C_SLAVE1 CONFIG_SYS_OMAP24_I2C_SLAVE2 CONFIG_SYS_OMAP24_I2C_SLAVE3 CONFIG_SYS_OMAP24_I2C_SLAVE4 -CONFIG_SYS_OMAP24_I2C_SPEED CONFIG_SYS_OMAP24_I2C_SPEED1 CONFIG_SYS_OMAP24_I2C_SPEED2 CONFIG_SYS_OMAP24_I2C_SPEED3