openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: ux500: Disable platform setup of the ab8500 when DT is enabled 

The final piece of the ab8500 puzzle. Here we prevent any of the ab8500-*
drivers from being registered from platform code when Device Tree is
enabled, as we expect DT do probe each of these individually. We also
provide the relevant compatible strings, so that DT knows which nodes
it needs to pay attention to during population.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Lee Jones 2012-05-29 15:06:55 +08:00 committed by Arnd Bergmann
parent 93b5698aae
commit 48a4ea626d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-ux500/board-mop500.c
View File

@ -680,7 +680,6 @@ static struct platform_device *snowball_platform_devs[] __initdata = {
static struct platform_device *snowball_of_platform_devs[] __initdata = { static struct platform_device *snowball_of_platform_devs[] __initdata = {
&snowball_led_dev, &snowball_led_dev,
&snowball_key_dev, &snowball_key_dev,
&ab8500_device,
}; };
static void __init mop500_init_machine(void) static void __init mop500_init_machine(void)
@ -841,6 +840,9 @@ struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
static const struct of_device_id u8500_local_bus_nodes[] = { static const struct of_device_id u8500_local_bus_nodes[] = {
/* only create devices below soc node */ /* only create devices below soc node */
{ .compatible = "stericsson,db8500", }, { .compatible = "stericsson,db8500", },
{ .compatible = "stericsson,db8500-prcmu", },
{ .compatible = "stericsson,ab8500", },
{ .compatible = "stericsson,ab8500-regulator", },
{ .compatible = "simple-bus"}, { .compatible = "simple-bus"},
{ }, { },
}; };
@ -876,7 +878,6 @@ static void __init u8500_init_machine(void)
ARRAY_SIZE(mop500_platform_devs)); ARRAY_SIZE(mop500_platform_devs));
mop500_sdi_init(parent); mop500_sdi_init(parent);
i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices); i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);
i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs); i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs);
i2c_register_board_info(2, mop500_i2c2_devices, i2c_register_board_info(2, mop500_i2c2_devices,
@ -888,7 +889,7 @@ static void __init u8500_init_machine(void)
* snowball_led_dev = todo * snowball_led_dev = todo
* snowball_key_dev = todo * snowball_key_dev = todo
* snowball_sbnet_dev = done * snowball_sbnet_dev = done
* ab8500_device = todo * ab8500_device = done
*/ */
platform_add_devices(snowball_of_platform_devs, platform_add_devices(snowball_of_platform_devs,
ARRAY_SIZE(snowball_of_platform_devs)); ARRAY_SIZE(snowball_of_platform_devs));