From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Subject: [PATCH v2 2/8] ARM: rpi: move clks into board specific rpi-common
Date: Thu, 13 Dec 2018 08:44:24 +0100 [thread overview]
Message-ID: <20181213074430.25614-3-r.czerwinski@pengutronix.de> (raw)
In-Reply-To: <20181213074430.25614-1-r.czerwinski@pengutronix.de>
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>
---
arch/arm/boards/raspberry-pi/rpi-common.c | 19 +++++++++++++++++++
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 840f525bb..887f096f7 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 f1dcda86f..f2528cf1f 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)
--
2.19.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2018-12-13 7:44 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-13 7:44 [PATCH v2 0/8] Raspberry Pi miniuart support Rouven Czerwinski
2018-12-13 7:44 ` [PATCH v2 1/8] ARM: rpi: fix typo in rpi-common.c Rouven Czerwinski
2018-12-13 7:44 ` Rouven Czerwinski [this message]
2018-12-13 7:44 ` [PATCH v2 3/8] ARM: rpi: retrieve miniuart clock from firmware Rouven Czerwinski
2018-12-13 7:44 ` [PATCH v2 4/8] serial_ns16550: handle default reg-io-width Rouven Czerwinski
2018-12-13 15:56 ` Oleksij Rempel
2018-12-14 10:58 ` Sascha Hauer
2018-12-13 7:44 ` [PATCH v2 5/8] serial_ns16550: add raspberry pi compatible and init Rouven Czerwinski
2018-12-13 15:53 ` Oleksij Rempel
2018-12-13 7:44 ` [PATCH v2 6/8] ARM: rpi: add NS16550 support Rouven Czerwinski
2018-12-13 7:44 ` [PATCH v2 7/8] ARM: rpi: choose miniuart as stdout Rouven Czerwinski
2018-12-13 7:44 ` [PATCH v2 8/8] doc: bcm283x: remove miniuart overlay instruction Rouven Czerwinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181213074430.25614-3-r.czerwinski@pengutronix.de \
--to=r.czerwinski@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox