diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:17 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:17 +0200 |
| commit | 5d7e606a3696b992df40afaf9b04872320346c41 (patch) | |
| tree | 92b060685f1187ae895eb8dc7256445ed455bfa5 /arch/arm/mach-ux500/board-mop500.c | |
| parent | 546c9b21117077f145d59a0168fcb6fd0a3c3b24 (diff) | |
| parent | 285f0b3fe3a59c56db9ae68e6a1ae0e2a67b72f9 (diff) | |
Merge topic branch 'storage-mmc' into integration-linux-ux500-3.3
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 d4c9ca3017a..77d17ab82ba 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -1331,7 +1331,10 @@ static void __init hrefv60_init_machine(void) } mop500_i2c_init(); - hrefv60_sdi_init(); + if (machine_is_u8520()) + mach_u8520_sdi_init(); + else + hrefv60_sdi_init(); mop500_spi_init(); mop500_uart_init(); #ifdef CONFIG_STM_MSP_SPI |