* [GIT PULL 0/2] Second Round of Renesas ARM based SoC updates for v3.12
@ 2013-08-07 4:29 Simon Horman
2013-08-07 4:29 ` [GIT PULL 1/2] ARM: shmobile: r8a7790: clocks for Ether support Simon Horman
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Simon Horman @ 2013-08-07 4:29 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Arnd,
Please consider this second Round of renesas ARM based SoC updates for v3.12.
This pull-request is based on a merge of renesas-soc-for-v3.12 and
renesas-fixes-for-v3.12, both of which I have previously sent pull-requests
for.
The following changes since commit 21c7a134051f2f753d359a02923223ad9181da31:
Merge tag 'renesas-fixes-for-v3.12' into soc2-base (2013-08-06 17:56:43 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc2-for-v3.12
for you to fetch changes up to d687f4d1993fa046171dbb1ca1970a3172ce11b9:
ARM: shmobile: r8a7740: Add TPU clock entry for DT platforms (2013-08-06 17:57:09 +0900)
----------------------------------------------------------------
Second Round of Renesas ARM based SoC updates for v3.12
* Increased clock coverage for r8a7740 and r8a7790 SoCs
----------------------------------------------------------------
Laurent Pinchart (1):
ARM: shmobile: r8a7740: Add TPU clock entry for DT platforms
Simon Horman (1):
ARM: shmobile: r8a7790: clocks for Ether support
arch/arm/mach-shmobile/clock-r8a7740.c | 1 +
arch/arm/mach-shmobile/clock-r8a7790.c | 4 ++++
2 files changed, 5 insertions(+)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [GIT PULL 1/2] ARM: shmobile: r8a7790: clocks for Ether support
2013-08-07 4:29 [GIT PULL 0/2] Second Round of Renesas ARM based SoC updates for v3.12 Simon Horman
@ 2013-08-07 4:29 ` Simon Horman
2013-08-07 4:29 ` [GIT PULL 2/2] ARM: shmobile: r8a7740: Add TPU clock entry for DT platforms Simon Horman
2013-08-14 8:10 ` [GIT PULL 0/2] Second Round of Renesas ARM based SoC updates for v3.12 Olof Johansson
2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2013-08-07 4:29 UTC (permalink / raw)
To: linux-arm-kernel
Acked-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 | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index 50d96f9..fc36d3d 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -51,6 +51,7 @@
#define SMSTPCR3 0xe615013c
#define SMSTPCR5 0xe6150144
#define SMSTPCR7 0xe615014c
+#define SMSTPCR8 0xe6150990
#define SDCKCR 0xE6150074
#define SD2CKCR 0xE6150078
@@ -180,6 +181,7 @@ static struct clk div6_clks[DIV6_NR] = {
/* MSTP */
enum {
+ MSTP813,
MSTP721, MSTP720,
MSTP717, MSTP716,
MSTP522,
@@ -190,6 +192,7 @@ enum {
};
static struct clk mstp_clks[MSTP_NR] = {
+ [MSTP813] = SH_CLK_MSTP32(&p_clk, SMSTPCR8, 13, 0), /* Ether */
[MSTP721] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 21, 0), /* SCIF0 */
[MSTP720] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 20, 0), /* SCIF1 */
[MSTP717] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 17, 0), /* HSCIF0 */
@@ -258,6 +261,7 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP720]),
CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP717]),
CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP716]),
+ CLKDEV_DEV_ID("r8a7790-ether", &mstp_clks[MSTP813]),
CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),
CLKDEV_DEV_ID("ee200000.mmcif", &mstp_clks[MSTP315]),
CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP315]),
--
1.8.3.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [GIT PULL 2/2] ARM: shmobile: r8a7740: Add TPU clock entry for DT platforms
2013-08-07 4:29 [GIT PULL 0/2] Second Round of Renesas ARM based SoC updates for v3.12 Simon Horman
2013-08-07 4:29 ` [GIT PULL 1/2] ARM: shmobile: r8a7790: clocks for Ether support Simon Horman
@ 2013-08-07 4:29 ` Simon Horman
2013-08-14 8:10 ` [GIT PULL 0/2] Second Round of Renesas ARM based SoC updates for v3.12 Olof Johansson
2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2013-08-07 4:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
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-r8a7740.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c
index f4265e5..c826bca 100644
--- a/arch/arm/mach-shmobile/clock-r8a7740.c
+++ b/arch/arm/mach-shmobile/clock-r8a7740.c
@@ -597,6 +597,7 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("r8a7740-gether", &mstp_clks[MSTP309]),
CLKDEV_DEV_ID("e9a00000.sh-eth", &mstp_clks[MSTP309]),
CLKDEV_DEV_ID("renesas-tpu-pwm", &mstp_clks[MSTP304]),
+ CLKDEV_DEV_ID("e6600000.pwm", &mstp_clks[MSTP304]),
CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP415]),
CLKDEV_DEV_ID("e6870000.sdhi", &mstp_clks[MSTP415]),
--
1.8.3.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [GIT PULL 0/2] Second Round of Renesas ARM based SoC updates for v3.12
2013-08-07 4:29 [GIT PULL 0/2] Second Round of Renesas ARM based SoC updates for v3.12 Simon Horman
2013-08-07 4:29 ` [GIT PULL 1/2] ARM: shmobile: r8a7790: clocks for Ether support Simon Horman
2013-08-07 4:29 ` [GIT PULL 2/2] ARM: shmobile: r8a7740: Add TPU clock entry for DT platforms Simon Horman
@ 2013-08-14 8:10 ` Olof Johansson
2 siblings, 0 replies; 4+ messages in thread
From: Olof Johansson @ 2013-08-14 8:10 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Aug 07, 2013 at 01:29:16PM +0900, Simon Horman wrote:
> Hi Olof, Hi Arnd,
>
> Please consider this second Round of renesas ARM based SoC updates for v3.12.
>
> This pull-request is based on a merge of renesas-soc-for-v3.12 and
> renesas-fixes-for-v3.12, both of which I have previously sent pull-requests
> for.
>
>
> The following changes since commit 21c7a134051f2f753d359a02923223ad9181da31:
>
> Merge tag 'renesas-fixes-for-v3.12' into soc2-base (2013-08-06 17:56:43 +0900)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc2-for-v3.12
Pulled, thanks.
-Olof
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-08-14 8:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-07 4:29 [GIT PULL 0/2] Second Round of Renesas ARM based SoC updates for v3.12 Simon Horman
2013-08-07 4:29 ` [GIT PULL 1/2] ARM: shmobile: r8a7790: clocks for Ether support Simon Horman
2013-08-07 4:29 ` [GIT PULL 2/2] ARM: shmobile: r8a7740: Add TPU clock entry for DT platforms Simon Horman
2013-08-14 8:10 ` [GIT PULL 0/2] Second Round of Renesas ARM based SoC updates for v3.12 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).