[U-Boot] i2c: samsung: register i2c busses for Exynso5420 and Exynos5250

Naveen Krishna Ch
2013-12-05T12:21:36Z

Hello Heiko,

On 5 December 2013 16:56, Heiko Schocher <hs@denx.de> wrote:
> Hello Naveen,
>
> Sorry for the late reply ...
>
> Am 25.11.2013 12:28, schrieb Naveen Krishna Ch:
>
>> This patch adds the U_BOOT_I2C_ADAP_COMPLETE defines for channels
>> on Exynos5420 and Exynos5250 and also adds support for init function
>> for hsi2c channels
>>
>> Signed-off-by: Naveen Krishna Chatradhi<ch.naveen@samsung.com>
>>
>> ---
>> README | 6 ++
>> drivers/i2c/s3c24x0_i2c.c | 222
>> +++++++++++++++++++++++++++++++++++----------
>> 2 files changed, 180 insertions(+), 48 deletions(-)
>>
>> diff --git a/README b/README
>> index c97ff0a..c04e352 100644
>> --- a/README
>> +++ b/README
>> @@ -2076,6 +2076,12 @@ CBFS (Coreboot Filesystem) support
>> - set CONFIG_SYS_I2C_ZYNQ_SPEED for speed setting
>> - set CONFIG_SYS_I2C_ZYNQ_SLAVE for slave addr
>>
>> + - drivers/i2c/s3c24x0_i2c.c:
>> + - activate this driver with CONFIG_SYS_I2C_S3C24X0
>> + - This driver adds i2c buses (11 for Exynos5250,
>> Exynos5420
>> + 9 i2c buses for Exynos4 and 1 for S3C24X0 SoCs from
>> Samsung)
>> + with a fix speed from 100000 and the slave addr 0!
>> +
>> additional defines:
>>
>> CONFIG_SYS_NUM_I2C_BUSES
>> diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c
>> index 1e9dba0..6e719ec 100644
>> --- a/drivers/i2c/s3c24x0_i2c.c
>> +++ b/drivers/i2c/s3c24x0_i2c.c
>> @@ -721,6 +721,15 @@ static unsigned int s3c24x0_i2c_set_bus_speed(struct
>> i2c_adapter *adap,
>> return 0;
>> }
>>
>> +static void exynos_i2c_init(struct i2c_adapter *adap, int speed, int
>> slaveaddr)
>> +{
>> + /* This will override the speed selected in the fdt for that port
>> */
>> + debug("i2c_init(speed=%u, slaveaddr=0x%x)\n", speed, slaveaddr);
>> + if (i2c_set_bus_speed(speed))
>> + printf("i2c_init: failed to init bus %d for speed = %d\n",
>> + adap->hwadapnr, speed);
>> +}
This init is not used for Exynos4 and lower series SoCs
>> +
>> /*
>> * cmd_type is 0 for write, 1 for read.
>> *
>> @@ -1071,51 +1080,168 @@ int i2c_reset_port_fdt(const void *blob, int
>> node)
>> /*
>> * Register s3c24x0 i2c adapters
>> */
>> -U_BOOT_I2C_ADAP_COMPLETE(s3c24x0_0, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> - s3c24x0_i2c_read, s3c24x0_i2c_write,
>> - s3c24x0_i2c_set_bus_speed,
>> - CONFIG_SYS_I2C_S3C24X0_SPEED,
>> - CONFIG_SYS_I2C_S3C24X0_SLAVE,
>> - 0)
>> -U_BOOT_I2C_ADAP_COMPLETE(s3c24x0_1, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> - s3c24x0_i2c_read, s3c24x0_i2c_write,
>> - s3c24x0_i2c_set_bus_speed,
>> - CONFIG_SYS_I2C_S3C24X0_SPEED,
>> - CONFIG_SYS_I2C_S3C24X0_SLAVE,
>> - 1)
>> -U_BOOT_I2C_ADAP_COMPLETE(s3c24x0_2, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> - s3c24x0_i2c_read, s3c24x0_i2c_write,
>> - s3c24x0_i2c_set_bus_speed,
>> - CONFIG_SYS_I2C_S3C24X0_SPEED,
>> - CONFIG_SYS_I2C_S3C24X0_SLAVE,
>> - 2)
>> -U_BOOT_I2C_ADAP_COMPLETE(s3c24x0_3, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> - s3c24x0_i2c_read, s3c24x0_i2c_write,
>> - s3c24x0_i2c_set_bus_speed,
>> - CONFIG_SYS_I2C_S3C24X0_SPEED,
>> - CONFIG_SYS_I2C_S3C24X0_SLAVE,
>> - 3)
>> -U_BOOT_I2C_ADAP_COMPLETE(s3c24x0_4, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> - s3c24x0_i2c_read, s3c24x0_i2c_write,
>> - s3c24x0_i2c_set_bus_speed,
>> - CONFIG_SYS_I2C_S3C24X0_SPEED,
>> - CONFIG_SYS_I2C_S3C24X0_SLAVE,
>> - 4)
>> -U_BOOT_I2C_ADAP_COMPLETE(s3c24x0_5, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> - s3c24x0_i2c_read, s3c24x0_i2c_write,
>> - s3c24x0_i2c_set_bus_speed,
>> - CONFIG_SYS_I2C_S3C24X0_SPEED,
>> - CONFIG_SYS_I2C_S3C24X0_SLAVE,
>> - 5)
>> -U_BOOT_I2C_ADAP_COMPLETE(s3c24x0_6, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> - s3c24x0_i2c_read, s3c24x0_i2c_write,
>> - s3c24x0_i2c_set_bus_speed,
>> - CONFIG_SYS_I2C_S3C24X0_SPEED,
>> - CONFIG_SYS_I2C_S3C24X0_SLAVE,
>> - 6)
>> -U_BOOT_I2C_ADAP_COMPLETE(s3c24x0_7, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> - s3c24x0_i2c_read, s3c24x0_i2c_write,
>> - s3c24x0_i2c_set_bus_speed,
>> - CONFIG_SYS_I2C_S3C24X0_SPEED,
>> - CONFIG_SYS_I2C_S3C24X0_SLAVE,
>> - 7)
>> +#if defined(CONFIG_EXYNOS5420)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c00, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 0)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c01, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 1)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c02, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 2)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c03, exynos_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 3)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c04, exynos_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 4)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c05, exynos_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 5)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c06, exynos_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 6)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c07, exynos_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 7)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c08, exynos_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 8)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c09, exynos_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 9)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c10, exynos_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 10)
>> +#elif defined(CONFIG_EXYNOS5250)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c00, exynos_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 0)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c01, exynos_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 1)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c02, exynos_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 2)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c03, exynos_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 3)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c04, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 4)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c05, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 5)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c06, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 6)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c07, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 7)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c08, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 8)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c09, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 9)
>> +U_BOOT_I2C_ADAP_COMPLETE(s3c10, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 10)
>> +#elif defined(CONFIG_EXYNOS4)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c00, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 0)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c01, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 1)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c02, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 2)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c03, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 3)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c04, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 4)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c05, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 5)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c06, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 6)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c07, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 7)
>> +U_BOOT_I2C_ADAP_COMPLETE(i2c08, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 8
>
> ^
> leads in a compile error for trats and trats2, could you please fix?
I ran "MAKEALL -v samsung"
s3c24x0_i2c.c:724:13: warning: 'exynos_i2c_init' defined but not used
[-Wunused-function]
is the warning seen for trats and trats2 boards
If you are talking about this one, will fix it in the next versio.
>
> Hmm... could you reformat this very long list in something like this:
>
> U_BOOT_I2C_ADAP_COMPLETE(s3c0, s3c24x0_i2c_init, s3c24x0_i2c_probe,
> if defined(CONFIG_EXYNOS4) || defined(CONFIG_EXYNOS5420) ||
> defined(CONFIG_EXYNOS5420)
> U_BOOT_I2C_ADAP_COMPLETE(s3c1, s3c24x0_i2c_init, s3c24x0_i2c_probe,
> [...]
> U_BOOT_I2C_ADAP_COMPLETE(s3c8, s3c24x0_i2c_init, s3c24x0_i2c_probe,
> #endif
> if defined(CONFIG_EXYNOS5420) || defined(CONFIG_EXYNOS5420)
> U_BOOT_I2C_ADAP_COMPLETE(s3c9, s3c24x0_i2c_init, s3c24x0_i2c_probe,
> U_BOOT_I2C_ADAP_COMPLETE(s3c10, s3c24x0_i2c_init, s3c24x0_i2c_probe,
> #endif
Basically, s3c24x0_i2c.c now support both HighSpeed I2C modules and Standard I2C
Modules. They have different init functions.
Exynos5250/5260 has 4 hsi2c channels hsi2c 0 ~ 3 and 7 i2c channels 4 ~ 10
Exynos5420 has 4 i2c channels i2c 0 ~ 3 and 7 hsi2c channels 4 ~ 10
Exynos4 has 9 i2c channels
Hence, the long list. It would be helpful if anyone can suggest a way
to reduce this list.

Is U_BOOT_I2C_ADAP_COMPLETE is the only (best) way to register to new i2c
framework ?
>
>
>> +#else
>> +U_BOOT_I2C_ADAP_COMPLETE(s3c0, s3c24x0_i2c_init, s3c24x0_i2c_probe,
>> + s3c24x0_i2c_read, s3c24x0_i2c_write,
>> + s3c24x0_i2c_set_bus_speed,
>> + CONFIG_SYS_I2C_S3C24X0_SPEED,
>> + CONFIG_SYS_I2C_S3C24X0_SLAVE, 0)
>> +#endif
>
>
> bye,
> Heiko
Thanks for the review.
> --
> DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot

--
Shine bright,
(: Nav :)