diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:26 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:26 +0800 |
| commit | ce8fdbf6b69bcd0c80e9a4558c631c6fdbeedabc (patch) | |
| tree | 1dd31102da7f3c884d54d3ea059f40deff513215 /arch/arm/mach-ux500/board-mop500.c | |
| parent | 7938fb7c7b5d887cb17915b2fa2923736d9b2467 (diff) | |
| parent | 2a8fe9f1219bffa4c076d33a19a982908480024f (diff) | |
Merge topic branch 'storage-mmc' into integration-linux-ux500
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500.c')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 0f4bd21074b..ea703097be6 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -1360,7 +1360,10 @@ static void __init hrefv60_init_machine(void) } mop500_i2c_init(parent); - hrefv60_sdi_init(parent); + if (machine_is_u8520()) + mach_u8520_sdi_init(parent); + else + hrefv60_sdi_init(parent); mop500_spi_init(parent); mop500_uart_init(parent); #ifdef CONFIG_STM_MSP_SPI |