diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boards/raspberry-pi/rpi-common.c | 19 | ||||
| -rw-r--r-- | arch/arm/mach-bcm283x/core.c | 19 |
2 files changed, 19 insertions, 19 deletions
diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c index 840f525bbb..887f096f7e 100644 --- a/arch/arm/boards/raspberry-pi/rpi-common.c +++ b/arch/arm/boards/raspberry-pi/rpi-common.c @@ -298,6 +298,25 @@ static int rpi_clock_init(void) } postconsole_initcall(rpi_clock_init); +static int rpi_console_clock_init(void) +{ + struct clk *clk; + + clk = clk_fixed("apb_pclk", 0); + clk_register_clkdev(clk, "apb_pclk", NULL); + + clk = clk_fixed("uart0-pl0110", 3 * 1000 * 1000); + clk_register_clkdev(clk, NULL, "uart0-pl0110"); + clkdev_add_physbase(clk, 0x20201000, NULL); + clkdev_add_physbase(clk, 0x3f201000, NULL); + + clk = clk_fixed("bcm2835-cs", 1 * 1000 * 1000); + clk_register_clkdev(clk, NULL, "bcm2835-cs"); + + return 0; +} +postcore_initcall(rpi_console_clock_init); + static int rpi_env_init(void) { struct stat s; diff --git a/arch/arm/mach-bcm283x/core.c b/arch/arm/mach-bcm283x/core.c index f1dcda86f7..f2528cf1f1 100644 --- a/arch/arm/mach-bcm283x/core.c +++ b/arch/arm/mach-bcm283x/core.c @@ -31,25 +31,6 @@ #include <mach/core.h> #include <linux/amba/bus.h> -static int bcm2835_clk_init(void) -{ - struct clk *clk; - - clk = clk_fixed("apb_pclk", 0); - clk_register_clkdev(clk, "apb_pclk", NULL); - - clk = clk_fixed("uart0-pl0110", 3 * 1000 * 1000); - clk_register_clkdev(clk, NULL, "uart0-pl0110"); - clkdev_add_physbase(clk, 0x20201000, NULL); - clkdev_add_physbase(clk, 0x3f201000, NULL); - - clk = clk_fixed("bcm2835-cs", 1 * 1000 * 1000); - clk_register_clkdev(clk, NULL, "bcm2835-cs"); - - return 0; -} -postcore_initcall(bcm2835_clk_init); - void bcm2835_add_device_sdram(u32 size) { if (!size) |