* [GIT PULL] Second Round of Renesas ARM Based SoC Clock Updates for v3.15
@ 2014-03-06 5:05 Simon Horman
2014-03-06 5:05 ` [PATCH 1/2] ARM: shmobile: r8a7791: Remove legacy clock aliases for DT devices Simon Horman
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Simon Horman @ 2014-03-06 5:05 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Kevin, Hi Arnd,
Please consider this second round of Renesas ARM based SoC clock updates
for v3.15.
This pull request is based on the previous round of
such requests, tagged as renesas-clock-for-v3.15,
which I have already sent a pull-request for.
The following changes since commit df55f6685a04a259cf59cd3fde02212b294461cc:
ARM: shmobile: Remove legacy r8a7790 DT clocks (2014-02-24 08:54:44 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-clock2-for-v3.15
for you to fetch changes up to 9ced1d47719b5f32e4231338dd362c136518ed08:
ARM: shmobile: r8a7790: add sound SCU clock support (2014-02-24 10:03:02 +0900)
----------------------------------------------------------------
Second Round of Renesas ARM Based SoC Clock Updates for v3.15
r8a7790 (R-Car H2) SoC
- Add sound SCU clock support
r8a7791 (R-Car M2) SoC
- Remove legacy clock aliases for DT devices
----------------------------------------------------------------
Kuninori Morimoto (1):
ARM: shmobile: r8a7790: add sound SCU clock support
Laurent Pinchart (1):
ARM: shmobile: r8a7791: Remove legacy clock aliases for DT devices
arch/arm/mach-shmobile/clock-r8a7790.c | 25 +++++++++++++++++++++++++
arch/arm/mach-shmobile/clock-r8a7791.c | 1 -
2 files changed, 25 insertions(+), 1 deletion(-)
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1/2] ARM: shmobile: r8a7791: Remove legacy clock aliases for DT devices 2014-03-06 5:05 [GIT PULL] Second Round of Renesas ARM Based SoC Clock Updates for v3.15 Simon Horman @ 2014-03-06 5:05 ` Simon Horman 2014-03-06 5:05 ` [PATCH 2/2] ARM: shmobile: r8a7790: add sound SCU clock support Simon Horman 2014-03-17 7:48 ` [GIT PULL] Second Round of Renesas ARM Based SoC Clock Updates for v3.15 Olof Johansson 2 siblings, 0 replies; 4+ messages in thread From: Simon Horman @ 2014-03-06 5:05 UTC (permalink / raw) To: linux-arm-kernel From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Now that the r8a7791 DT platforms use the common clock framework, there's no need to manually create clock aliases for devices instantiated through DT, as those devices will reference their clocks directly in the device tree. Remove those aliases. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/mach-shmobile/clock-r8a7791.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/mach-shmobile/clock-r8a7791.c b/arch/arm/mach-shmobile/clock-r8a7791.c index 3e1b6b6..605fc77 100644 --- a/arch/arm/mach-shmobile/clock-r8a7791.c +++ b/arch/arm/mach-shmobile/clock-r8a7791.c @@ -267,7 +267,6 @@ static struct clk_lookup lookups[] = { CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP311]), CLKDEV_DEV_ID("sh_cmt.0", &mstp_clks[MSTP124]), CLKDEV_DEV_ID("qspi.0", &mstp_clks[MSTP917]), - CLKDEV_DEV_ID("e61f0000.thermal", &mstp_clks[MSTP522]), CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]), CLKDEV_DEV_ID("i2c-rcar_gen2.0", &mstp_clks[MSTP931]), CLKDEV_DEV_ID("i2c-rcar_gen2.1", &mstp_clks[MSTP930]), -- 1.8.5.2 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ARM: shmobile: r8a7790: add sound SCU clock support 2014-03-06 5:05 [GIT PULL] Second Round of Renesas ARM Based SoC Clock Updates for v3.15 Simon Horman 2014-03-06 5:05 ` [PATCH 1/2] ARM: shmobile: r8a7791: Remove legacy clock aliases for DT devices Simon Horman @ 2014-03-06 5:05 ` Simon Horman 2014-03-17 7:48 ` [GIT PULL] Second Round of Renesas ARM Based SoC Clock Updates for v3.15 Olof Johansson 2 siblings, 0 replies; 4+ messages in thread From: Simon Horman @ 2014-03-06 5:05 UTC (permalink / raw) To: linux-arm-kernel From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> This is needed to use SRC (= Sampling Rate Converter). MSTP1017 is defined top of MSTPxxx list to avoid runtime error, since it is parent clock of MSTP1031 - MSTP1022 Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/mach-shmobile/clock-r8a7790.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c index 02b94036..3f93503 100644 --- a/arch/arm/mach-shmobile/clock-r8a7790.c +++ b/arch/arm/mach-shmobile/clock-r8a7790.c @@ -204,6 +204,10 @@ static struct clk div6_clks[DIV6_NR] = { /* MSTP */ enum { + MSTP1017, /* parent of SCU */ + + MSTP1031, MSTP1030, + MSTP1029, MSTP1028, MSTP1027, MSTP1026, MSTP1025, MSTP1024, MSTP1023, MSTP1022, MSTP1015, MSTP1014, MSTP1013, MSTP1012, MSTP1011, MSTP1010, MSTP1009, MSTP1008, MSTP1007, MSTP1006, MSTP1005, MSTP931, MSTP930, MSTP929, MSTP928, @@ -223,6 +227,17 @@ enum { }; static struct clk mstp_clks[MSTP_NR] = { + [MSTP1031] = SH_CLK_MSTP32_STS(&mstp_clks[MSTP1017], SMSTPCR10, 31, MSTPSR10, 0), /* SCU0 */ + [MSTP1030] = SH_CLK_MSTP32_STS(&mstp_clks[MSTP1017], SMSTPCR10, 30, MSTPSR10, 0), /* SCU1 */ + [MSTP1029] = SH_CLK_MSTP32_STS(&mstp_clks[MSTP1017], SMSTPCR10, 29, MSTPSR10, 0), /* SCU2 */ + [MSTP1028] = SH_CLK_MSTP32_STS(&mstp_clks[MSTP1017], SMSTPCR10, 28, MSTPSR10, 0), /* SCU3 */ + [MSTP1027] = SH_CLK_MSTP32_STS(&mstp_clks[MSTP1017], SMSTPCR10, 27, MSTPSR10, 0), /* SCU4 */ + [MSTP1026] = SH_CLK_MSTP32_STS(&mstp_clks[MSTP1017], SMSTPCR10, 26, MSTPSR10, 0), /* SCU5 */ + [MSTP1025] = SH_CLK_MSTP32_STS(&mstp_clks[MSTP1017], SMSTPCR10, 25, MSTPSR10, 0), /* SCU6 */ + [MSTP1024] = SH_CLK_MSTP32_STS(&mstp_clks[MSTP1017], SMSTPCR10, 24, MSTPSR10, 0), /* SCU7 */ + [MSTP1023] = SH_CLK_MSTP32_STS(&mstp_clks[MSTP1017], SMSTPCR10, 23, MSTPSR10, 0), /* SCU8 */ + [MSTP1022] = SH_CLK_MSTP32_STS(&mstp_clks[MSTP1017], SMSTPCR10, 22, MSTPSR10, 0), /* SCU9 */ + [MSTP1017] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR10, 17, MSTPSR10, 0), /* SCU */ [MSTP1015] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR10, 15, MSTPSR10, 0), /* SSI0 */ [MSTP1014] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR10, 14, MSTPSR10, 0), /* SSI1 */ [MSTP1013] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR10, 13, MSTPSR10, 0), /* SSI2 */ @@ -366,6 +381,16 @@ static struct clk_lookup lookups[] = { CLKDEV_ICK_ID("clk_b", "rcar_sound", &audio_clk_b), CLKDEV_ICK_ID("clk_c", "rcar_sound", &audio_clk_c), CLKDEV_ICK_ID("clk_i", "rcar_sound", &m2_clk), + CLKDEV_ICK_ID("scu.0", "rcar_sound", &mstp_clks[MSTP1031]), + CLKDEV_ICK_ID("scu.1", "rcar_sound", &mstp_clks[MSTP1030]), + CLKDEV_ICK_ID("scu.2", "rcar_sound", &mstp_clks[MSTP1029]), + CLKDEV_ICK_ID("scu.3", "rcar_sound", &mstp_clks[MSTP1028]), + CLKDEV_ICK_ID("scu.4", "rcar_sound", &mstp_clks[MSTP1027]), + CLKDEV_ICK_ID("scu.5", "rcar_sound", &mstp_clks[MSTP1026]), + CLKDEV_ICK_ID("scu.6", "rcar_sound", &mstp_clks[MSTP1025]), + CLKDEV_ICK_ID("scu.7", "rcar_sound", &mstp_clks[MSTP1024]), + CLKDEV_ICK_ID("scu.8", "rcar_sound", &mstp_clks[MSTP1023]), + CLKDEV_ICK_ID("scu.9", "rcar_sound", &mstp_clks[MSTP1022]), CLKDEV_ICK_ID("ssi.0", "rcar_sound", &mstp_clks[MSTP1015]), CLKDEV_ICK_ID("ssi.1", "rcar_sound", &mstp_clks[MSTP1014]), CLKDEV_ICK_ID("ssi.2", "rcar_sound", &mstp_clks[MSTP1013]), -- 1.8.5.2 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [GIT PULL] Second Round of Renesas ARM Based SoC Clock Updates for v3.15 2014-03-06 5:05 [GIT PULL] Second Round of Renesas ARM Based SoC Clock Updates for v3.15 Simon Horman 2014-03-06 5:05 ` [PATCH 1/2] ARM: shmobile: r8a7791: Remove legacy clock aliases for DT devices Simon Horman 2014-03-06 5:05 ` [PATCH 2/2] ARM: shmobile: r8a7790: add sound SCU clock support Simon Horman @ 2014-03-17 7:48 ` Olof Johansson 2 siblings, 0 replies; 4+ messages in thread From: Olof Johansson @ 2014-03-17 7:48 UTC (permalink / raw) To: linux-arm-kernel On Thu, Mar 06, 2014 at 02:05:14PM +0900, Simon Horman wrote: > Hi Olof, Hi Kevin, Hi Arnd, > > Please consider this second round of Renesas ARM based SoC clock updates > for v3.15. > > This pull request is based on the previous round of > such requests, tagged as renesas-clock-for-v3.15, > which I have already sent a pull-request for. > > > The following changes since commit df55f6685a04a259cf59cd3fde02212b294461cc: > > ARM: shmobile: Remove legacy r8a7790 DT clocks (2014-02-24 08:54:44 +0900) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-clock2-for-v3.15 Merged, thanks! -Olof ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-03-17 7:48 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-03-06 5:05 [GIT PULL] Second Round of Renesas ARM Based SoC Clock Updates for v3.15 Simon Horman 2014-03-06 5:05 ` [PATCH 1/2] ARM: shmobile: r8a7791: Remove legacy clock aliases for DT devices Simon Horman 2014-03-06 5:05 ` [PATCH 2/2] ARM: shmobile: r8a7790: add sound SCU clock support Simon Horman 2014-03-17 7:48 ` [GIT PULL] Second Round of Renesas ARM Based SoC Clock Updates for v3.15 Olof Johansson
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).