summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-bcm2835
diff options
context:
space:
mode:
authorAndre Heider <a.heider@gmail.com>2013-10-19 14:20:51 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-10-22 15:28:58 +0200
commitd841f42664c97098509e72043337462aeebe5898 (patch)
tree6a0d379eabfcaa932826f2b35fd80ffbac2be506 /arch/arm/mach-bcm2835
parent233718d8c514f0e8cbf3770ee8ad2dbc6f1cba1c (diff)
downloadbarebox-d841f42664c97098509e72043337462aeebe5898.tar.gz
barebox-d841f42664c97098509e72043337462aeebe5898.tar.xz
ARM: bcm2835: register the clocksource device earlier
RPi's mailbox driver is used early and it needs clock functions to handle timeouts. Register the driver straight after its clkdev. Signed-off-by: Andre Heider <a.heider@gmail.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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-bcm2835/core.c b/arch/arm/mach-bcm2835/core.c
index 6835960e8a..cba7bf6813 100644
--- a/arch/arm/mach-bcm2835/core.c
+++ b/arch/arm/mach-bcm2835/core.c
@@ -45,6 +45,8 @@ static int bcm2835_clk_init(void)
clk = clk_fixed("bcm2835-cs", 1 * 1000 * 1000);
clk_register_clkdev(clk, NULL, "bcm2835-cs");
+ add_generic_device("bcm2835-cs", DEVICE_ID_SINGLE, NULL, BCM2835_ST_BASE, 0x1C, IORESOURCE_MEM, NULL);
+
return 0;
}
postcore_initcall(bcm2835_clk_init);
@@ -52,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-cs", DEVICE_ID_SINGLE, NULL, BCM2835_ST_BASE, 0x1C, IORESOURCE_MEM, NULL);
add_generic_device("bcm2835_mci", 0, NULL, BCM2835_EMMC_BASE, 0xFC, IORESOURCE_MEM, NULL);
return 0;
}