Commit 693cec97 authored Jan 27, 2012 by Sylwester Nawrocki Committed by Kukjin Kim Jan 27, 2012

ARM: SAMSUNG: Fix platform data setup for I2C adapter 0



The common static default_i2c_data structure gets bus_num set by each
s3c_i2c?_set_platdata() call, except for s3c_i2c0_set_platdata(). Thus
if for instance s3c_i2c1_set_platdata() is called prior to
s3c_i2c0_set_platdata() the I2C0 controller has bus_num set to wrong value
of 1, i.e. the one from previous set_platdata call. Fix this by also setting
bus_num for I2C0.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

parent 556ef3e4

arch/arm/plat-samsung/devs.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -468,8 +468,10 @@ void __init s3c_i2c0_set_platdata(struct s3c2410_platform_i2c *pd)
		{
		struct s3c2410_platform_i2c *npd;

		if (!pd)
		if (!pd) {
		pd = &default_i2c_data;
		pd->bus_num = 0;
		}

		npd = s3c_set_platdata(pd, sizeof(struct s3c2410_platform_i2c),
		&s3c_device_i2c0);