aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-05-29 03:06:55 -0400
committerArnd Bergmann <arnd@arndb.de>2012-05-31 20:04:29 -0400
commit48a4ea626ddfad1c714ac4e3b7049347c22f2aa2 (patch)
tree34f040f03f55539bda09ec3c64facb393e807a9e /arch
parent93b5698aae844f75709f759a6c92109ce40780da (diff)
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-ux500/board-mop500.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index c27a9b07bd50..5c5bfd5d1b11 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -680,7 +680,6 @@ static struct platform_device *snowball_platform_devs[] __initdata = {
680static struct platform_device *snowball_of_platform_devs[] __initdata = { 680static struct platform_device *snowball_of_platform_devs[] __initdata = {
681 &snowball_led_dev, 681 &snowball_led_dev,
682 &snowball_key_dev, 682 &snowball_key_dev,
683 &ab8500_device,
684}; 683};
685 684
686static void __init mop500_init_machine(void) 685static void __init mop500_init_machine(void)
@@ -841,6 +840,9 @@ struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
841static const struct of_device_id u8500_local_bus_nodes[] = { 840static const struct of_device_id u8500_local_bus_nodes[] = {
842 /* only create devices below soc node */ 841 /* only create devices below soc node */
843 { .compatible = "stericsson,db8500", }, 842 { .compatible = "stericsson,db8500", },
843 { .compatible = "stericsson,db8500-prcmu", },
844 { .compatible = "stericsson,ab8500", },
845 { .compatible = "stericsson,ab8500-regulator", },
844 { .compatible = "simple-bus"}, 846 { .compatible = "simple-bus"},
845 { }, 847 { },
846}; 848};
@@ -876,7 +878,6 @@ static void __init u8500_init_machine(void)
876 ARRAY_SIZE(mop500_platform_devs)); 878 ARRAY_SIZE(mop500_platform_devs));
877 879
878 mop500_sdi_init(parent); 880 mop500_sdi_init(parent);
879
880 i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices); 881 i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);
881 i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs); 882 i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs);
882 i2c_register_board_info(2, mop500_i2c2_devices, 883 i2c_register_board_info(2, mop500_i2c2_devices,
@@ -888,7 +889,7 @@ static void __init u8500_init_machine(void)
888 * snowball_led_dev = todo 889 * snowball_led_dev = todo
889 * snowball_key_dev = todo 890 * snowball_key_dev = todo
890 * snowball_sbnet_dev = done 891 * snowball_sbnet_dev = done
891 * ab8500_device = todo 892 * ab8500_device = done
892 */ 893 */
893 platform_add_devices(snowball_of_platform_devs, 894 platform_add_devices(snowball_of_platform_devs,
894 ARRAY_SIZE(snowball_of_platform_devs)); 895 ARRAY_SIZE(snowball_of_platform_devs));