Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson
* 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
rtc: fix coh901331 startup crash
mach-ux500: fix i2c0 device setup regression
+12
-11
+10
-9
arch/arm/mach-ux500/board-mop500.c
+10
-9
arch/arm/mach-ux500/board-mop500.c
···
178
178
.irq = NOMADIK_GPIO_TO_IRQ(217),
179
179
.platform_data = &mop500_tc35892_data,
180
180
},
181
-
};
182
-
183
-
/* I2C0 devices only available prior to HREFv60 */
184
-
static struct i2c_board_info __initdata mop500_i2c0_old_devices[] = {
181
+
/* I2C0 devices only available prior to HREFv60 */
185
182
{
186
183
I2C_BOARD_INFO("tps61052", 0x33),
187
184
.platform_data = &mop500_tps61052_data,
188
185
},
189
186
};
187
+
188
+
#define NUM_PRE_V60_I2C0_DEVICES 1
190
189
191
190
static struct i2c_board_info __initdata mop500_i2c2_devices[] = {
192
191
{
···
424
425
425
426
static void __init mop500_init_machine(void)
426
427
{
428
+
int i2c0_devs;
429
+
427
430
/*
428
431
* The HREFv60 board removed a GPIO expander and routed
429
432
* all these GPIO pins to the internal GPIO controller
···
449
448
450
449
platform_device_register(&ab8500_device);
451
450
452
-
i2c_register_board_info(0, mop500_i2c0_devices,
453
-
ARRAY_SIZE(mop500_i2c0_devices));
454
-
if (!machine_is_hrefv60())
455
-
i2c_register_board_info(0, mop500_i2c0_old_devices,
456
-
ARRAY_SIZE(mop500_i2c0_old_devices));
451
+
i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);
452
+
if (machine_is_hrefv60())
453
+
i2c0_devs -= NUM_PRE_V60_I2C0_DEVICES;
454
+
455
+
i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs);
457
456
i2c_register_board_info(2, mop500_i2c2_devices,
458
457
ARRAY_SIZE(mop500_i2c2_devices));
459
458
}
+2
-2
drivers/rtc/rtc-coh901331.c
+2
-2
drivers/rtc/rtc-coh901331.c
···
220
220
}
221
221
clk_disable(rtap->clk);
222
222
223
+
platform_set_drvdata(pdev, rtap);
223
224
rtap->rtc = rtc_device_register("coh901331", &pdev->dev, &coh901331_ops,
224
225
THIS_MODULE);
225
226
if (IS_ERR(rtap->rtc)) {
···
228
227
goto out_no_rtc;
229
228
}
230
229
231
-
platform_set_drvdata(pdev, rtap);
232
-
233
230
return 0;
234
231
235
232
out_no_rtc:
233
+
platform_set_drvdata(pdev, NULL);
236
234
out_no_clk_enable:
237
235
clk_put(rtap->clk);
238
236
out_no_clk: