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

Commit 5f870baa authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ux500-fixes-v3.6-rc2' of... 

Merge tag 'ux500-fixes-v3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes

From Linus Walleij <linus.walleij@linaro.org>:
Here are two audio fixes for the ux500 found by Lee Jones.

* tag 'ux500-fixes-v3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson

:
  ARM: ux500: Ensure probing of Audio devices when Device Tree is enabled
  ARM: ux500: Fix merge error, no matching driver name for 'snd_soc_u8500'

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8917da43 46a8b983

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

+5 −5
Original line number Diff line number Diff line
@@ -191,9 +191,9 @@ static struct platform_device *db8500_add_msp_i2s(struct device *parent, 
	return pdev;

}



/* Platform device for ASoC U8500 machine */

static struct platform_device snd_soc_u8500 = {

		.name = "snd-soc-u8500",

/* Platform device for ASoC MOP500 machine */

static struct platform_device snd_soc_mop500 = {

		.name = "snd-soc-mop500",

		.id = 0,

		.dev = {

			.platform_data = NULL,
@@ -227,8 +227,8 @@ int mop500_msp_init(struct device *parent) 
{

	struct platform_device *msp1;



	pr_info("%s: Register platform-device 'snd-soc-u8500'.\n", __func__);

	platform_device_register(&snd_soc_u8500);

	pr_info("%s: Register platform-device 'snd-soc-mop500'.\n", __func__);

	platform_device_register(&snd_soc_mop500);



	pr_info("Initialize MSP I2S-devices.\n");

	db8500_add_msp_i2s(parent, 0, U8500_MSP0_BASE, IRQ_DB8500_MSP0,

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;