summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-bcm2835
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2013-11-03 08:07:08 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2013-11-04 09:23:06 +0100
commit7a305b2d8a92cdf42925c7983b61d4a06fe6a789 (patch)
tree549c39c89263905a7cc46faf41e342a3b17292b9 /arch/arm/mach-bcm2835
parent607968f541d4619f6e4b5c518cb50a40bebae046 (diff)
downloadbarebox-7a305b2d8a92cdf42925c7983b61d4a06fe6a789.tar.gz
barebox-7a305b2d8a92cdf42925c7983b61d4a06fe6a789.tar.xz
bcm2835: move mci register at board level
not all board have a SD card. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-bcm2835')
-rw-r--r--arch/arm/mach-bcm2835/core.c1
-rw-r--r--arch/arm/mach-bcm2835/include/mach/core.h8
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-bcm2835/core.c b/arch/arm/mach-bcm2835/core.c
index cba7bf6813..04bc89751d 100644
--- a/arch/arm/mach-bcm2835/core.c
+++ b/arch/arm/mach-bcm2835/core.c
@@ -54,7 +54,6 @@ postcore_initcall(bcm2835_clk_init);
static int bcm2835_dev_init(void)
{
add_generic_device("bcm2835-gpio", 0, NULL, BCM2835_GPIO_BASE, 0xB0, IORESOURCE_MEM, NULL);
- add_generic_device("bcm2835_mci", 0, NULL, BCM2835_EMMC_BASE, 0xFC, IORESOURCE_MEM, NULL);
return 0;
}
coredevice_initcall(bcm2835_dev_init);
diff --git a/arch/arm/mach-bcm2835/include/mach/core.h b/arch/arm/mach-bcm2835/include/mach/core.h
index 9379af209b..a095db8631 100644
--- a/arch/arm/mach-bcm2835/include/mach/core.h
+++ b/arch/arm/mach-bcm2835/include/mach/core.h
@@ -16,7 +16,15 @@
#ifndef __BCM2835_CORE_H__
#define __BCM2835_CORE_H__
+#include <mach/platform.h>
+
void bcm2835_register_uart(void);
void bcm2835_add_device_sdram(u32 size);
+static void inline bcm2835_register_mci(void)
+{
+ add_generic_device("bcm2835_mci", 0, NULL, BCM2835_EMMC_BASE, 0xFC,
+ IORESOURCE_MEM, NULL);
+}
+
#endif