[GIT PULL] Fifth Round of Renesas ARM based SoC fixes for v3.12

[GIT PULL] Fifth Round of Renesas ARM based SoC fixes for v3.12

[Simon Horman]

Hi Kevin, Olof and Arnd,

please consider this fifth Round of Renesas ARM based SoC fixes for v3.12.

This pull request is based on renesas-fixes4-for-v3.12 which you have
already pulled.


The following changes since commit 3786f86b60833f32e3eeb016fcf8c324f8147e00:

  ARM: shmobile: Remove #gpio-ranges-cells DT property (2013-09-22 21:28:18 +0900)

are available in the git repository at:

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

for you to fetch changes up to 40fca03cae59cfd9b87142ca327abb8a4d386908:

  ARM: shmobile: ape6evm: fix incorrect placement of __initdata tag (2013-10-01 12:53:19 +0900)

----------------------------------------------------------------
Fifth Round of Renesas ARM based SoC fixes for v3.12

* Correct incorrect placement of __initdata tag in ape6evm board code

----------------------------------------------------------------
Bartlomiej Zolnierkiewicz (1):
      ARM: shmobile: ape6evm: fix incorrect placement of __initdata tag

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

[GIT PULL] Fifth Round of Renesas ARM based SoC fixes for v3.12

[Simon Horman]

Hi Kevin, Olof and Arnd,

please consider this fifth Round of Renesas ARM based SoC fixes for v3.12.

This pull request is based on renesas-fixes4-for-v3.12 which you have
already pulled.


The following changes since commit 3786f86b60833f32e3eeb016fcf8c324f8147e00:

  ARM: shmobile: Remove #gpio-ranges-cells DT property (2013-09-22 21:28:18 +0900)

are available in the git repository at:

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

for you to fetch changes up to 40fca03cae59cfd9b87142ca327abb8a4d386908:

  ARM: shmobile: ape6evm: fix incorrect placement of __initdata tag (2013-10-01 12:53:19 +0900)

----------------------------------------------------------------
Fifth Round of Renesas ARM based SoC fixes for v3.12

* Correct incorrect placement of __initdata tag in ape6evm board code

----------------------------------------------------------------
Bartlomiej Zolnierkiewicz (1):
      ARM: shmobile: ape6evm: fix incorrect placement of __initdata tag

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

[PATCH] ARM: shmobile: ape6evm: fix incorrect placement of __initdata tag

[Simon Horman]

From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

__initdata tag should be placed between the variable name and equal
sign for the variable to be placed in the intended .init.data section.

Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/board-ape6evm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c
index 24b87eea..00e3add 100644
--- a/arch/arm/mach-shmobile/board-ape6evm.c
+++ b/arch/arm/mach-shmobile/board-ape6evm.c
@@ -86,7 +86,7 @@ static struct gpio_keys_button gpio_buttons[] = {
 	GPIO_KEY(KEY_VOLUMEDOWN,	329,	"S21"),
 };
 
-static struct __initdata gpio_keys_platform_data ape6evm_keys_pdata = {
+static struct gpio_keys_platform_data ape6evm_keys_pdata __initdata = {
 	.buttons	= gpio_buttons,
 	.nbuttons	= ARRAY_SIZE(gpio_buttons),
 };
-- 
1.8.4

[PATCH] ARM: shmobile: ape6evm: fix incorrect placement of __initdata tag

[Simon Horman]

From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

__initdata tag should be placed between the variable name and equal
sign for the variable to be placed in the intended .init.data section.

Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/board-ape6evm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c
index 24b87eea..00e3add 100644
--- a/arch/arm/mach-shmobile/board-ape6evm.c
+++ b/arch/arm/mach-shmobile/board-ape6evm.c
@@ -86,7 +86,7 @@ static struct gpio_keys_button gpio_buttons[] = {
 	GPIO_KEY(KEY_VOLUMEDOWN,	329,	"S21"),
 };
 
-static struct __initdata gpio_keys_platform_data ape6evm_keys_pdata = {
+static struct gpio_keys_platform_data ape6evm_keys_pdata __initdata = {
 	.buttons	= gpio_buttons,
 	.nbuttons	= ARRAY_SIZE(gpio_buttons),
 };
-- 
1.8.4

Re: [GIT PULL] Fifth Round of Renesas ARM based SoC fixes for v3.12

[Olof Johansson]

On Fri, Oct 04, 2013 at 05:19:40PM +0900, Simon Horman wrote:
> Hi Kevin, Olof and Arnd,
> 
> please consider this fifth Round of Renesas ARM based SoC fixes for v3.12.
> 
> This pull request is based on renesas-fixes4-for-v3.12 which you have
> already pulled.
> 
> 
> The following changes since commit 3786f86b60833f32e3eeb016fcf8c324f8147e00:
> 
>   ARM: shmobile: Remove #gpio-ranges-cells DT property (2013-09-22 21:28:18 +0900)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes5-for-v3.12

This doesn't look like a functional regression to me so I've pulled this
into next/cleanup for 3.13. Let me know if I've misunderstood and if it
causes issues on 3.12.


-Olof

[GIT PULL] Fifth Round of Renesas ARM based SoC fixes for v3.12

[Olof Johansson]

On Fri, Oct 04, 2013 at 05:19:40PM +0900, Simon Horman wrote:
> Hi Kevin, Olof and Arnd,
> 
> please consider this fifth Round of Renesas ARM based SoC fixes for v3.12.
> 
> This pull request is based on renesas-fixes4-for-v3.12 which you have
> already pulled.
> 
> 
> The following changes since commit 3786f86b60833f32e3eeb016fcf8c324f8147e00:
> 
>   ARM: shmobile: Remove #gpio-ranges-cells DT property (2013-09-22 21:28:18 +0900)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes5-for-v3.12

This doesn't look like a functional regression to me so I've pulled this
into next/cleanup for 3.13. Let me know if I've misunderstood and if it
causes issues on 3.12.


-Olof

Re: [GIT PULL] Fifth Round of Renesas ARM based SoC fixes for v3.12

[Simon Horman]

On Mon, Oct 07, 2013 at 10:49:02AM -0700, Olof Johansson wrote:
> On Fri, Oct 04, 2013 at 05:19:40PM +0900, Simon Horman wrote:
> > Hi Kevin, Olof and Arnd,
> > 
> > please consider this fifth Round of Renesas ARM based SoC fixes for v3.12.
> > 
> > This pull request is based on renesas-fixes4-for-v3.12 which you have
> > already pulled.
> > 
> > 
> > The following changes since commit 3786f86b60833f32e3eeb016fcf8c324f8147e00:
> > 
> >   ARM: shmobile: Remove #gpio-ranges-cells DT property (2013-09-22 21:28:18 +0900)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes5-for-v3.12
> 
> This doesn't look like a functional regression to me so I've pulled this
> into next/cleanup for 3.13. Let me know if I've misunderstood and if it
> causes issues on 3.12.

Thanks, I think that should be fine.

[GIT PULL] Fifth Round of Renesas ARM based SoC fixes for v3.12

[Simon Horman]

On Mon, Oct 07, 2013 at 10:49:02AM -0700, Olof Johansson wrote:
> On Fri, Oct 04, 2013 at 05:19:40PM +0900, Simon Horman wrote:
> > Hi Kevin, Olof and Arnd,
> > 
> > please consider this fifth Round of Renesas ARM based SoC fixes for v3.12.
> > 
> > This pull request is based on renesas-fixes4-for-v3.12 which you have
> > already pulled.
> > 
> > 
> > The following changes since commit 3786f86b60833f32e3eeb016fcf8c324f8147e00:
> > 
> >   ARM: shmobile: Remove #gpio-ranges-cells DT property (2013-09-22 21:28:18 +0900)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes5-for-v3.12
> 
> This doesn't look like a functional regression to me so I've pulled this
> into next/cleanup for 3.13. Let me know if I've misunderstood and if it
> causes issues on 3.12.

Thanks, I think that should be fine.

[GIT PULL] Fifth Round of Renesas ARM Based SoC DT Updates for v3.15

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

Please consider this fifth round of Renesas ARM based SoC DT updates for v3.15.

This pull request is based on the previous round of
such requests, tagged as renesas-dt4-for-v3.15,
which I have already sent a pull-request for.

I am sending this pull request (long) after the release of v3.14-rc6
as it contains a single bug-fix.


The following changes since commit 2c60a7df72711fb8b4be1e6aa651ab166a8931bc:

  ARM: shmobile: Add SDHI devices for Koelsch DTS (2014-02-26 15:11:41 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt5-for-v3.15

for you to fetch changes up to b08eed0c4d7d70eae2f4f1ff518cc33643722a07:

  ARM: shmobile: lager: correct renesas,gpios to renesas,groups in sd[02] pfc (2014-04-08 09:38:51 +0900)

----------------------------------------------------------------
Fifth Round of Renesas ARM Based SoC DT Updates for v3.15

Correct renesas,groups in SDHI nodes of for r8a7790 (R-Car H2) based
Lager board.

----------------------------------------------------------------
Rob Taylor (1):
      ARM: shmobile: lager: correct renesas,gpios to renesas,groups in sd[02] pfc

 arch/arm/boot/dts/r8a7790-lager.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[GIT PULL] Fifth Round of Renesas ARM Based SoC DT Updates for v3.15

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

Please consider this fifth round of Renesas ARM based SoC DT updates for v3.15.

This pull request is based on the previous round of
such requests, tagged as renesas-dt4-for-v3.15,
which I have already sent a pull-request for.

I am sending this pull request (long) after the release of v3.14-rc6
as it contains a single bug-fix.


The following changes since commit 2c60a7df72711fb8b4be1e6aa651ab166a8931bc:

  ARM: shmobile: Add SDHI devices for Koelsch DTS (2014-02-26 15:11:41 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt5-for-v3.15

for you to fetch changes up to b08eed0c4d7d70eae2f4f1ff518cc33643722a07:

  ARM: shmobile: lager: correct renesas,gpios to renesas,groups in sd[02] pfc (2014-04-08 09:38:51 +0900)

----------------------------------------------------------------
Fifth Round of Renesas ARM Based SoC DT Updates for v3.15

Correct renesas,groups in SDHI nodes of for r8a7790 (R-Car H2) based
Lager board.

----------------------------------------------------------------
Rob Taylor (1):
      ARM: shmobile: lager: correct renesas,gpios to renesas,groups in sd[02] pfc

 arch/arm/boot/dts/r8a7790-lager.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[PATCH] ARM: shmobile: lager: correct renesas,gpios to renesas,groups in sd[02] pfc

[Simon Horman]

From: Rob Taylor <rob.taylor@codethink.co.uk>

Fix probable typo of renesas,groups in the lager dt. The kernel has no
renesas,gpios but this should match renesas,groups.

Signed-off-by: Rob Taylor <rob.taylor@codethink.co.uk>
[ben.dooks@codethink.co.uk: fixup description]
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7790-lager.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 6e99eb2..d01048a 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -141,12 +141,12 @@
 	};
 
 	sdhi0_pins: sd0 {
-		renesas,gpios = "sdhi0_data4", "sdhi0_ctrl";
+		renesas,groups = "sdhi0_data4", "sdhi0_ctrl";
 		renesas,function = "sdhi0";
 	};
 
 	sdhi2_pins: sd2 {
-		renesas,gpios = "sdhi2_data4", "sdhi2_ctrl";
+		renesas,groups = "sdhi2_data4", "sdhi2_ctrl";
 		renesas,function = "sdhi2";
 	};
 
-- 
1.8.5.2

[PATCH] ARM: shmobile: lager: correct renesas, gpios to renesas, groups in sd[02] pfc

[Simon Horman]

From: Rob Taylor <rob.taylor@codethink.co.uk>

Fix probable typo of renesas,groups in the lager dt. The kernel has no
renesas,gpios but this should match renesas,groups.

Signed-off-by: Rob Taylor <rob.taylor@codethink.co.uk>
[ben.dooks at codethink.co.uk: fixup description]
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7790-lager.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 6e99eb2..d01048a 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -141,12 +141,12 @@
 	};
 
 	sdhi0_pins: sd0 {
-		renesas,gpios = "sdhi0_data4", "sdhi0_ctrl";
+		renesas,groups = "sdhi0_data4", "sdhi0_ctrl";
 		renesas,function = "sdhi0";
 	};
 
 	sdhi2_pins: sd2 {
-		renesas,gpios = "sdhi2_data4", "sdhi2_ctrl";
+		renesas,groups = "sdhi2_data4", "sdhi2_ctrl";
 		renesas,function = "sdhi2";
 	};
 
-- 
1.8.5.2

[GIT PULL] Fifth Round of Renesas ARM Based SoC DT Updates for v3.18

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these fifth round of Renesas ARM based SoC DT updates for v3.18.

This pull request is based on the previous round of
such requests, tagged as renesas-dt4-for-v3.18,
which I have already sent a pull-request for.


The following changes since commit a742795be9ceae2853ca71f216193f29da151da8:

  ARM: shmobile: Initial Alt board device tree (2014-09-09 11:29:27 +0900)

are available in the git repository at:

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

for you to fetch changes up to 08adafd4a1f8c9b6e2c49d955a0e45743c9ffd9a:

  ARM: shmobile: Add manufacturer for KZM boards (2014-09-17 09:23:14 +0900)

----------------------------------------------------------------
Fifth Round of Renesas ARM Based SoC DT Updates for v3.18

* Document manufacturer for KZM boards
* Use SoC-specific irqc compatible property

----------------------------------------------------------------
Geert Uytterhoeven (2):
      ARM: shmobile: r8a73a4 dtsi: Add SoC-specific irqc compatible property
      ARM: shmobile: Add manufacturer for KZM boards

 Documentation/devicetree/bindings/arm/shmobile.txt | 6 +++---
 arch/arm/boot/dts/r8a73a4.dtsi                     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

[GIT PULL] Fifth Round of Renesas ARM Based SoC DT Updates for v3.18

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these fifth round of Renesas ARM based SoC DT updates for v3.18.

This pull request is based on the previous round of
such requests, tagged as renesas-dt4-for-v3.18,
which I have already sent a pull-request for.


The following changes since commit a742795be9ceae2853ca71f216193f29da151da8:

  ARM: shmobile: Initial Alt board device tree (2014-09-09 11:29:27 +0900)

are available in the git repository at:

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

for you to fetch changes up to 08adafd4a1f8c9b6e2c49d955a0e45743c9ffd9a:

  ARM: shmobile: Add manufacturer for KZM boards (2014-09-17 09:23:14 +0900)

----------------------------------------------------------------
Fifth Round of Renesas ARM Based SoC DT Updates for v3.18

* Document manufacturer for KZM boards
* Use SoC-specific irqc compatible property

----------------------------------------------------------------
Geert Uytterhoeven (2):
      ARM: shmobile: r8a73a4 dtsi: Add SoC-specific irqc compatible property
      ARM: shmobile: Add manufacturer for KZM boards

 Documentation/devicetree/bindings/arm/shmobile.txt | 6 +++---
 arch/arm/boot/dts/r8a73a4.dtsi                     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

[PATCH 1/2] ARM: shmobile: r8a73a4 dtsi: Add SoC-specific irqc compatible property

[Simon Horman]

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

The interrupt controller used the generic compatible property only.
Add the SoC-specific one, to make it future proof.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a73a4.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
index fba39a2..ef152e3 100644
--- a/arch/arm/boot/dts/r8a73a4.dtsi
+++ b/arch/arm/boot/dts/r8a73a4.dtsi
@@ -51,7 +51,7 @@
 	};
 
 	irqc0: interrupt-controller@e61c0000 {
-		compatible = "renesas,irqc";
+		compatible = "renesas,irqc-r8a73a4", "renesas,irqc";
 		#interrupt-cells = <2>;
 		interrupt-controller;
 		reg = <0 0xe61c0000 0 0x200>;
@@ -90,7 +90,7 @@
 	};
 
 	irqc1: interrupt-controller@e61c0200 {
-		compatible = "renesas,irqc";
+		compatible = "renesas,irqc-r8a73a4", "renesas,irqc";
 		#interrupt-cells = <2>;
 		interrupt-controller;
 		reg = <0 0xe61c0200 0 0x200>;
-- 
2.0.1

[PATCH 1/2] ARM: shmobile: r8a73a4 dtsi: Add SoC-specific irqc compatible property

[Simon Horman]

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

The interrupt controller used the generic compatible property only.
Add the SoC-specific one, to make it future proof.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a73a4.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
index fba39a2..ef152e3 100644
--- a/arch/arm/boot/dts/r8a73a4.dtsi
+++ b/arch/arm/boot/dts/r8a73a4.dtsi
@@ -51,7 +51,7 @@
 	};
 
 	irqc0: interrupt-controller at e61c0000 {
-		compatible = "renesas,irqc";
+		compatible = "renesas,irqc-r8a73a4", "renesas,irqc";
 		#interrupt-cells = <2>;
 		interrupt-controller;
 		reg = <0 0xe61c0000 0 0x200>;
@@ -90,7 +90,7 @@
 	};
 
 	irqc1: interrupt-controller at e61c0200 {
-		compatible = "renesas,irqc";
+		compatible = "renesas,irqc-r8a73a4", "renesas,irqc";
 		#interrupt-cells = <2>;
 		interrupt-controller;
 		reg = <0 0xe61c0200 0 0x200>;
-- 
2.0.1

[PATCH 2/2] ARM: shmobile: Add manufacturer for KZM boards

[Simon Horman]

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

KZM-A9-Dual and KZM-A9-GT are manufactured by Kyoto Microcomputer Co.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 Documentation/devicetree/bindings/arm/shmobile.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
index 5d1c5c0..51147cb 100644
--- a/Documentation/devicetree/bindings/arm/shmobile.txt
+++ b/Documentation/devicetree/bindings/arm/shmobile.txt
@@ -53,11 +53,11 @@ Boards:
     compatible = "renesas,henninger", "renesas,r8a7791"
   - Koelsch (RTP0RC7791SEB00010S)
     compatible = "renesas,koelsch", "renesas,r8a7791"
-  - KZM9D
+  - Kyoto Microcomputer Co. KZM-A9-Dual
     compatible = "renesas,kzm9d", "renesas,emev2"
-  - KZM-A9-GT
+  - Kyoto Microcomputer Co. KZM-A9-GT
     compatible = "renesas,kzm9g", "renesas,sh73a0"
-  - KZM-A9-GT - Reference Device Tree Implementation
+  - Kyoto Microcomputer Co. KZM-A9-GT - Reference Device Tree Implementation
     compatible = "renesas,kzm9g-reference", "renesas,sh73a0"
   - Lager (RTP0RC7790SEB00010S)
     compatible = "renesas,lager", "renesas,r8a7790"
-- 
2.0.1

[PATCH 2/2] ARM: shmobile: Add manufacturer for KZM boards

[Simon Horman]

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

KZM-A9-Dual and KZM-A9-GT are manufactured by Kyoto Microcomputer Co.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 Documentation/devicetree/bindings/arm/shmobile.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
index 5d1c5c0..51147cb 100644
--- a/Documentation/devicetree/bindings/arm/shmobile.txt
+++ b/Documentation/devicetree/bindings/arm/shmobile.txt
@@ -53,11 +53,11 @@ Boards:
     compatible = "renesas,henninger", "renesas,r8a7791"
   - Koelsch (RTP0RC7791SEB00010S)
     compatible = "renesas,koelsch", "renesas,r8a7791"
-  - KZM9D
+  - Kyoto Microcomputer Co. KZM-A9-Dual
     compatible = "renesas,kzm9d", "renesas,emev2"
-  - KZM-A9-GT
+  - Kyoto Microcomputer Co. KZM-A9-GT
     compatible = "renesas,kzm9g", "renesas,sh73a0"
-  - KZM-A9-GT - Reference Device Tree Implementation
+  - Kyoto Microcomputer Co. KZM-A9-GT - Reference Device Tree Implementation
     compatible = "renesas,kzm9g-reference", "renesas,sh73a0"
   - Lager (RTP0RC7790SEB00010S)
     compatible = "renesas,lager", "renesas,r8a7790"
-- 
2.0.1

[GIT PULL] Fifth Round of Renesas ARM Based SoC Soc Updates for v3.18

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these fifth round of Renesas ARM based SoC soc updates for v3.18.

This pull request is based on the previous round of
such requests, tagged as renesas-soc4-for-v3.18,
which I have already sent a pull-request for.


The following changes since commit 1370078db37de2aa5e906ae2b5dbbb6ba289adb4:

  ARM: shmobile: r8a7794: Remove unnecessary #ifdef CONFIG_USE_OF (2014-09-11 09:51:16 +0900)

are available in the git repository at:

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

for you to fetch changes up to 8237f9e5c38098aeb8570a77bacd0fe0ebc61dfa:

  ARM: shmobile: r8a7740 legacy: Fix copied bug in comment (2014-09-17 09:20:53 +0900)

----------------------------------------------------------------
Fifth Round of Renesas ARM Based SoC Soc Updates for v3.18

* r8a7740: Fix documentation error coppied from elsewhere
* r8a7794: Reserve memory for CMA in a manner consistent to
           other R-Car Gen2 SoCs

----------------------------------------------------------------
Geert Uytterhoeven (1):
      ARM: shmobile: r8a7740 legacy: Fix copied bug in comment

Magnus Damm (1):
      ARM: shmobile: r8a7794: Reserve memory as other R-Car Gen2 SoCs

 arch/arm/mach-shmobile/pm-r8a7740.c    | 2 +-
 arch/arm/mach-shmobile/setup-r8a7794.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

[GIT PULL] Fifth Round of Renesas ARM Based SoC Soc Updates for v3.18

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these fifth round of Renesas ARM based SoC soc updates for v3.18.

This pull request is based on the previous round of
such requests, tagged as renesas-soc4-for-v3.18,
which I have already sent a pull-request for.


The following changes since commit 1370078db37de2aa5e906ae2b5dbbb6ba289adb4:

  ARM: shmobile: r8a7794: Remove unnecessary #ifdef CONFIG_USE_OF (2014-09-11 09:51:16 +0900)

are available in the git repository at:

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

for you to fetch changes up to 8237f9e5c38098aeb8570a77bacd0fe0ebc61dfa:

  ARM: shmobile: r8a7740 legacy: Fix copied bug in comment (2014-09-17 09:20:53 +0900)

----------------------------------------------------------------
Fifth Round of Renesas ARM Based SoC Soc Updates for v3.18

* r8a7740: Fix documentation error coppied from elsewhere
* r8a7794: Reserve memory for CMA in a manner consistent to
           other R-Car Gen2 SoCs

----------------------------------------------------------------
Geert Uytterhoeven (1):
      ARM: shmobile: r8a7740 legacy: Fix copied bug in comment

Magnus Damm (1):
      ARM: shmobile: r8a7794: Reserve memory as other R-Car Gen2 SoCs

 arch/arm/mach-shmobile/pm-r8a7740.c    | 2 +-
 arch/arm/mach-shmobile/setup-r8a7794.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

[PATCH 1/2] ARM: shmobile: r8a7794: Reserve memory as other R-Car Gen2 SoCs

[Simon Horman]

From: Magnus Damm <damm+renesas@opensource.se>

Other R-Car Gen2 SoCs such as r8a7790 and r8a7791 reserve
the top 256 MiB of memory for use with CMA. Adjust the
board-less r8a7794 code to do the same.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/setup-r8a7794.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-shmobile/setup-r8a7794.c b/arch/arm/mach-shmobile/setup-r8a7794.c
index c10acd1..d2b0930 100644
--- a/arch/arm/mach-shmobile/setup-r8a7794.c
+++ b/arch/arm/mach-shmobile/setup-r8a7794.c
@@ -28,5 +28,6 @@ DT_MACHINE_START(R8A7794_DT, "Generic R8A7794 (Flattened Device Tree)")
 	.init_early	= shmobile_init_delay,
 	.init_late	= shmobile_init_late,
 	.init_time	= rcar_gen2_timer_init,
+	.reserve	= rcar_gen2_reserve,
 	.dt_compat	= r8a7794_boards_compat_dt,
 MACHINE_END
-- 
2.0.1

[PATCH 1/2] ARM: shmobile: r8a7794: Reserve memory as other R-Car Gen2 SoCs

[Simon Horman]

From: Magnus Damm <damm+renesas@opensource.se>

Other R-Car Gen2 SoCs such as r8a7790 and r8a7791 reserve
the top 256 MiB of memory for use with CMA. Adjust the
board-less r8a7794 code to do the same.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/setup-r8a7794.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-shmobile/setup-r8a7794.c b/arch/arm/mach-shmobile/setup-r8a7794.c
index c10acd1..d2b0930 100644
--- a/arch/arm/mach-shmobile/setup-r8a7794.c
+++ b/arch/arm/mach-shmobile/setup-r8a7794.c
@@ -28,5 +28,6 @@ DT_MACHINE_START(R8A7794_DT, "Generic R8A7794 (Flattened Device Tree)")
 	.init_early	= shmobile_init_delay,
 	.init_late	= shmobile_init_late,
 	.init_time	= rcar_gen2_timer_init,
+	.reserve	= rcar_gen2_reserve,
 	.dt_compat	= r8a7794_boards_compat_dt,
 MACHINE_END
-- 
2.0.1

[PATCH 2/2] ARM: shmobile: r8a7740 legacy: Fix copied bug in comment

[Simon Horman]

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

The corresponding bug in pm-sh7372.c was fixed in commit
70fe7b24672a988f ("ARM: shmobile: Do not access sh7372 A4S domain
internals directly").

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/pm-r8a7740.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/pm-r8a7740.c b/arch/arm/mach-shmobile/pm-r8a7740.c
index a0d44d5..94c8815 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -18,7 +18,7 @@ static int r8a7740_pd_a4s_suspend(void)
 {
 	/*
 	 * The A4S domain contains the CPU core and therefore it should
-	 * only be turned off if the CPU is in use.
+	 * only be turned off if the CPU is not in use.
 	 */
 	return -EBUSY;
 }
-- 
2.0.1

[PATCH 2/2] ARM: shmobile: r8a7740 legacy: Fix copied bug in comment

[Simon Horman]

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

The corresponding bug in pm-sh7372.c was fixed in commit
70fe7b24672a988f ("ARM: shmobile: Do not access sh7372 A4S domain
internals directly").

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/pm-r8a7740.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/pm-r8a7740.c b/arch/arm/mach-shmobile/pm-r8a7740.c
index a0d44d5..94c8815 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -18,7 +18,7 @@ static int r8a7740_pd_a4s_suspend(void)
 {
 	/*
 	 * The A4S domain contains the CPU core and therefore it should
-	 * only be turned off if the CPU is in use.
+	 * only be turned off if the CPU is not in use.
 	 */
 	return -EBUSY;
 }
-- 
2.0.1

Re: [GIT PULL] Fifth Round of Renesas ARM Based SoC DT Updates for v3.18

[Arnd Bergmann]

On Friday 19 September 2014, Simon Horman wrote:
> Fifth Round of Renesas ARM Based SoC DT Updates for v3.18
> 
> * Document manufacturer for KZM boards
> * Use SoC-specific irqc compatible property

Pulled into next/dt, thanks!

	Arnd

[GIT PULL] Fifth Round of Renesas ARM Based SoC DT Updates for v3.18

[Arnd Bergmann]

On Friday 19 September 2014, Simon Horman wrote:
> Fifth Round of Renesas ARM Based SoC DT Updates for v3.18
> 
> * Document manufacturer for KZM boards
> * Use SoC-specific irqc compatible property

Pulled into next/dt, thanks!

	Arnd

Re: [GIT PULL] Fifth Round of Renesas ARM Based SoC Soc Updates for v3.18

[Arnd Bergmann]

On Friday 19 September 2014, Simon Horman wrote:
> Fifth Round of Renesas ARM Based SoC Soc Updates for v3.18
> 
> * r8a7740: Fix documentation error coppied from elsewhere
> * r8a7794: Reserve memory for CMA in a manner consistent to
>            other R-Car Gen2 SoCs

Pulled into next/soc, thanks!

	Arnd

[GIT PULL] Fifth Round of Renesas ARM Based SoC Soc Updates for v3.18

[Arnd Bergmann]

On Friday 19 September 2014, Simon Horman wrote:
> Fifth Round of Renesas ARM Based SoC Soc Updates for v3.18
> 
> * r8a7740: Fix documentation error coppied from elsewhere
> * r8a7794: Reserve memory for CMA in a manner consistent to
>            other R-Car Gen2 SoCs

Pulled into next/soc, thanks!

	Arnd