From: Simon Horman <horms+renesas@verge.net.au> To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 14/20] ARM: shmobile: marzen-reference: Initialize CPG device Date: Wed, 26 Feb 2014 07:33:30 +0000 [thread overview] Message-ID: <1393400016-23433-15-git-send-email-horms+renesas@verge.net.au> (raw) In-Reply-To: <1393400016-23433-1-git-send-email-horms+renesas@verge.net.au> On multiplatform kernels clocks are handled by the CCF CPG driver. It must be explicitly initialized by a call to r8a7779_clocks_init() with the value of the boot mode pins. Based on similar work for the Koelsch board by Laurent Pinchart. Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/mach-shmobile/board-marzen-reference.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c index d3e8319..e261431 100644 --- a/arch/arm/mach-shmobile/board-marzen-reference.c +++ b/arch/arm/mach-shmobile/board-marzen-reference.c @@ -19,7 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <linux/clk-provider.h> +#include <linux/clk/shmobile.h> +#include <linux/clocksource.h> #include <linux/of_platform.h> #include <mach/r8a7779.h> #include <mach/common.h> @@ -27,11 +28,17 @@ #include <asm/irq.h> #include <asm/mach/arch.h> -static void __init marzen_init(void) +static void __init marzen_init_timer(void) { #ifdef CONFIG_COMMON_CLK - of_clk_init(NULL); -#else + r8a7779_clocks_init(r8a7779_read_mode_pins()); +#endif + clocksource_of_init(); +} + +static void __init marzen_init(void) +{ +#ifndef CONFIG_COMMON_CLK r8a7779_clock_init(); #endif r8a7779_add_standard_devices_dt(); @@ -48,6 +55,7 @@ DT_MACHINE_START(MARZEN, "marzen") .smp = smp_ops(r8a7779_smp_ops), .map_io = r8a7779_map_io, .init_early = r8a7779_init_delay, + .init_time = marzen_init_timer, .nr_irqs = NR_IRQS_LEGACY, .init_irq = r8a7779_init_irq_dt, .init_machine = marzen_init, -- 1.8.5.2
WARNING: multiple messages have this Message-ID (diff)
From: horms+renesas@verge.net.au (Simon Horman) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 14/20] ARM: shmobile: marzen-reference: Initialize CPG device Date: Wed, 26 Feb 2014 16:33:30 +0900 [thread overview] Message-ID: <1393400016-23433-15-git-send-email-horms+renesas@verge.net.au> (raw) In-Reply-To: <1393400016-23433-1-git-send-email-horms+renesas@verge.net.au> On multiplatform kernels clocks are handled by the CCF CPG driver. It must be explicitly initialized by a call to r8a7779_clocks_init() with the value of the boot mode pins. Based on similar work for the Koelsch board by Laurent Pinchart. Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/mach-shmobile/board-marzen-reference.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c index d3e8319..e261431 100644 --- a/arch/arm/mach-shmobile/board-marzen-reference.c +++ b/arch/arm/mach-shmobile/board-marzen-reference.c @@ -19,7 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <linux/clk-provider.h> +#include <linux/clk/shmobile.h> +#include <linux/clocksource.h> #include <linux/of_platform.h> #include <mach/r8a7779.h> #include <mach/common.h> @@ -27,11 +28,17 @@ #include <asm/irq.h> #include <asm/mach/arch.h> -static void __init marzen_init(void) +static void __init marzen_init_timer(void) { #ifdef CONFIG_COMMON_CLK - of_clk_init(NULL); -#else + r8a7779_clocks_init(r8a7779_read_mode_pins()); +#endif + clocksource_of_init(); +} + +static void __init marzen_init(void) +{ +#ifndef CONFIG_COMMON_CLK r8a7779_clock_init(); #endif r8a7779_add_standard_devices_dt(); @@ -48,6 +55,7 @@ DT_MACHINE_START(MARZEN, "marzen") .smp = smp_ops(r8a7779_smp_ops), .map_io = r8a7779_map_io, .init_early = r8a7779_init_delay, + .init_time = marzen_init_timer, .nr_irqs = NR_IRQS_LEGACY, .init_irq = r8a7779_init_irq_dt, .init_machine = marzen_init, -- 1.8.5.2
next prev parent reply other threads:[~2014-02-26 7:33 UTC|newest] Thread overview: 118+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-02-26 7:33 [PATCH v3 00/20] ARM: shmobile: r8a7779, marzen: CCF and multiplatform Simon Horman 2014-02-26 7:33 ` Simon Horman 2014-02-26 7:33 ` [PATCH v3 01/20] clk: shmobile: r8a7779: Add clocks support Simon Horman 2014-02-26 7:33 ` Simon Horman 2014-02-26 8:05 ` Geert Uytterhoeven 2014-02-26 8:05 ` Geert Uytterhoeven 2014-02-26 8:59 ` Simon Horman 2014-02-26 8:59 ` Simon Horman 2014-02-26 9:06 ` Geert Uytterhoeven 2014-02-26 9:06 ` Geert Uytterhoeven 2014-02-28 1:35 ` Simon Horman 2014-02-28 1:35 ` Simon Horman 2014-02-26 12:53 ` Laurent Pinchart 2014-02-26 12:53 ` Laurent Pinchart 2014-02-26 13:02 ` Laurent Pinchart 2014-02-26 13:02 ` Laurent Pinchart 2014-03-12 7:55 ` Simon Horman 2014-03-12 7:55 ` Simon Horman 2014-03-12 10:12 ` Laurent Pinchart 2014-03-12 10:12 ` Laurent Pinchart 2014-03-13 2:22 ` Simon Horman 2014-03-13 2:22 ` Simon Horman 2014-03-13 9:07 ` Laurent Pinchart 2014-03-13 9:07 ` Laurent Pinchart 2014-03-14 0:38 ` Simon Horman 2014-03-14 0:38 ` Simon Horman 2014-03-01 13:50 ` Wolfram Sang 2014-03-01 13:50 ` Wolfram Sang 2014-03-01 17:33 ` Geert Uytterhoeven 2014-03-01 17:33 ` Geert Uytterhoeven 2014-03-02 11:35 ` Laurent Pinchart 2014-03-02 11:35 ` Laurent Pinchart 2014-03-02 11:51 ` Geert Uytterhoeven 2014-03-02 11:51 ` Geert Uytterhoeven 2014-03-02 11:59 ` Wolfram Sang 2014-03-02 11:59 ` Wolfram Sang 2014-02-26 7:33 ` [PATCH v3 02/20] clk: shmobile: r8a7779: Add MSTP clock support Simon Horman 2014-02-26 7:33 ` Simon Horman 2014-02-26 12:53 ` Laurent Pinchart 2014-02-26 12:53 ` Laurent Pinchart 2014-02-26 7:33 ` [PATCH v3 03/20] ARM: shmobile: r8a7779: Add clock index macros for DT sources Simon Horman 2014-02-26 7:33 ` Simon Horman 2014-02-26 12:56 ` Laurent Pinchart 2014-02-26 12:56 ` Laurent Pinchart 2014-02-26 7:33 ` [PATCH v3 04/20] ARM: shmobile: r8a7779: Add clocks Simon Horman 2014-02-26 7:33 ` Simon Horman 2014-02-26 8:13 ` Geert Uytterhoeven 2014-02-26 8:13 ` Geert Uytterhoeven 2014-02-26 8:55 ` Simon Horman 2014-02-26 8:55 ` Simon Horman 2014-02-26 13:15 ` Laurent Pinchart 2014-02-26 13:15 ` Laurent Pinchart 2014-03-12 8:40 ` Simon Horman 2014-03-12 8:40 ` Simon Horman 2014-02-26 14:45 ` Laurent Pinchart 2014-02-26 14:45 ` Laurent Pinchart 2014-03-12 8:43 ` Simon Horman 2014-03-12 8:43 ` Simon Horman 2014-03-01 14:29 ` Wolfram Sang 2014-03-01 14:29 ` Wolfram Sang 2014-02-26 7:33 ` [PATCH v3 05/20] ARM: shmobile: Sync Marzen DTS with Marzen reference DTS Simon Horman 2014-02-26 7:33 ` Simon Horman 2014-02-26 13:17 ` Laurent Pinchart 2014-02-26 13:17 ` Laurent Pinchart 2014-02-26 7:33 ` [PATCH v3 06/20] ARM: shmobile: marzen: Specify external clock frequency in DT Simon Horman 2014-02-26 7:33 ` Simon Horman 2014-02-26 13:19 ` Laurent Pinchart 2014-02-26 13:19 ` Laurent Pinchart 2014-02-26 7:33 ` [PATCH v3 07/20] ARM: shmobile: marzen: Reference clocks Simon Horman 2014-02-26 7:33 ` Simon Horman 2014-02-26 13:20 ` Laurent Pinchart 2014-02-26 13:20 ` Laurent Pinchart 2014-02-26 14:23 ` Sergei Shtylyov 2014-02-26 15:23 ` Sergei Shtylyov 2014-03-13 0:09 ` Simon Horman 2014-03-13 0:09 ` Simon Horman 2014-02-26 7:33 ` [PATCH v3 08/20] ARM: shmobile: r8a7779: " Simon Horman 2014-02-26 7:33 ` Simon Horman 2014-02-26 13:21 ` Laurent Pinchart 2014-02-26 13:21 ` Laurent Pinchart 2014-02-26 7:33 ` [PATCH v3 09/20] ARM: shmobile: r8a7779: Add helper to read mode pins Simon Horman 2014-02-26 7:33 ` Simon Horman 2014-02-26 7:33 ` [PATCH v3 10/20] ARM: shmobile: r8a7779: Move r8a7779_earlytimer_init to clock-r8a7779.c Simon Horman 2014-02-26 7:33 ` Simon Horman 2014-02-26 7:33 ` [PATCH v3 11/20] ARM: shmobile: marzen-reference: Move clock and OF device initialisation into board Simon Horman 2014-02-26 7:33 ` [PATCH v3 11/20] ARM: shmobile: marzen-reference: Move clock and OF device initialisation into board code Simon Horman 2014-02-26 7:33 ` [PATCH v3 12/20] ARM: shmobile: r8a7779: Do not include sh_clk.h in r8a7779.h Simon Horman 2014-02-26 7:33 ` Simon Horman 2014-02-26 7:33 ` [PATCH v3 13/20] ARM: shmobile: r8a7779: Initial multiplatform support Simon Horman 2014-02-26 7:33 ` Simon Horman 2014-02-26 7:33 ` Simon Horman [this message] 2014-02-26 7:33 ` [PATCH v3 14/20] ARM: shmobile: marzen-reference: Initialize CPG device Simon Horman 2014-02-26 13:22 ` Laurent Pinchart 2014-02-26 13:22 ` Laurent Pinchart 2014-02-26 7:33 ` [PATCH v3 15/20] ARM: shmobile: marzen-reference: Instantiate clkdevs for SCIF and TMU Simon Horman 2014-02-26 7:33 ` Simon Horman 2014-02-26 8:29 ` Geert Uytterhoeven 2014-02-26 8:29 ` Geert Uytterhoeven 2014-02-26 8:56 ` Simon Horman 2014-02-26 8:56 ` Simon Horman 2014-02-26 13:24 ` Laurent Pinchart 2014-02-26 13:24 ` Laurent Pinchart 2014-03-13 0:03 ` Simon Horman 2014-03-13 0:03 ` Simon Horman 2014-02-26 7:33 ` [PATCH v3 16/20] ARM: shmobile: marzen: Add to shmobile defconfig Simon Horman 2014-02-26 7:33 ` Simon Horman 2014-02-26 7:33 ` [PATCH v3 17/20] ARM: shmobile: Remove non-multiplatform Marzen reference support Simon Horman 2014-02-26 7:33 ` Simon Horman 2014-02-26 7:33 ` [PATCH v3 18/20] ARM: shmobile: Let Marzen multiplatform boot with Marzen DTB Simon Horman 2014-02-26 7:33 ` Simon Horman 2014-02-26 7:33 ` [PATCH v3 19/20] ARM: shmobile: Remove Marzen reference DTS Simon Horman 2014-02-26 7:33 ` Simon Horman 2014-02-26 7:33 ` [PATCH v3 20/20] ARM: shmobile: marzen-reference: Remove legacy clock support Simon Horman 2014-02-26 7:33 ` Simon Horman 2014-02-26 8:33 ` Geert Uytterhoeven 2014-02-26 8:33 ` Geert Uytterhoeven 2014-02-26 8:57 ` Simon Horman 2014-02-26 8:57 ` Simon Horman
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=1393400016-23433-15-git-send-email-horms+renesas@verge.net.au \ --to=horms+renesas@verge.net.au \ --cc=linux-arm-kernel@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.