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

Commit 11a0b5f0 authored by Lee Jones's avatar Lee Jones Committed by Arnd Bergmann
Browse files

ARM: ux500: New DT:ed snowball_platform_devs for one-by-one device enablement 



During Device Tree enablement it is necessary to remove snowball_<device>*
platform_data segments one at at time, as and when particular devices are
DT enabled. This patch provides a temporary solution. Once this new struct
is empty it will be removed again.

Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 855f80cd

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

+16 −2
Original line number Diff line number Diff line
@@ -676,6 +676,13 @@ static struct platform_device *snowball_platform_devs[] __initdata = { 
	&ab8500_device,

};



static struct platform_device *snowball_of_platform_devs[] __initdata = {

	&snowball_led_dev,

	&snowball_key_dev,

	&snowball_sbnet_dev,

	&ab8500_device,

};



static void __init mop500_init_machine(void)

{

	struct device *parent = NULL;
@@ -876,8 +883,15 @@ static void __init u8500_init_machine(void) 
					ARRAY_SIZE(mop500_i2c2_devices));



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

		platform_add_devices(snowball_platform_devs,

				ARRAY_SIZE(snowball_platform_devs));

		/*

		 * Devices to be DT:ed:

		 *   snowball_led_dev   = todo

		 *   snowball_key_dev   = todo

		 *   snowball_sbnet_dev = todo

		 *   ab8500_device      = todo

		 */

		platform_add_devices(snowball_of_platform_devs,

				ARRAY_SIZE(snowball_of_platform_devs));



		snowball_sdi_init(parent);

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