diff options
| author | Rouven Czerwinski <r.czerwinski@pengutronix.de> | 2019-01-15 06:44:02 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-02-05 12:39:09 +0100 |
| commit | 86ec9aa7458ef752bdaed124e9905ef5d4ecf978 (patch) | |
| tree | 78827d34f4a53ba4cfabb9c0172b32e6407366d0 /arch | |
| parent | 44672ff09c4377a4a147ed845fa4e26970f7bfce (diff) | |
| download | barebox-86ec9aa7458ef752bdaed124e9905ef5d4ecf978.tar.gz barebox-86ec9aa7458ef752bdaed124e9905ef5d4ecf978.tar.xz | |
ARM: rpi: move clks into board specific rpi-common
We don't know if the firmware running on the raspberry pi is the same firmware
which is running on all bcm283x devices.
Therefore move the console clock initialization into the rpi-common.c board file.
A future commit will use this function to retrieve the miniuart clock from the
raspberry pi firmware.
No functional changes.
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
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) |