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

Commit 46a8b983 authored by Lee Jones's avatar Lee Jones Committed by Linus Walleij
Browse files

ARM: ux500: Ensure probing of Audio devices when Device Tree is enabled 



Previous attempts to add platform probing of the Audio related devices
only call from non-DT initialisation functions. This patch extends that
functionality to the Device Tree related ones too.

Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 97f50c6c

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

+4 −0
Original line number Diff line number Diff line
@@ -797,6 +797,7 @@ static void __init u8500_init_machine(void) 
				ARRAY_SIZE(mop500_platform_devs));



		mop500_sdi_init(parent);

		mop500_msp_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,
@@ -804,6 +805,8 @@ static void __init u8500_init_machine(void) 


		mop500_uib_init();



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

		mop500_msp_init(parent);

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

		/*

		 * The HREFv60 board removed a GPIO expander and routed
@@ -815,6 +818,7 @@ static void __init u8500_init_machine(void) 
				ARRAY_SIZE(mop500_platform_devs));



		hrefv60_sdi_init(parent);

		mop500_msp_init(parent);



		i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);

		i2c0_devs -= NUM_PRE_V60_I2C0_DEVICES;