aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500/board-mop500.c
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-09-26 11:02:45 -0400
committerLee Jones <lee.jones@linaro.org>2012-11-01 08:02:06 -0400
commitd6b22ebbbf1f71f9ebbc622c96bab93d554937e7 (patch)
tree2a12dc6a8bd4326ad6f5c023b9640a317d7455e3 /arch/arm/mach-ux500/board-mop500.c
parent6b8db1326a67440e23f668f0e2b258e5e4127b82 (diff)
ARM: ux500: Remove platform specific device registration when DT is enabled
Most devices have now been successfully DT:ed and each supported platform has its own Device Tree source file. Hence the majority of the platform specific device registration calls can now be successfully removed. Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500.c')
-rw-r--r--arch/arm/mach-ux500/board-mop500.c31
1 files changed, 1 insertions, 30 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index d141dd03d2ea..297bf5505e65 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -775,8 +775,6 @@ static const struct of_device_id u8500_local_bus_nodes[] = {
775static void __init u8500_init_machine(void) 775static void __init u8500_init_machine(void)
776{ 776{
777 struct device *parent = NULL; 777 struct device *parent = NULL;
778 int i2c0_devs;
779 int i;
780 778
781 /* Pinmaps must be in place before devices register */ 779 /* Pinmaps must be in place before devices register */
782 if (of_machine_is_compatible("st-ericsson,mop500")) 780 if (of_machine_is_compatible("st-ericsson,mop500"))
@@ -786,39 +784,12 @@ static void __init u8500_init_machine(void)
786 else if (of_machine_is_compatible("st-ericsson,hrefv60+")) 784 else if (of_machine_is_compatible("st-ericsson,hrefv60+"))
787 hrefv60_pinmaps_init(); 785 hrefv60_pinmaps_init();
788 786
787 /* TODO: Export SoC, USB, cpu-freq and DMA40 */
789 parent = u8500_of_init_devices(); 788 parent = u8500_of_init_devices();
790 789
791 for (i = 0; i < ARRAY_SIZE(mop500_platform_devs); i++)
792 mop500_platform_devs[i]->dev.parent = parent;
793
794 /* automatically probe child nodes of db8500 device */ 790 /* automatically probe child nodes of db8500 device */
795 of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent); 791 of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent);
796 792
797 if (of_machine_is_compatible("st-ericsson,mop500")) {
798 mop500_gpio_keys[0].gpio = GPIO_PROX_SENSOR;
799
800 platform_add_devices(mop500_platform_devs,
801 ARRAY_SIZE(mop500_platform_devs));
802
803 mop500_audio_init(parent);
804 i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);
805 i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs);
806 i2c_register_board_info(2, mop500_i2c2_devices,
807 ARRAY_SIZE(mop500_i2c2_devices));
808
809 } else if (of_machine_is_compatible("calaosystems,snowball-a9500")) {
810 mop500_of_audio_init(parent);
811 } else if (of_machine_is_compatible("st-ericsson,hrefv60+")) {
812 /*
813 * The HREFv60 board removed a GPIO expander and routed
814 * all these GPIO pins to the internal GPIO controller
815 * instead.
816 */
817 mop500_gpio_keys[0].gpio = HREFV60_PROX_SENSE_GPIO;
818 platform_add_devices(mop500_platform_devs,
819 ARRAY_SIZE(mop500_platform_devs));
820 }
821
822 /* This board has full regulator constraints */ 793 /* This board has full regulator constraints */
823 regulator_has_full_constraints(); 794 regulator_has_full_constraints();
824} 795}