[GIT PULL 0/2] Second Round of Renesas ARM based SoC updates for v3.12

[GIT PULL 0/2] Second Round of Renesas ARM based SoC updates for v3.12

[Simon Horman]

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(+)

[GIT PULL 1/2] ARM: shmobile: r8a7790: clocks for Ether support

[Simon Horman]

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

[GIT PULL 2/2] ARM: shmobile: r8a7740: Add TPU clock entry for DT platforms

[Simon Horman]

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

Re: [GIT PULL 0/2] Second Round of Renesas ARM based SoC updates for v3.12

[Olof Johansson]

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

[GIT PULL 0/2] Second round of Renesas ARM based SoC defconfig updates for v3.12

[Simon Horman]

Hi Kevin, Hi Olof, Hi Arnd,

please consider this second round of Renesas ARM based SoC defconfig
updates for v3.12.

It is based on renesas-defconfig-for-v3.12 ("ARM based SoC defconfig
updates for v3.12") which you have previously pulled.

I apologise that this and other pull requests that I will send today
are rather later in the cycle than I would like. This is primarily due
to a combination of my summer vacation and wanting to let the patches
sit in next for a while.


The following changes since commit 461cd47a65f5d8513a983ebd21ef7c23d4b4730f:

  ARM: shmobile: ape6evm: Enable gpio-leds in defconfig (2013-08-06 10:14:09 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig2-for-v3.12

for you to fetch changes up to d5ba7161270d10df4878762e085889fb8501fcf9:

  ARM: shmobile: lager: Select DRM_RCAR_DU in defconfig (2013-08-22 10:55:03 +0900)

----------------------------------------------------------------
Second round of Renesas ARM based SoC defconfig updates for v3.12

* Select DRM_RCAR_DU in marzen and lager defconfigs

----------------------------------------------------------------
Laurent Pinchart (2):
      ARM: shmobile: marzen: Select DRM_RCAR_DU in defconfig
      ARM: shmobile: lager: Select DRM_RCAR_DU in defconfig

 arch/arm/configs/lager_defconfig  | 2 ++
 arch/arm/configs/marzen_defconfig | 2 ++
 2 files changed, 4 insertions(+)

[PATCH 1/2] ARM: shmobile: marzen: Select DRM_RCAR_DU in defconfig

[Simon Horman]

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

A R-Car DU DRM device is registered for the Marzen board, select the
corresponding driver in its defconfig.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/configs/marzen_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
index 82e4040..26f30be 100644
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@ -85,6 +85,8 @@ CONFIG_GPIO_RCAR=y
 CONFIG_THERMAL=y
 CONFIG_RCAR_THERMAL=y
 CONFIG_SSB=y
+CONFIG_DRM=y
+CONFIG_DRM_RCAR_DU=y
 CONFIG_USB=y
 CONFIG_USB_RCAR_PHY=y
 CONFIG_MMC=y
-- 
1.8.3.2

[PATCH 2/2] ARM: shmobile: lager: Select DRM_RCAR_DU in defconfig

[Simon Horman]

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

A R-Car DU DRM device is registered for the Lager board, select the
corresponding driver in its defconfig.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/configs/lager_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/configs/lager_defconfig b/arch/arm/configs/lager_defconfig
index e777ef2..35bff5e 100644
--- a/arch/arm/configs/lager_defconfig
+++ b/arch/arm/configs/lager_defconfig
@@ -89,6 +89,8 @@ CONFIG_THERMAL=y
 CONFIG_RCAR_THERMAL=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_DRM=y
+CONFIG_DRM_RCAR_DU=y
 # CONFIG_USB_SUPPORT is not set
 CONFIG_MMC=y
 CONFIG_MMC_SDHI=y
-- 
1.8.3.2