From 7f7e34f8fc2b6819f1a516f7955ef15d04eca716 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 23 Apr 2008 09:40:55 +0200 Subject: [PATCH] ARM: OMAP: omap3beagle: register SD interface From dac3cdc5952ab39fa7ae0545d43e2daa95329b07 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 23 Apr 2008 09:38:31 +0200 Subject: [PATCH] omap3beagle: register SD interface Signed-off-by: Koen Kooi Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/Makefile | 3 ++- arch/arm/mach-omap2/board-omap3beagle.c | 9 +++++++++ include/asm-arm/arch-omap/board-omap3beagle.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 6b66a83da33..c37df1ae58a 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -36,7 +36,8 @@ obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \ board-3430sdp-usb.o \ board-3430sdp-flash.o obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o -obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o +obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o \ + board-sdp-hsmmc.o obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o \ board-apollon-mmc.o \ board-apollon-keys.o diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 0727ee2b2e8..c03bb260ded 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -48,8 +48,16 @@ static void __init omap3_beagle_init_irq(void) omap_gpio_init(); } +static struct omap_mmc_config omap3beagle_mmc_config __initdata = { + .mmc [0] = { + .enabled = 1, + .wire4 = 1, + }, +}; + static struct omap_board_config_kernel omap3_beagle_config[] __initdata = { { OMAP_TAG_UART, &omap3_beagle_uart_config }, + { OMAP_TAG_MMC, &omap3beagle_mmc_config }, }; static void __init omap3_beagle_init(void) @@ -57,6 +65,7 @@ static void __init omap3_beagle_init(void) omap_board_config = omap3_beagle_config; omap_board_config_size = ARRAY_SIZE(omap3_beagle_config); omap_serial_init(); + sdp_mmc_init(); } arch_initcall(omap3_beagle_i2c_init); diff --git a/include/asm-arm/arch-omap/board-omap3beagle.h b/include/asm-arm/arch-omap/board-omap3beagle.h index 14db589caaf..782e2e5547c 100644 --- a/include/asm-arm/arch-omap/board-omap3beagle.h +++ b/include/asm-arm/arch-omap/board-omap3beagle.h @@ -29,6 +29,8 @@ #ifndef __ASM_ARCH_OMAP3_BEAGLE_H #define __ASM_ARCH_OMAP3_BEAGLE_H +extern void sdp_mmc_init(void); + #define TWL4030_IRQNUM INT_34XX_SYS_NIRQ #endif /* __ASM_ARCH_OMAP3_BEAGLE_H */ -- 2.41.1