Messages in this thread | | | Date | Wed, 01 Aug 2012 08:34:06 +0100 | From | Lee Jones <> | Subject | Re: [PATCH 5/6] ARM: ux500: Ensure probing of Audio devices when Device Tree is enabled |
| |
On 31/07/12 21:54, Arnd Bergmann wrote: > On Tuesday 31 July 2012, Lee Jones wrote: >> diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c >> index e641003..87a5cd7 100644 >> --- a/arch/arm/mach-ux500/board-mop500.c >> +++ b/arch/arm/mach-ux500/board-mop500.c >> @@ -794,6 +794,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, >> @@ -801,6 +802,8 @@ static void __init u8500_init_machine(void) >> >> mop500_uib_init(); >> >> + } else if (of_machine_is_compatible("calaosystems,snowball-a9500")) { >> + mop500_of_msp_init(parent); >> } else if (of_machine_is_compatible("st-ericsson,hrefv60+")) { >> /* >> * The HREFv60 board removed a GPIO expander and routed >> @@ -812,6 +815,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; > > > Looks like you're adding the same call to each of the three cases: > mop500, snowball and hrefv60+. How about moving it before or after > the if/elseif block?
The Snowball one is different 'mop500_msp_init' -> 'mop500_of_msp_init'.
-- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |