[GIT PULL] Renesas ARM Based SoC Fixes for v3.14

[GIT PULL] Renesas ARM Based SoC Fixes for v3.14

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

please consider these renesas ARM Based SoC Fixes for v3.14.

This pull-request is based on the Third Round of Renesas ARM Based SoC
Updates for v3.14, tagged as renesas-soc3-for-v3.14, which you have
previously pulled.

It resolves a problem introduced by a patch included in the second round of such
changes, tagged as renesas-soc2-for-v3.14, which you have also previously
pulled.

renesas-soc3-for-v3.14 is based on renesas-soc2-for-v3.14.



The following changes since commit d85bcfa916ffdf078f188aeab60f738b290f4309:

  arm: shmobile: r7s72100: add i2c clocks (2013-12-24 21:09:19 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-fixes-for-v3.14

for you to fetch changes up to db455c786886465c4d7fcd012fe2684b4c887776:

  ARM: shmobile: r8a7790: Fix I2C controller names (2014-01-06 14:25:39 +0900)

----------------------------------------------------------------
Renesas ARM Based SoC Fixes for v3.14

* r8a7790 (R-Car H2) SoC

  - Correct I2C controller names

    This fixes the issue introduced by
    b448c904f5058b6c "ARM: shmobile: r8a7790: add I2C support"
    which is queued-up for v3.14.

----------------------------------------------------------------
Valentine Barshak (1):
      ARM: shmobile: r8a7790: Fix I2C controller names

 arch/arm/mach-shmobile/clock-r8a7790.c | 8 ++++----
 arch/arm/mach-shmobile/setup-r8a7790.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

[PATCH] ARM: shmobile: r8a7790: Fix I2C controller names

[Simon Horman]

From: Valentine Barshak <valentine.barshak@cogentembedded.com>

This fixes the issue introduced by the following commit:
b448c904f5058b6c "ARM: shmobile: r8a7790: add I2C support"

The R8A7790 is an R-Car Gen2 SoC. The clock division factor
(CDF) width is 3 bits on Gen2 as opposed to 2 bits on Gen1.
Fix the device names for R8A7790 SoC to make the R-Car I2C
driver configure the hardware properly.

Changes in V2:
* rebased on top of the latest branch;
* capitalized ARM in the subject line;
* noted the commit that caused the issue in the log.

Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
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 | 8 ++++----
 arch/arm/mach-shmobile/setup-r8a7790.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index b6ecea3..e6f88dd 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -292,13 +292,13 @@ static struct clk_lookup lookups[] = {
 	CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP717]),
 	CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP716]),
 	CLKDEV_DEV_ID("e6508000.i2c", &mstp_clks[MSTP931]),
-	CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP931]),
+	CLKDEV_DEV_ID("i2c-rcar_gen2.0", &mstp_clks[MSTP931]),
 	CLKDEV_DEV_ID("e6518000.i2c", &mstp_clks[MSTP930]),
-	CLKDEV_DEV_ID("i2c-rcar.1", &mstp_clks[MSTP930]),
+	CLKDEV_DEV_ID("i2c-rcar_gen2.1", &mstp_clks[MSTP930]),
 	CLKDEV_DEV_ID("e6530000.i2c", &mstp_clks[MSTP929]),
-	CLKDEV_DEV_ID("i2c-rcar.2", &mstp_clks[MSTP929]),
+	CLKDEV_DEV_ID("i2c-rcar_gen2.2", &mstp_clks[MSTP929]),
 	CLKDEV_DEV_ID("e6540000.i2c", &mstp_clks[MSTP928]),
-	CLKDEV_DEV_ID("i2c-rcar.3", &mstp_clks[MSTP928]),
+	CLKDEV_DEV_ID("i2c-rcar_gen2.3", &mstp_clks[MSTP928]),
 	CLKDEV_DEV_ID("r8a7790-ether", &mstp_clks[MSTP813]),
 	CLKDEV_DEV_ID("e61f0000.thermal", &mstp_clks[MSTP522]),
 	CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index 66476d2..d6589f3 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -81,7 +81,7 @@ static struct resource i2c_resources[] __initdata = {
 
 #define r8a7790_register_i2c(idx)		\
 	platform_device_register_simple(	\
-		"i2c-rcar", idx,		\
+		"i2c-rcar_gen2", idx,		\
 		i2c_resources + (2 * idx), 2);	\
 
 void __init r8a7790_pinmux_init(void)
-- 
1.8.4

Re: [GIT PULL] Renesas ARM Based SoC Fixes for v3.14

[Kevin Hilman]

Simon Horman <horms+renesas@verge.net.au> writes:

> Hi Olof, Hi Kevin, Hi Arnd,
>
> please consider these renesas ARM Based SoC Fixes for v3.14.
>
> This pull-request is based on the Third Round of Renesas ARM Based SoC
> Updates for v3.14, tagged as renesas-soc3-for-v3.14, which you have
> previously pulled.
>
> It resolves a problem introduced by a patch included in the second round of such
> changes, tagged as renesas-soc2-for-v3.14, which you have also previously
> pulled.
>
> renesas-soc3-for-v3.14 is based on renesas-soc2-for-v3.14.

Applied.

Since your soc3 branch was included in our next/soc branch, I've just
added the fix there as well.

Kevin

Re: [GIT PULL] Renesas ARM Based SoC Fixes for v3.14

[Simon Horman]

On Tue, Jan 14, 2014 at 10:44:54AM -0800, Kevin Hilman wrote:
> Simon Horman <horms+renesas@verge.net.au> writes:
> 
> > Hi Olof, Hi Kevin, Hi Arnd,
> >
> > please consider these renesas ARM Based SoC Fixes for v3.14.
> >
> > This pull-request is based on the Third Round of Renesas ARM Based SoC
> > Updates for v3.14, tagged as renesas-soc3-for-v3.14, which you have
> > previously pulled.
> >
> > It resolves a problem introduced by a patch included in the second round of such
> > changes, tagged as renesas-soc2-for-v3.14, which you have also previously
> > pulled.
> >
> > renesas-soc3-for-v3.14 is based on renesas-soc2-for-v3.14.
> 
> Applied.
> 
> Since your soc3 branch was included in our next/soc branch, I've just
> added the fix there as well.

Thanks.

[GIT PULL] Renesas ARM Based SoC Fixes for v3.16

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these Renesas ARM based SoC fixes for v3.16.

This corrects a bug that will be introduced in v3.15.
The bug causes audio playback to fail on the Armadillo800 EVA board.

I am posting this as a fix for v3.16 rather than v3.15 as I believe
it is too late in the v3.15 cycle for a change of this nature.
As such I would also like this change considered for v3.15 -stable.


The following changes since commit c9eaa447e77efe77b7fa4c953bd62de8297fd6c5:

  Linux 3.15-rc1 (2014-04-13 14:18:35 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes-for-v3.16

for you to fetch changes up to 730359857f5f0e1fac9881c63d389d73adb5f416:

  ARM: shmobile: armadillo800eva: fixup HDMI sound flags setting (2014-05-28 12:57:07 +0900)

----------------------------------------------------------------
Renesas ARM Based SoC Fixes for v3.16

This corrects a bug that will be introduced in v3.15.
The bug causes audio playback to fail on the Armadillo800 EVA board.

----------------------------------------------------------------
Kuninori Morimoto (1):
      ARM: shmobile: armadillo800eva: fixup HDMI sound flags setting

 arch/arm/mach-shmobile/board-armadillo800eva.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[PATCH] ARM: shmobile: armadillo800eva: fixup HDMI sound flags setting

[Simon Horman]

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

c7a507eea1db1430476289f525f9c853d5d485e8
(ASoC: fsi: fixup SND_SOC_DAIFMT_CBx_CFx flags)
fixuped FSI driver's behavior
which didn't match to ALSA flags.

But, it didn't care about armadillo800eva HDMI sound flags.
This patch fixed it.

Reported-by: Bui Duc Phuc(Fukuda) <bd-phuc@jinso.co.jp>
Reported-by: Hiep Cao Minh <cm-hiep@jinso.co.jp>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/board-armadillo800eva.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 2858f38..40895cc 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1016,7 +1016,7 @@ static struct asoc_simple_card_info fsi2_hdmi_info = {
 	.platform	= "sh_fsi2",
 	.cpu_dai = {
 		.name	= "fsib-dai",
-		.fmt	= SND_SOC_DAIFMT_CBM_CFM,
+		.fmt	= SND_SOC_DAIFMT_CBS_CFS,
 	},
 	.codec_dai = {
 		.name = "sh_mobile_hdmi-hifi",
-- 
1.8.5.2

Re: [GIT PULL] Renesas ARM Based SoC Fixes for v3.16

[Olof Johansson]

On Thu, May 29, 2014 at 4:31 PM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these Renesas ARM based SoC fixes for v3.16.
>
> This corrects a bug that will be introduced in v3.15.
> The bug causes audio playback to fail on the Armadillo800 EVA board.
>
> I am posting this as a fix for v3.16 rather than v3.15 as I believe
> it is too late in the v3.15 cycle for a change of this nature.
> As such I would also like this change considered for v3.15 -stable.
>
>
> The following changes since commit c9eaa447e77efe77b7fa4c953bd62de8297fd6c5:
>
>   Linux 3.15-rc1 (2014-04-13 14:18:35 -0700)
>
> are available in the git repository at:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes-for-v3.16
>
> for you to fetch changes up to 730359857f5f0e1fac9881c63d389d73adb5f416:
>
>   ARM: shmobile: armadillo800eva: fixup HDMI sound flags setting (2014-05-28 12:57:07 +0900)

Merged, thanks.


-Olof

[GIT PULL] Renesas ARM Based SoC Fixes for v3.18

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these Renesas ARM based SoC fixes for v3.18.
Or alternatively for v3.19 if you feel they are too late for v3.18.


* ARM: shmobile: kzm9g legacy: Set i2c clks_per_count

  This problem appears to have been introduced when i2c shmobile support was
  added to the sh73a0 by b028f94b76319e1b8 ("ARM: mach-shmobile: sh73a0
  i2c_shmobile support.") in v2.6.37.

  Without this fix i2c may not operate correctly on the sh73a0/kzm9g.


The following changes since commit f114040e3ea6e07372334ade75d1ee0775c355e1:

  Linux 3.18-rc1 (2014-10-19 18:08:38 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-fixes-for-v3.18

for you to fetch changes up to b207422bb92f17f4f892a9b8737d44b37fece25b:

  ARM: shmobile: kzm9g legacy: Set i2c clks_per_count to 2 (2014-11-12 10:38:30 +0900)

----------------------------------------------------------------
Renesas ARM Based SoC Fixes for v3.18

* Set i2c clks_per_count to 2 on kzm9g

----------------------------------------------------------------
Geert Uytterhoeven (1):
      ARM: shmobile: kzm9g legacy: Set i2c clks_per_count to 2

 arch/arm/mach-shmobile/setup-sh73a0.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

[PATCH] ARM: shmobile: kzm9g legacy: Set i2c clks_per_count to 2

[Simon Horman]

From: Geert Uytterhoeven <geert+renesas@glider.be>

On sh73a0/kzm9g-legacy, probing of the i2c masters fails with:

    i2c-sh_mobile i2c-sh_mobile.0: timing values out of range: L/H=0x208/0x1bf
    sh_mobile: probe of i2c-sh_mobile.0 failed with error -22

According to the datasheet, the transfer rate is derived from the HP
clock (which runs at 104 MHz) divided by two. Hence
i2c_sh_mobile_platform_data.clks_per_count should be set to two.

Now probing succeeds, and i2c works:

    i2c-sh_mobile i2c-sh_mobile.0: I2C adapter 0 with bus speed 100000 Hz (L/H=0x104/0xe0)

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/setup-sh73a0.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index b7bd8e5..328657d 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -26,6 +26,7 @@
 #include <linux/of_platform.h>
 #include <linux/delay.h>
 #include <linux/input.h>
+#include <linux/i2c/i2c-sh_mobile.h>
 #include <linux/io.h>
 #include <linux/serial_sci.h>
 #include <linux/sh_dma.h>
@@ -192,11 +193,18 @@ static struct resource i2c4_resources[] = {
 	},
 };
 
+static struct i2c_sh_mobile_platform_data i2c_platform_data = {
+	.clks_per_count	= 2,
+};
+
 static struct platform_device i2c0_device = {
 	.name		= "i2c-sh_mobile",
 	.id		= 0,
 	.resource	= i2c0_resources,
 	.num_resources	= ARRAY_SIZE(i2c0_resources),
+	.dev		= {
+		.platform_data	= &i2c_platform_data,
+	},
 };
 
 static struct platform_device i2c1_device = {
@@ -204,6 +212,9 @@ static struct platform_device i2c1_device = {
 	.id		= 1,
 	.resource	= i2c1_resources,
 	.num_resources	= ARRAY_SIZE(i2c1_resources),
+	.dev		= {
+		.platform_data	= &i2c_platform_data,
+	},
 };
 
 static struct platform_device i2c2_device = {
@@ -211,6 +222,9 @@ static struct platform_device i2c2_device = {
 	.id		= 2,
 	.resource	= i2c2_resources,
 	.num_resources	= ARRAY_SIZE(i2c2_resources),
+	.dev		= {
+		.platform_data	= &i2c_platform_data,
+	},
 };
 
 static struct platform_device i2c3_device = {
@@ -218,6 +232,9 @@ static struct platform_device i2c3_device = {
 	.id		= 3,
 	.resource	= i2c3_resources,
 	.num_resources	= ARRAY_SIZE(i2c3_resources),
+	.dev		= {
+		.platform_data	= &i2c_platform_data,
+	},
 };
 
 static struct platform_device i2c4_device = {
@@ -225,6 +242,9 @@ static struct platform_device i2c4_device = {
 	.id		= 4,
 	.resource	= i2c4_resources,
 	.num_resources	= ARRAY_SIZE(i2c4_resources),
+	.dev		= {
+		.platform_data	= &i2c_platform_data,
+	},
 };
 
 static const struct sh_dmae_slave_config sh73a0_dmae_slaves[] = {
-- 
2.1.1

[GIT PULL] Renesas ARM Based SoC Fixes for v3.19

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these Renesas ARM based SoC fixes for v3.19.

This pull request is based on the last round of SoC updates for v3.19,
Fourth Round of Renesas ARM Based SoC Updates for v3.19, tagged as
renesas-soc3-for-v3.19, merged into your next/soc branch and included in
v3.19-rc1.


* ARM: shmobile: r8a7740: Instantiate GIC from C board code in legacy builds

  This fixes a long standing problem which has been present since
  the sh73a0 SoC started using the INTC External IRQ pin driver.

  The patch that introduced the problem is 341eb5465f67437a ("ARM:
  shmobile: INTC External IRQ pin driver on sh73a0") which was included
  in v3.10.

* This fixes a regression in the r8a7740 SoC due to
  9a1091ef0017c40a ("irqchip: gic: Support hierarchy irq domain.")
  which was included in v3.18-rc2.


The following changes since commit 7a2071c58f36450fbf44a27d2e5d371c18534a25:

  ARM: shmobile: Add early debugging support using SCIF(A) (2014-11-17 10:29:58 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-fixes-for-v3.19

for you to fetch changes up to b0ddb319db3d7a1943445f0de0a45c07a7f3457a:

  ARM: shmobile: sh73a0 legacy: Set .control_parent for all irqpin instances (2015-01-08 09:15:16 +0900)

----------------------------------------------------------------
Renesas ARM Based SoC Fixes for v3.19

* Set .control_parent for all irqpin instances for sh73a0 SoC when booting
  using legacy C
* Instantiate GIC board for r8a7740 SoC when using legacy C

----------------------------------------------------------------
Geert Uytterhoeven (2):
      ARM: shmobile: r8a7740: Instantiate GIC from C board code in legacy builds
      ARM: shmobile: sh73a0 legacy: Set .control_parent for all irqpin instances

 arch/arm/mach-shmobile/setup-r8a7740.c | 7 +++++++
 arch/arm/mach-shmobile/setup-sh73a0.c  | 3 +++
 2 files changed, 10 insertions(+)

[PATCH 1/2] ARM: shmobile: r8a7740: Instantiate GIC from C board code in legacy builds

[Simon Horman]

From: Geert Uytterhoeven <geert+renesas@glider.be>

As of commit 9a1091ef0017c40a ("irqchip: gic: Support hierarchy irq
domain."), armadillo-legacy hangs during boot with:

     sh-tmu.0: ch0: used for clock events
     sh-tmu.0: ch0: used for periodic clock events
     sh-tmu.0: ch0: failed to request irq 230
     sh-tmu.0: ch1: used as clock source
     sh-cmt-48.1: ch0: failed to request irq 90
     sh-cmt-48.1: ch0: registration failed
    earlytimer: unable to probe sh-cmt-48 early.
    Calibrating delay loop...

This happens because the IRQ numbers of the GIC are now virtual, and no
longer match the hardcoded hardware IRQ numbers in the platform board
code.
To fix this, instantiate the GIC from platform board code when compiling
a legacy kernel, like is done on sh73a0 for kzm9g-legacy.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/setup-r8a7740.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 0bfe226..e76e2f8 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -793,7 +793,14 @@ void __init r8a7740_init_irq_of(void)
 	void __iomem *intc_msk_base = ioremap_nocache(0xe6900040, 0x10);
 	void __iomem *pfc_inta_ctrl = ioremap_nocache(0xe605807c, 0x4);
 
+#ifdef CONFIG_ARCH_SHMOBILE_LEGACY
+	void __iomem *gic_dist_base = ioremap_nocache(0xc2800000, 0x1000);
+	void __iomem *gic_cpu_base = ioremap_nocache(0xc2000000, 0x1000);
+
+	gic_init(0, 29, gic_dist_base, gic_cpu_base);
+#else
 	irqchip_init();
+#endif
 
 	/* route signals to GIC */
 	iowrite32(0x0, pfc_inta_ctrl);
-- 
2.1.4

[PATCH 2/2] ARM: shmobile: sh73a0 legacy: Set .control_parent for all irqpin instances

[Simon Horman]

From: Geert Uytterhoeven <geert+renesas@glider.be>

The sh73a0 INTC can't mask interrupts properly most likely due to a
hardware bug. Set the .control_parent flag to delegate masking to the
parent interrupt controller, like was already done for irqpin1.

Without this, accessing the three-axis digital accelerometer ADXL345
on kzm9g through /dev/input/event1 causes an interrupt storm, which
requires a power-cycle to recover from.

This was inspired by a patch for arch/arm/boot/dts/sh73a0.dtsi from
Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Fixes: 341eb5465f67437a ("ARM: shmobile: INTC External IRQ pin driver on sh73a0")
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/setup-sh73a0.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index fa7cab8..b5d0cf5 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -579,6 +579,7 @@ static struct platform_device ipmmu_device = {
 
 static struct renesas_intc_irqpin_config irqpin0_platform_data = {
 	.irq_base = irq_pin(0), /* IRQ0 -> IRQ7 */
+	.control_parent = true,
 };
 
 static struct resource irqpin0_resources[] = {
@@ -640,6 +641,7 @@ static struct platform_device irqpin1_device = {
 
 static struct renesas_intc_irqpin_config irqpin2_platform_data = {
 	.irq_base = irq_pin(16), /* IRQ16 -> IRQ23 */
+	.control_parent = true,
 };
 
 static struct resource irqpin2_resources[] = {
@@ -670,6 +672,7 @@ static struct platform_device irqpin2_device = {
 
 static struct renesas_intc_irqpin_config irqpin3_platform_data = {
 	.irq_base = irq_pin(24), /* IRQ24 -> IRQ31 */
+	.control_parent = true,
 };
 
 static struct resource irqpin3_resources[] = {
-- 
2.1.4

Re: [GIT PULL] Renesas ARM Based SoC Fixes for v3.19

[Geert Uytterhoeven]

On Tue, Jan 13, 2015 at 3:13 AM, Simon Horman
<horms+renesas@verge.net.au> wrote:
>
> Please consider these Renesas ARM based SoC fixes for v3.19.
>
> This pull request is based on the last round of SoC updates for v3.19,
> Fourth Round of Renesas ARM Based SoC Updates for v3.19, tagged as
> renesas-soc3-for-v3.19, merged into your next/soc branch and included in
> v3.19-rc1.
>
> * ARM: shmobile: r8a7740: Instantiate GIC from C board code in legacy builds

That's the description for the regression below.
Should have been: "Set .control_parent for all irqpin instances for sh73a0
SoC when booting using legacy C."

>   This fixes a long standing problem which has been present since
>   the sh73a0 SoC started using the INTC External IRQ pin driver.
>
>   The patch that introduced the problem is 341eb5465f67437a ("ARM:
>   shmobile: INTC External IRQ pin driver on sh73a0") which was included
>   in v3.10.
>
> * This fixes a regression in the r8a7740 SoC due to
>   9a1091ef0017c40a ("irqchip: gic: Support hierarchy irq domain.")
>   which was included in v3.18-rc2.

> ----------------------------------------------------------------
> Renesas ARM Based SoC Fixes for v3.19
>
> * Set .control_parent for all irqpin instances for sh73a0 SoC when booting
>   using legacy C
> * Instantiate GIC board for r8a7740 SoC when using legacy C

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [GIT PULL] Renesas ARM Based SoC Fixes for v3.19

[Olof Johansson]

On Tue, Jan 13, 2015 at 09:10:08AM +0100, Geert Uytterhoeven wrote:
> On Tue, Jan 13, 2015 at 3:13 AM, Simon Horman
> <horms+renesas@verge.net.au> wrote:
> >
> > Please consider these Renesas ARM based SoC fixes for v3.19.
> >
> > This pull request is based on the last round of SoC updates for v3.19,
> > Fourth Round of Renesas ARM Based SoC Updates for v3.19, tagged as
> > renesas-soc3-for-v3.19, merged into your next/soc branch and included in
> > v3.19-rc1.
> >
> > * ARM: shmobile: r8a7740: Instantiate GIC from C board code in legacy builds
> 
> That's the description for the regression below.
> Should have been: "Set .control_parent for all irqpin instances for sh73a0
> SoC when booting using legacy C."
> 
> >   This fixes a long standing problem which has been present since
> >   the sh73a0 SoC started using the INTC External IRQ pin driver.
> >
> >   The patch that introduced the problem is 341eb5465f67437a ("ARM:
> >   shmobile: INTC External IRQ pin driver on sh73a0") which was included
> >   in v3.10.
> >
> > * This fixes a regression in the r8a7740 SoC due to
> >   9a1091ef0017c40a ("irqchip: gic: Support hierarchy irq domain.")
> >   which was included in v3.18-rc2.
> 
> > ----------------------------------------------------------------
> > Renesas ARM Based SoC Fixes for v3.19
> >
> > * Set .control_parent for all irqpin instances for sh73a0 SoC when booting
> >   using legacy C
> > * Instantiate GIC board for r8a7740 SoC when using legacy C

Thanks, I fixed up the commit message when I pulled the branch.


Merged.

-Olof

Re: [GIT PULL] Renesas ARM Based SoC Fixes for v3.19

[Simon Horman]

On Tue, Jan 13, 2015 at 09:10:08AM +0100, Geert Uytterhoeven wrote:
> On Tue, Jan 13, 2015 at 3:13 AM, Simon Horman
> <horms+renesas@verge.net.au> wrote:
> >
> > Please consider these Renesas ARM based SoC fixes for v3.19.
> >
> > This pull request is based on the last round of SoC updates for v3.19,
> > Fourth Round of Renesas ARM Based SoC Updates for v3.19, tagged as
> > renesas-soc3-for-v3.19, merged into your next/soc branch and included in
> > v3.19-rc1.
> >
> > * ARM: shmobile: r8a7740: Instantiate GIC from C board code in legacy builds
> 
> That's the description for the regression below.
> Should have been: "Set .control_parent for all irqpin instances for sh73a0
> SoC when booting using legacy C."
> 
> >   This fixes a long standing problem which has been present since
> >   the sh73a0 SoC started using the INTC External IRQ pin driver.
> >
> >   The patch that introduced the problem is 341eb5465f67437a ("ARM:
> >   shmobile: INTC External IRQ pin driver on sh73a0") which was included
> >   in v3.10.
> >
> > * This fixes a regression in the r8a7740 SoC due to
> >   9a1091ef0017c40a ("irqchip: gic: Support hierarchy irq domain.")
> >   which was included in v3.18-rc2.

Thanks, I think the above text should have been:

* Set .control_parent for all irqpin instances for sh73a0 SoC when
  booting using legacy C

  This fixes a long standing problem which has been present since
  the sh73a0 SoC started using the INTC External IRQ pin driver.

  The patch that introduced the problem is 341eb5465f67437a ("ARM:
  shmobile: INTC External IRQ pin driver on sh73a0") which was included
  in v3.10.

* ARM: shmobile: r8a7740: Instantiate GIC from C board code in legacy builds

  This fixes a regression in the r8a7740 SoC due to
  9a1091ef0017c40a ("irqchip: gic: Support hierarchy irq domain.")
  which was included in v3.18-rc2.

> > ----------------------------------------------------------------
> > Renesas ARM Based SoC Fixes for v3.19
> >
> > * Set .control_parent for all irqpin instances for sh73a0 SoC when booting
> >   using legacy C
> > * Instantiate GIC board for r8a7740 SoC when using legacy C
> 
> Gr{oetje,eeting}s,
> 
>                         Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
> 
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
>                                 -- Linus Torvalds
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

[GIT PULL] Renesas ARM Based SoC Fixes for v4.1

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these Renesas ARM based SoC fixes for v4.1.

This addresses a short-coming which was introduced when
the adv7511 was enabled on the koelsch board.


The following changes since commit b787f68c36d49bb1d9236f403813641efa74a031:

  Linux 4.1-rc1 (2015-04-26 17:59:10 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes-for-v4.1

for you to fetch changes up to 12392f5896c9affc03c1ddd95a83c32238862a58:

  ARM: shmobile: koelsch: Fix adv7511 IRQ sensing (2015-05-01 09:13:03 +0900)

----------------------------------------------------------------
Renesas ARM Based SoC Fixes for v4.1

* Fix adv7511 IRQ sensing on koelsch board

----------------------------------------------------------------
Laurent Pinchart (1):
      ARM: shmobile: koelsch: Fix adv7511 IRQ sensing

 arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[PATCH] ARM: shmobile: koelsch: Fix adv7511 IRQ sensing

[Simon Horman]

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

The adv7511 IRQ is low level triggered, not falling edge triggered. The
wrong sense configuration results in no interrupt being triggered at
all, breaking hotplug detection. Fix it.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Fixes: 83a0731b39f3 ("ARM: shmobile: koelsch: Add DU HDMI output support")
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index 74c3212f1f11..824ddab9c3ad 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -545,7 +545,7 @@
 		compatible = "adi,adv7511w";
 		reg = <0x39>;
 		interrupt-parent = <&gpio3>;
-		interrupts = <29 IRQ_TYPE_EDGE_FALLING>;
+		interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
 
 		adi,input-depth = <8>;
 		adi,input-colorspace = "rgb";
-- 
2.1.4

Re: [GIT PULL] Renesas ARM Based SoC Fixes for v4.1

[Arnd Bergmann]

On Thursday 07 May 2015, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
> 
> Please consider these Renesas ARM based SoC fixes for v4.1.
> 
> This addresses a short-coming which was introduced when
> the adv7511 was enabled on the koelsch board.
> 
> 
> The following changes since commit b787f68c36d49bb1d9236f403813641efa74a031:
> 
>   Linux 4.1-rc1 (2015-04-26 17:59:10 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes-for-v4.1
> 
> for you to fetch changes up to 12392f5896c9affc03c1ddd95a83c32238862a58:
> 
>   ARM: shmobile: koelsch: Fix adv7511 IRQ sensing (2015-05-01 09:13:03 +0900)
> 
> ----------------------------------------------------------------
> Renesas ARM Based SoC Fixes for v4.1
> 
> * Fix adv7511 IRQ sensing on koelsch board
> 

Merged into the fixes branch, thanks!

	Arnd

[GIT PULL] Renesas ARM Based SoC Fixes for v4.3

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these Renesas ARM based SoC fixes for v4.3.

These changes are required to restore working sound for the r8a779[01] SoCs
in v4.3.

My understanding is that with the inclusion of
"drivers: sh: Disable PM runtime for multi-platform ARM with genpd"
in v4.3-rc3 sound stopped working for the SoCs in question.

These patches were previously posted as part of
"Renesas ARM Based SoC DT Updates for v4.4".
I have withdrawn that pull request.


The following changes since commit 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f:

  Linux 4.3-rc1 (2015-09-12 16:35:56 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes-for-v4.3

for you to fetch changes up to 56e86dd4bbeb66a7ad67e20fa045c6f51b4da571:

  ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound (2015-09-29 09:44:13 +0900)

----------------------------------------------------------------
Renesas ARM Based SoC Fixes for v4.3

* Add Add CPG/MSTP Clock Domain for sound on r8a779[01] SoCs.
  This allows sound to work once again.

----------------------------------------------------------------
Geert Uytterhoeven (2):
      ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound
      ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound

 arch/arm/boot/dts/r8a7790.dtsi | 1 +
 arch/arm/boot/dts/r8a7791.dtsi | 1 +
 2 files changed, 2 insertions(+)

[PATCH 1/2] ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound

[Simon Horman]

From: Geert Uytterhoeven <geert+renesas@glider.be>

484adb005886 ("ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain")
added CPG/MSTP clock-cells domain support, but it was missing sound
support. This patch adds it.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
[horms: Updated commit id referred to in changelog]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7790.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index a0b2a79cbfbd..4624d0f2a754 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1627,6 +1627,7 @@
 				"mix.0", "mix.1",
 				"dvc.0", "dvc.1",
 				"clk_a", "clk_b", "clk_c", "clk_i";
+		power-domains = <&cpg_clocks>;
 
 		status = "disabled";
 
-- 
2.1.4

Re: [PATCH 1/2] ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound

[Sergei Shtylyov]

Hello.

On 10/2/2015 5:29 AM, Simon Horman wrote:

> From: Geert Uytterhoeven <geert+renesas@glider.be>
>
> 484adb005886 ("ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain")
> added CPG/MSTP clock-cells domain support, but it was missing sound
> support. This patch adds it.

    Really? I'm only seeing "power-domains" prop added...

> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Tested-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> [horms: Updated commit id referred to in changelog]
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
>   arch/arm/boot/dts/r8a7790.dtsi | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
> index a0b2a79cbfbd..4624d0f2a754 100644
> --- a/arch/arm/boot/dts/r8a7790.dtsi
> +++ b/arch/arm/boot/dts/r8a7790.dtsi
> @@ -1627,6 +1627,7 @@
>   				"mix.0", "mix.1",
>   				"dvc.0", "dvc.1",
>   				"clk_a", "clk_b", "clk_c", "clk_i";
> +		power-domains = <&cpg_clocks>;
>
>   		status = "disabled";
>

MBR, Sergei

Re: [PATCH 1/2] ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound

[Sergei Shtylyov]

On 10/2/2015 2:29 PM, Sergei Shtylyov wrote:

>> From: Geert Uytterhoeven <geert+renesas@glider.be>
>>
>> 484adb005886 ("ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain")
>> added CPG/MSTP clock-cells domain support, but it was missing sound
>> support. This patch adds it.
>
>     Really? I'm only seeing "power-domains" prop added...

    Oh, I understand now. The log seems somewhat poorly worded though...

>> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
>> Tested-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>> [horms: Updated commit id referred to in changelog]
>> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
[...]

MBR, Sergei

Re: [PATCH 1/2] ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain for sound

[Arnd Bergmann]

On Friday 02 October 2015 14:32:49 Sergei Shtylyov wrote:
> On 10/2/2015 2:29 PM, Sergei Shtylyov wrote:
> 
> >> From: Geert Uytterhoeven <geert+renesas@glider.be>
> >>
> >> 484adb005886 ("ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain")
> >> added CPG/MSTP clock-cells domain support, but it was missing sound
> >> support. This patch adds it.
> >
> >     Really? I'm only seeing "power-domains" prop added...
> 
>     Oh, I understand now. The log seems somewhat poorly worded though...

I understood it right and merged it as is, but I agree this could
have been clearer.

	Arnd

[PATCH 2/2] ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain for sound

[Simon Horman]

From: Geert Uytterhoeven <geert+renesas@glider.be>

797a0626e08c ("ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain")
added CPG/MSTP clock-cells domain support, but it was missing sound
support. This patch adds it.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
[horms: updated commit id referred to in changelog]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7791.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 831525dd39a6..1666c8a6b143 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1677,6 +1677,7 @@
 				"mix.0", "mix.1",
 				"dvc.0", "dvc.1",
 				"clk_a", "clk_b", "clk_c", "clk_i";
+		power-domains = <&cpg_clocks>;
 
 		status = "disabled";
 
-- 
2.1.4

[PATCH 2/2] ARM: shmobile: r8a7791 dtsi: Remove bogus imp_clk node

[Geert Uytterhoeven]

R-Car M2-W does not have an IMP core or an IMP clock.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm/boot/dts/r8a7791.dtsi | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 328f48bd15e711ad..76742cc6021ee0a2 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1163,14 +1163,6 @@
 			clock-mult = <1>;
 			clock-output-names = "m2";
 		};
-		imp_clk: imp_clk {
-			compatible = "fixed-factor-clock";
-			clocks = <&cpg_clocks R8A7791_CLK_PLL1>;
-			#clock-cells = <0>;
-			clock-div = <4>;
-			clock-mult = <1>;
-			clock-output-names = "imp";
-		};
 		rclk_clk: rclk_clk {
 			compatible = "fixed-factor-clock";
 			clocks = <&cpg_clocks R8A7791_CLK_PLL1>;
-- 
1.9.1

Re: [GIT PULL] Renesas ARM Based SoC Fixes for v4.3

[Arnd Bergmann]

On Friday 02 October 2015 11:29:28 Simon Horman wrote:
> 
> Please consider these Renesas ARM based SoC fixes for v4.3.
> 
> These changes are required to restore working sound for the r8a779[01] SoCs
> in v4.3.
> 
> My understanding is that with the inclusion of
> "drivers: sh: Disable PM runtime for multi-platform ARM with genpd"
> in v4.3-rc3 sound stopped working for the SoCs in question.
> 
> These patches were previously posted as part of
> "Renesas ARM Based SoC DT Updates for v4.4".
> I have withdrawn that pull request.
> 
> 

Merged into fixes, thanks!

	Arnd

[GIT PULL] Renesas ARM Based SoC Fixes for v4.4

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these Renesas ARM based SoC fixes for v4.4.

The single patch in this pull-request corrects a section mismatch
in r8a7793 SoC code. Thanks to Nicolas Pitre for this fix.


The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec:

  Linux 4.4-rc1 (2015-11-15 17:00:27 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes-for-v4.4

for you to fetch changes up to c29d387b0bffb3ccce76e4fcdad9bfa7344ba338:

  ARM: shmobile: r8a7793: proper constness with __initconst (2015-11-22 17:13:13 -0800)

----------------------------------------------------------------
Renesas ARM Based SoC Fixes for v4.4

* r8a7793 SoC: Annotate r8a7793_boards_compat_dt with __initconst
  Aside from being correct this builds that otherwise
  fail with section mismatch errors.

----------------------------------------------------------------
Nicolas Pitre (1):
      ARM: shmobile: r8a7793: proper constness with __initconst

 arch/arm/mach-shmobile/setup-r8a7793.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[PATCH] ARM: shmobile: r8a7793: proper constness with __initconst

[Simon Horman]

From: Nicolas Pitre <nicolas.pitre@linaro.org>

Both the pointer array and the pointed data have to be const when using
__initconst to be correct.  This also fixes LTO builds that otherwise
fail with section mismatch errors.

Fixes: ec60d95b4fac ("ARM: shmobile: Basic r8a7793 SoC support")
Signed-off-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/setup-r8a7793.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/setup-r8a7793.c b/arch/arm/mach-shmobile/setup-r8a7793.c
index 1d2825cb7a65..5fce87f7f254 100644
--- a/arch/arm/mach-shmobile/setup-r8a7793.c
+++ b/arch/arm/mach-shmobile/setup-r8a7793.c
@@ -19,7 +19,7 @@
 #include "common.h"
 #include "rcar-gen2.h"
 
-static const char *r8a7793_boards_compat_dt[] __initconst = {
+static const char * const r8a7793_boards_compat_dt[] __initconst = {
 	"renesas,r8a7793",
 	NULL,
 };
-- 
2.1.4

Re: [GIT PULL] Renesas ARM Based SoC Fixes for v4.4

[Arnd Bergmann]

On Friday 27 November 2015 10:56:05 Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
> ----------------------------------------------------------------
> Renesas ARM Based SoC Fixes for v4.4
> 
> * r8a7793 SoC: Annotate r8a7793_boards_compat_dt with __initconst
>   Aside from being correct this builds that otherwise
>   fail with section mismatch errors.

Pulled into fixes, thanks!

	Arnd