mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-24 21:54:01 +00:00
i2c: S3C24X0: Finish Kconfig migration
Finish moving this driver to Kconfig. - Update the dependency logic for Exynos5 too - Remove the unused CONFIG_SYS_I2C_S3C24X0_SPEED variable - Drop CONFIG_SYS_I2C_S3C24X0_SLAVE as it's always set to 0. - Move the internal SYS_I2C_S3C24X0_SLAVE define closer to the only user. Cc: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Minkyu Kang <mk7.kang@samsung.com> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
This commit is contained in:
parent
d7d40f614d
commit
0283da445a
11 changed files with 11 additions and 12 deletions
|
@ -31,6 +31,7 @@ CONFIG_CMD_EXT4_WRITE=y
|
|||
CONFIG_ENV_OVERWRITE=y
|
||||
CONFIG_ENV_IS_IN_MMC=y
|
||||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||
CONFIG_SYS_I2C_S3C24X0=y
|
||||
CONFIG_SUPPORT_EMMC_BOOT=y
|
||||
CONFIG_MMC_DW=y
|
||||
CONFIG_MMC_SDHCI=y
|
||||
|
|
|
@ -42,6 +42,7 @@ CONFIG_ADC_EXYNOS=y
|
|||
CONFIG_DFU_MMC=y
|
||||
CONFIG_SET_DFU_ALT_INFO=y
|
||||
CONFIG_SYS_DFU_DATA_BUF_SIZE=0x2000000
|
||||
CONFIG_SYS_I2C_S3C24X0=y
|
||||
CONFIG_SUPPORT_EMMC_BOOT=y
|
||||
CONFIG_MMC_DW=y
|
||||
CONFIG_MTD=y
|
||||
|
|
|
@ -38,6 +38,7 @@ CONFIG_USE_ENV_SPI_BUS=y
|
|||
CONFIG_ENV_SPI_BUS=1
|
||||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||
CONFIG_I2C_CROS_EC_TUNNEL=y
|
||||
CONFIG_SYS_I2C_S3C24X0=y
|
||||
CONFIG_I2C_MUX=y
|
||||
CONFIG_I2C_ARB_GPIO_CHALLENGE=y
|
||||
CONFIG_CROS_EC_KEYB=y
|
||||
|
|
|
@ -37,6 +37,7 @@ CONFIG_USE_ENV_SPI_BUS=y
|
|||
CONFIG_ENV_SPI_BUS=1
|
||||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||
CONFIG_I2C_CROS_EC_TUNNEL=y
|
||||
CONFIG_SYS_I2C_S3C24X0=y
|
||||
CONFIG_I2C_MUX=y
|
||||
CONFIG_I2C_ARB_GPIO_CHALLENGE=y
|
||||
CONFIG_CROS_EC_KEYB=y
|
||||
|
|
|
@ -38,6 +38,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
|
|||
CONFIG_USE_ENV_SPI_BUS=y
|
||||
CONFIG_ENV_SPI_BUS=1
|
||||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||
CONFIG_SYS_I2C_S3C24X0=y
|
||||
CONFIG_SUPPORT_EMMC_BOOT=y
|
||||
CONFIG_MMC_DW=y
|
||||
CONFIG_MMC_SDHCI=y
|
||||
|
|
|
@ -33,6 +33,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
|
|||
CONFIG_USE_ENV_SPI_BUS=y
|
||||
CONFIG_ENV_SPI_BUS=1
|
||||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||
CONFIG_SYS_I2C_S3C24X0=y
|
||||
CONFIG_SUPPORT_EMMC_BOOT=y
|
||||
CONFIG_MMC_DW=y
|
||||
CONFIG_MMC_SDHCI=y
|
||||
|
|
|
@ -43,6 +43,7 @@ CONFIG_USE_ENV_SPI_BUS=y
|
|||
CONFIG_ENV_SPI_BUS=1
|
||||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||
CONFIG_I2C_CROS_EC_LDO=y
|
||||
CONFIG_SYS_I2C_S3C24X0=y
|
||||
CONFIG_I2C_MUX=y
|
||||
CONFIG_I2C_ARB_GPIO_CHALLENGE=y
|
||||
CONFIG_CROS_EC_KEYB=y
|
||||
|
|
|
@ -43,6 +43,7 @@ CONFIG_USE_ENV_SPI_BUS=y
|
|||
CONFIG_ENV_SPI_BUS=1
|
||||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||
CONFIG_I2C_CROS_EC_LDO=y
|
||||
CONFIG_SYS_I2C_S3C24X0=y
|
||||
CONFIG_I2C_MUX=y
|
||||
CONFIG_I2C_ARB_GPIO_CHALLENGE=y
|
||||
CONFIG_CROS_EC_KEYB=y
|
||||
|
|
|
@ -449,7 +449,7 @@ config SYS_I2C_OCTEON
|
|||
|
||||
config SYS_I2C_S3C24X0
|
||||
bool "Samsung I2C driver"
|
||||
depends on ARCH_EXYNOS4 && DM_I2C
|
||||
depends on (ARCH_EXYNOS4 || ARCH_EXYNOS5) && DM_I2C
|
||||
help
|
||||
Support for Samsung I2C controller as Samsung SoCs.
|
||||
|
||||
|
|
|
@ -21,12 +21,6 @@
|
|||
#include <i2c.h>
|
||||
#include "s3c24x0_i2c.h"
|
||||
|
||||
#ifndef CONFIG_SYS_I2C_S3C24X0_SLAVE
|
||||
#define SYS_I2C_S3C24X0_SLAVE_ADDR 0
|
||||
#else
|
||||
#define SYS_I2C_S3C24X0_SLAVE_ADDR CONFIG_SYS_I2C_S3C24X0_SLAVE
|
||||
#endif
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
/*
|
||||
|
@ -83,6 +77,8 @@ static void i2c_ch_init(struct s3c24x0_i2c *i2c, int speed, int slaveadd)
|
|||
writel(I2C_MODE_MT | I2C_TXRX_ENA, &i2c->iicstat);
|
||||
}
|
||||
|
||||
#define SYS_I2C_S3C24X0_SLAVE_ADDR 0
|
||||
|
||||
static int s3c24x0_i2c_set_bus_speed(struct udevice *dev, unsigned int speed)
|
||||
{
|
||||
struct s3c24x0_i2c_bus *i2c_bus = dev_get_priv(dev);
|
||||
|
|
|
@ -96,11 +96,6 @@
|
|||
#define EXYNOS_COPY_SPI_FNPTR_ADDR 0x02020058
|
||||
#define SPI_FLASH_UBOOT_POS (CONFIG_SEC_FW_SIZE + CONFIG_BL1_SIZE)
|
||||
|
||||
/* I2C */
|
||||
#define CONFIG_SYS_I2C_S3C24X0
|
||||
#define CONFIG_SYS_I2C_S3C24X0_SPEED 100000 /* 100 Kbps */
|
||||
#define CONFIG_SYS_I2C_S3C24X0_SLAVE 0x0
|
||||
|
||||
/* SPI */
|
||||
|
||||
/* Ethernet Controllor Driver */
|
||||
|
|
Loading…
Reference in a new issue