diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-07-20 02:18:47 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-08-14 06:40:37 -0400 |
commit | cf87a6e2fe95891575c45ba1a0ecb8cf53c09732 (patch) | |
tree | 569cb46eccc3b23b14fca040a8e505574bf053b0 /arch/arm/mach-mx2 | |
parent | a961bf380b93741c2191f8efc8f5f1c65224b216 (diff) |
ARM: mxc: Fix i2c_board_info definitions
Fix i2c_board_info definitions - we were defining the 'type' field
of these structures twice since the first argument of I2C_BOARD_INFO
sets this field. Move the second definition into I2C_BOARD_INFO().
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'arch/arm/mach-mx2')
-rw-r--r-- | arch/arm/mach-mx2/eukrea_cpuimx27.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-mx2/pcm038.c | 12 |
2 files changed, 5 insertions, 10 deletions
diff --git a/arch/arm/mach-mx2/eukrea_cpuimx27.c b/arch/arm/mach-mx2/eukrea_cpuimx27.c index a2c4181892ca..7b187606682c 100644 --- a/arch/arm/mach-mx2/eukrea_cpuimx27.c +++ b/arch/arm/mach-mx2/eukrea_cpuimx27.c | |||
@@ -135,8 +135,7 @@ static struct imxi2c_platform_data eukrea_cpuimx27_i2c_1_data = { | |||
135 | 135 | ||
136 | static struct i2c_board_info eukrea_cpuimx27_i2c_devices[] = { | 136 | static struct i2c_board_info eukrea_cpuimx27_i2c_devices[] = { |
137 | { | 137 | { |
138 | I2C_BOARD_INFO("rtc-pcf8563", 0x51), | 138 | I2C_BOARD_INFO("pcf8563", 0x51), |
139 | .type = "pcf8563" | ||
140 | }, | 139 | }, |
141 | }; | 140 | }; |
142 | 141 | ||
diff --git a/arch/arm/mach-mx2/pcm038.c b/arch/arm/mach-mx2/pcm038.c index 638d078304c7..9a3483c8f58c 100644 --- a/arch/arm/mach-mx2/pcm038.c +++ b/arch/arm/mach-mx2/pcm038.c | |||
@@ -186,17 +186,13 @@ static struct at24_platform_data board_eeprom = { | |||
186 | }; | 186 | }; |
187 | 187 | ||
188 | static struct i2c_board_info pcm038_i2c_devices[] = { | 188 | static struct i2c_board_info pcm038_i2c_devices[] = { |
189 | [0] = { | 189 | { |
190 | I2C_BOARD_INFO("at24", 0x52), /* E0=0, E1=1, E2=0 */ | 190 | I2C_BOARD_INFO("at24", 0x52), /* E0=0, E1=1, E2=0 */ |
191 | .platform_data = &board_eeprom, | 191 | .platform_data = &board_eeprom, |
192 | }, | 192 | }, { |
193 | [1] = { | 193 | I2C_BOARD_INFO("pcf8563", 0x51), |
194 | I2C_BOARD_INFO("rtc-pcf8563", 0x51), | 194 | }, { |
195 | .type = "pcf8563" | ||
196 | }, | ||
197 | [2] = { | ||
198 | I2C_BOARD_INFO("lm75", 0x4a), | 195 | I2C_BOARD_INFO("lm75", 0x4a), |
199 | .type = "lm75" | ||
200 | } | 196 | } |
201 | }; | 197 | }; |
202 | 198 | ||