Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6b22ebb authored by Lee Jones's avatar Lee Jones
Browse files

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: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 6b8db132

arch/arm/mach-ux500/board-mop500.c

+1 −30
Original line number Diff line number Diff line
@@ -775,8 +775,6 @@ static const struct of_device_id u8500_local_bus_nodes[] = { 
static void __init u8500_init_machine(void)

{

	struct device *parent = NULL;

	int i2c0_devs;

	int i;



	/* Pinmaps must be in place before devices register */

	if (of_machine_is_compatible("st-ericsson,mop500"))
@@ -786,39 +784,12 @@ static void __init u8500_init_machine(void) 
	else if (of_machine_is_compatible("st-ericsson,hrefv60+"))

		hrefv60_pinmaps_init();



	/* TODO: Export SoC, USB, cpu-freq and DMA40 */

	parent = u8500_of_init_devices();



	for (i = 0; i < ARRAY_SIZE(mop500_platform_devs); i++)

		mop500_platform_devs[i]->dev.parent = parent;



	/* automatically probe child nodes of db8500 device */

	of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent);



	if (of_machine_is_compatible("st-ericsson,mop500")) {

		mop500_gpio_keys[0].gpio = GPIO_PROX_SENSOR;



		platform_add_devices(mop500_platform_devs,

				ARRAY_SIZE(mop500_platform_devs));



		mop500_audio_init(parent);

		i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);

		i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs);

		i2c_register_board_info(2, mop500_i2c2_devices,

					ARRAY_SIZE(mop500_i2c2_devices));



	} else if (of_machine_is_compatible("calaosystems,snowball-a9500")) {

		mop500_of_audio_init(parent);

	} else if (of_machine_is_compatible("st-ericsson,hrefv60+")) {

		/*

		 * The HREFv60 board removed a GPIO expander and routed

		 * all these GPIO pins to the internal GPIO controller

		 * instead.

		 */

		mop500_gpio_keys[0].gpio = HREFV60_PROX_SENSE_GPIO;

		platform_add_devices(mop500_platform_devs,

				ARRAY_SIZE(mop500_platform_devs));

	}



	/* This board has full regulator constraints */

	regulator_has_full_constraints();

}