From: David Lechner <david@lechnology.com>
To: linux-clk@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Cc: David Lechner <david@lechnology.com>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@codeaurora.org>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>, Sekhar Nori <nsekhar@ti.com>,
Kevin Hilman <khilman@kernel.org>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
Adam Ford <aford173@gmail.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v11 09/27] ARM: davinci: dm644x: add new clock init using common clock framework
Date: Fri, 18 May 2018 11:48:11 -0500 [thread overview]
Message-ID: <20180518164829.27052-10-david@lechnology.com> (raw)
In-Reply-To: <20180518164829.27052-1-david@lechnology.com>
This adds the new board-specific clock init in mach-davinci/dm644x.c
using the new common clock framework drivers.
The #ifdefs are needed to prevent compile errors until the entire
ARCH_DAVINCI is converted.
Also clean up the #includes since we are adding some here.
Signed-off-by: David Lechner <david@lechnology.com>
---
v11 chages:
- none
v10 changes:
- fix copy/paste error s/dm355/dm644x/
v9 changes:
- register PLL1 and PSC in dm644x_init_time() instead of as platform device so
that we get the correct timer0 clock for davinci_timer_init()
- Fixed size of PLL memory block
v8 changes:
- none
v7 changes:
- add clock platform device declarations
- register platform devices instead of registering clocks directly
- add davinci prefix to commit description
v6 changes:
- add blank lines between function calls
arch/arm/mach-davinci/board-dm644x-evm.c | 2 +
arch/arm/mach-davinci/board-neuros-osd2.c | 2 +
arch/arm/mach-davinci/board-sffsdr.c | 2 +
arch/arm/mach-davinci/davinci.h | 1 +
arch/arm/mach-davinci/dm644x.c | 64 +++++++++++++++++++----
5 files changed, 62 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index 48436f74fd71..738e443ab15f 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -773,6 +773,8 @@ static __init void davinci_evm_init(void)
struct clk *aemif_clk;
struct davinci_soc_info *soc_info = &davinci_soc_info;
+ dm644x_register_clocks();
+
dm644x_init_devices();
ret = dm644x_gpio_register();
diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c
index 25ad9b0612be..353f9e5a1454 100644
--- a/arch/arm/mach-davinci/board-neuros-osd2.c
+++ b/arch/arm/mach-davinci/board-neuros-osd2.c
@@ -175,6 +175,8 @@ static __init void davinci_ntosd2_init(void)
struct clk *aemif_clk;
struct davinci_soc_info *soc_info = &davinci_soc_info;
+ dm644x_register_clocks();
+
dm644x_init_devices();
ret = dm644x_gpio_register();
diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
index e7c1728b0833..792bb84d5011 100644
--- a/arch/arm/mach-davinci/board-sffsdr.c
+++ b/arch/arm/mach-davinci/board-sffsdr.c
@@ -134,6 +134,8 @@ static __init void davinci_sffsdr_init(void)
{
struct davinci_soc_info *soc_info = &davinci_soc_info;
+ dm644x_register_clocks();
+
dm644x_init_devices();
platform_add_devices(davinci_sffsdr_devices,
diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h
index a799b5266d4b..16aca5853ab2 100644
--- a/arch/arm/mach-davinci/davinci.h
+++ b/arch/arm/mach-davinci/davinci.h
@@ -108,6 +108,7 @@ int dm365_gpio_register(void);
void dm644x_init(void);
void dm644x_init_devices(void);
void dm644x_init_time(void);
+void dm644x_register_clocks(void);
void dm644x_init_asp(void);
int dm644x_init_video(struct vpfe_config *, struct vpbe_config *);
int dm644x_gpio_register(void);
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 708df0ed8554..c3cd27c6cd70 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -8,28 +8,34 @@
* is licensed "as is" without any warranty of any kind, whether express
* or implied.
*/
-#include <linux/init.h>
-#include <linux/clk.h>
-#include <linux/serial_8250.h>
+
+#include <linux/clk-provider.h>
+#include <linux/clk/davinci.h>
+#include <linux/clkdev.h>
#include <linux/dmaengine.h>
-#include <linux/platform_device.h>
+#include <linux/init.h>
#include <linux/platform_data/edma.h>
#include <linux/platform_data/gpio-davinci.h>
+#include <linux/platform_device.h>
+#include <linux/serial_8250.h>
#include <asm/mach/map.h>
+#include <mach/common.h>
#include <mach/cputype.h>
#include <mach/irqs.h>
-#include "psc.h"
#include <mach/mux.h>
-#include <mach/time.h>
#include <mach/serial.h>
-#include <mach/common.h>
+#include <mach/time.h>
+#include "asp.h"
#include "davinci.h"
-#include "clock.h"
#include "mux.h"
-#include "asp.h"
+
+#ifndef CONFIG_COMMON_CLK
+#include "clock.h"
+#include "psc.h"
+#endif
/*
* Device specific clocks
@@ -43,6 +49,7 @@
#define DM644X_EMAC_CNTRL_RAM_OFFSET 0x2000
#define DM644X_EMAC_CNTRL_RAM_SIZE 0x2000
+#ifndef CONFIG_COMMON_CLK
static struct pll_data pll1_data = {
.num = 1,
.phys_base = DAVINCI_PLL1_BASE,
@@ -326,6 +333,7 @@ static struct clk_lookup dm644x_clks[] = {
CLK("davinci-wdt", NULL, &timer2_clk),
CLK(NULL, NULL, NULL),
};
+#endif
static struct emac_platform_data dm644x_emac_pdata = {
.ctrl_reg_offset = DM644X_EMAC_CNTRL_OFFSET,
@@ -934,8 +942,46 @@ void __init dm644x_init(void)
void __init dm644x_init_time(void)
{
+#ifdef CONFIG_COMMON_CLK
+ void __iomem *pll1, *psc;
+ struct clk *clk;
+
+ clk_register_fixed_rate(NULL, "ref_clk", NULL, 0, DM644X_REF_FREQ);
+
+ pll1 = ioremap(DAVINCI_PLL1_BASE, SZ_1K);
+ dm644x_pll1_init(NULL, pll1, NULL);
+
+ psc = ioremap(DAVINCI_PWR_SLEEP_CNTRL_BASE, SZ_4K);
+ dm644x_psc_init(NULL, psc);
+
+ clk = clk_get(NULL, "timer0");
+
+ davinci_timer_init(clk);
+#else
davinci_clk_init(dm644x_clks);
davinci_timer_init(&timer0_clk);
+#endif
+}
+
+static struct resource dm644x_pll2_resources[] = {
+ {
+ .start = DAVINCI_PLL2_BASE,
+ .end = DAVINCI_PLL2_BASE + SZ_1K - 1,
+ .flags = IORESOURCE_MEM,
+ },
+};
+
+static struct platform_device dm644x_pll2_device = {
+ .name = "dm644x-pll2",
+ .id = -1,
+ .resource = dm644x_pll2_resources,
+ .num_resources = ARRAY_SIZE(dm644x_pll2_resources),
+};
+
+void __init dm644x_register_clocks(void)
+{
+ /* PLL1 and PSC are registered in dm644x_init_time() */
+ platform_device_register(&dm644x_pll2_device);
}
int __init dm644x_init_video(struct vpfe_config *vpfe_cfg,
--
2.17.0
next prev parent reply other threads:[~2018-05-18 16:57 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-18 16:48 [PATCH v11 00/27] ARM: davinci: convert to common clock framework David Lechner
2018-05-18 16:48 ` [PATCH v11 01/27] clk: davinci: pll: allow dev == NULL David Lechner
2018-05-22 8:43 ` Sekhar Nori
2018-05-18 16:48 ` [PATCH v11 02/27] clk: davinci: da850-pll: change PLL0 to CLK_OF_DECLARE David Lechner
2018-05-18 16:48 ` [PATCH v11 03/27] clk: davinci: psc: allow for dev == NULL David Lechner
2018-05-22 9:05 ` Sekhar Nori
2018-05-18 16:48 ` [PATCH v11 04/27] ARM: davinci: pass clock as parameter to davinci_timer_init() David Lechner
2018-05-18 16:48 ` [PATCH v11 05/27] ARM: davinci: da830: add new clock init using common clock framework David Lechner
2018-05-18 16:48 ` [PATCH v11 06/27] ARM: davinci: da850: " David Lechner
2018-05-18 16:48 ` [PATCH v11 07/27] ARM: davinci: dm355: " David Lechner
2018-05-18 16:48 ` [PATCH v11 08/27] ARM: davinci: dm365: " David Lechner
2018-05-18 16:48 ` David Lechner [this message]
2018-05-18 16:48 ` [PATCH v11 10/27] ARM: davinci: dm646x: " David Lechner
2018-05-18 16:48 ` [PATCH v11 11/27] ARM: davinci: da8xx: add new USB PHY " David Lechner
2018-05-18 16:48 ` [PATCH v11 12/27] ARM: davinci: da8xx: add new sata_refclk " David Lechner
2018-05-18 16:48 ` [PATCH v11 13/27] ARM: davinci: remove CONFIG_DAVINCI_RESET_CLOCKS David Lechner
2018-05-18 16:48 ` [PATCH v11 14/27] ARM: davinci_all_defconfig: " David Lechner
2018-05-18 16:48 ` [PATCH v11 15/27] ARM: davinci: switch to common clock framework David Lechner
2018-05-18 16:48 ` [PATCH v11 16/27] ARM: davinci: da830: Remove legacy clock init David Lechner
2018-05-18 16:48 ` [PATCH v11 17/27] ARM: davinci: da850: " David Lechner
2018-05-18 16:48 ` [PATCH v11 18/27] ARM: davinci: dm355: " David Lechner
2018-05-18 16:48 ` [PATCH v11 19/27] ARM: davinci: dm365: " David Lechner
2018-05-18 16:48 ` [PATCH v11 20/27] ARM: davinci: dm644x: " David Lechner
2018-05-18 16:48 ` [PATCH v11 21/27] ARM: davinci: dm646x: " David Lechner
2018-05-18 16:48 ` [PATCH v11 22/27] ARM: davinci: da8xx: Remove legacy USB and SATA " David Lechner
2018-05-18 16:48 ` [PATCH v11 23/27] ARM: davinci: remove legacy clocks David Lechner
2018-05-18 16:48 ` [PATCH v11 24/27] dt-bindings: timer: new bindings for TI DaVinci timer David Lechner
2018-05-18 16:48 ` [PATCH v11 25/27] ARM: davinci: add device tree support to timer David Lechner
2018-05-18 16:48 ` [PATCH v11 26/27] ARM: davinci: da8xx-dt: switch to device tree clocks David Lechner
2018-05-18 16:48 ` [PATCH v11 27/27] ARM: dts: da850: Add clocks David Lechner
2018-05-22 9:38 ` [PATCH v11 00/27] ARM: davinci: convert to common clock framework Sekhar Nori
2018-05-25 18:21 ` David Lechner
2018-06-26 12:56 ` Sekhar Nori
2018-06-26 15:34 ` David Lechner
2018-06-17 15:48 ` David Lechner
2018-06-18 4:47 ` Sekhar Nori
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=20180518164829.27052-10-david@lechnology.com \
--to=david@lechnology.com \
--cc=aford173@gmail.com \
--cc=bgolaszewski@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=khilman@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mturquette@baylibre.com \
--cc=nsekhar@ti.com \
--cc=robh+dt@kernel.org \
--cc=sboyd@codeaurora.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;
as well as URLs for NNTP newsgroup(s).