[PATCH v2 0/5] ARM: shmobile: correct memory maps

[PATCH v2 0/5] ARM: shmobile: correct memory maps

[Simon Horman]

This short series builds on a previous posting
of a patch to correct the value of the second memory region
of the lager. It does that and also corrects the syntax
used for the lager and other shmobile boards.

Simon Horman (5):
  ARM: shmobile: lager: correct memory map value and syntax
  ARM: shmobile: henninger: correct memory map syntax
  ARM: shmobile: koelsch: correct memory map syntax
  ARM: shmobile: ape6evm-reference: correct memory map syntax
  ARM: shmobile: ape6evm: correct memory map syntax

 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 2 +-
 arch/arm/boot/dts/r8a73a4-ape6evm.dts           | 2 +-
 arch/arm/boot/dts/r8a7790-lager.dts             | 2 +-
 arch/arm/boot/dts/r8a7791-henninger.dts         | 2 +-
 arch/arm/boot/dts/r8a7791-koelsch.dts           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

-- 
2.0.1

[PATCH v2 1/5] ARM: shmobile: lager: correct memory map value and syntax

[Simon Horman]

The base address of the second memory region on the lager
board is 0x140000000. Update the tag used in the dts file accordingly.

Also correct a syntax error by using two comma-delimited 32 bit values
rather than a single 64 bit value.

This is a documentation fix and should have no run-time affect.

This problem was introduced when the second memory region
was added to the lager dts file by 62bc32a2573c4219
("ARM: shmobile: Include all 4 GiB of memory on Lager)" in v3.14.

Cc: Olof Johansson <olof@lixom.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Reported-by: NAOYA SHIIBA <naoya.shiiba.nx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

---
v2
* Correct syntax as well as value
---
 arch/arm/boot/dts/r8a7790-lager.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 0118cbf..9586c35 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -32,7 +32,7 @@
 		reg = <0 0x40000000 0 0x40000000>;
 	};
 
-	memory@180000000 {
+	memory@1,40000000 {
 		device_type = "memory";
 		reg = <1 0x40000000 0 0xc0000000>;
 	};
-- 
2.0.1

[PATCH v2 2/5] ARM: shmobile: henninger: correct memory map syntax

[Simon Horman]

Correct a syntax error by using two comma-delimited 32 bit values
rather than a single 64 bit value.

This is a documentation fix and should have no run-time affect.

This problem was introduced when the device tree was
added for henninger by 4b37ab033e6f8c975
("ARM: shmobile: henninger: initial device tree") in v3.15.

Cc: Olof Johansson <olof@lixom.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

---
v2
* First post
---
 arch/arm/boot/dts/r8a7791-henninger.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7791-henninger.dts b/arch/arm/boot/dts/r8a7791-henninger.dts
index f1b56de..b064724 100644
--- a/arch/arm/boot/dts/r8a7791-henninger.dts
+++ b/arch/arm/boot/dts/r8a7791-henninger.dts
@@ -30,7 +30,7 @@
 		reg = <0 0x40000000 0 0x40000000>;
 	};
 
-	memory@200000000 {
+	memory@2,00000000 {
 		device_type = "memory";
 		reg = <2 0x00000000 0 0x40000000>;
 	};
-- 
2.0.1

[PATCH v2 3/5] ARM: shmobile: koelsch: correct memory map syntax

[Simon Horman]

Correct a syntax error by using two comma-delimited 32 bit values
rather than a single 64 bit value.

This is a documentation fix and should have no run-time affect.

This problem was introduced when the second memory region
was added to the koelsch dts file by 4cd1bad45182c7f1
("ARM: shmobile: koelsch: (1+1)GiB memory in DT") in v3.14.

Cc: Olof Johansson <olof@lixom.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

---
v2
* First post
---
 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 51807a3..caf66dc 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -33,7 +33,7 @@
 		reg = <0 0x40000000 0 0x40000000>;
 	};
 
-	memory@200000000 {
+	memory@2,00000000 {
 		device_type = "memory";
 		reg = <2 0x00000000 0 0x40000000>;
 	};
-- 
2.0.1

[PATCH v2 4/5] ARM: shmobile: ape6evm-reference: correct memory map syntax

[Simon Horman]

Correct a syntax error by using two comma-delimited 32 bit values
rather than a single 64 bit value.

This is a documentation fix and should have no run-time affect.

This problem was introduced when the second memory region
was added to the ape6evm-reference dts file by 9701f442139bd21c
("ARM: shmobile: Include all 2 GiB of memory on APE6EVM DT Ref") in v3.13.

Cc: Olof Johansson <olof@lixom.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

---
v2
* First post
---
 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
index a860f32..9f1795f 100644
--- a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
+++ b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
@@ -29,7 +29,7 @@
 		reg = <0 0x40000000 0 0x40000000>;
 	};
 
-	memory@200000000 {
+	memory@2,00000000 {
 		device_type = "memory";
 		reg = <2 0x00000000 0 0x40000000>;
 	};
-- 
2.0.1

[PATCH v2 5/5] ARM: shmobile: ape6evm: correct memory map syntax

[Simon Horman]

Correct a syntax error by using two comma-delimited 32 bit values
rather than a single 64 bit value.

This is a documentation fix and should have no run-time affect.

This problem was introduced when the second memory region
was added to the ape6evm dts file by by 8353f09f579631d09
("ARM: shmobile: Include all 2 GiB of memory on APE6EVM") in v3.13.

Cc: Olof Johansson <olof@lixom.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

---
v2
* First post
---
 arch/arm/boot/dts/r8a73a4-ape6evm.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm.dts b/arch/arm/boot/dts/r8a73a4-ape6evm.dts
index ce085fa..6d3e8fd 100644
--- a/arch/arm/boot/dts/r8a73a4-ape6evm.dts
+++ b/arch/arm/boot/dts/r8a73a4-ape6evm.dts
@@ -25,7 +25,7 @@
 		reg = <0 0x40000000 0 0x40000000>;
 	};
 
-	memory@200000000 {
+	memory@2,00000000 {
 		device_type = "memory";
 		reg = <2 0x00000000 0 0x40000000>;
 	};
-- 
2.0.1

Re: [PATCH v2 0/5] ARM: shmobile: correct memory maps

[Magnus Damm]

Hi Simon,

On Wed, Aug 27, 2014 at 9:35 AM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> This short series builds on a previous posting
> of a patch to correct the value of the second memory region
> of the lager. It does that and also corrects the syntax
> used for the lager and other shmobile boards.
>
> Simon Horman (5):
>   ARM: shmobile: lager: correct memory map value and syntax
>   ARM: shmobile: henninger: correct memory map syntax
>   ARM: shmobile: koelsch: correct memory map syntax
>   ARM: shmobile: ape6evm-reference: correct memory map syntax
>   ARM: shmobile: ape6evm: correct memory map syntax

Thanks for improving the current state. The patches look fine to me.

Acked-by: Magnus Damm <damm+renesas@opensource.se>

Cheers,

/ magnus

Re: [PATCH v2 0/5] ARM: shmobile: correct memory maps

[Olof Johansson]

On Tue, Aug 26, 2014 at 6:45 PM, Magnus Damm <magnus.damm@gmail.com> wrote:
> Hi Simon,
>
> On Wed, Aug 27, 2014 at 9:35 AM, Simon Horman
> <horms+renesas@verge.net.au> wrote:
>> This short series builds on a previous posting
>> of a patch to correct the value of the second memory region
>> of the lager. It does that and also corrects the syntax
>> used for the lager and other shmobile boards.
>>
>> Simon Horman (5):
>>   ARM: shmobile: lager: correct memory map value and syntax
>>   ARM: shmobile: henninger: correct memory map syntax
>>   ARM: shmobile: koelsch: correct memory map syntax
>>   ARM: shmobile: ape6evm-reference: correct memory map syntax
>>   ARM: shmobile: ape6evm: correct memory map syntax
>
> Thanks for improving the current state. The patches look fine to me.
>
> Acked-by: Magnus Damm <damm+renesas@opensource.se>

Yep, agreed.

Acked-by: Olof Johansson <olof@lixom.net>


-Olof

Re: [PATCH v2 0/5] ARM: shmobile: correct memory maps

[Simon Horman]

On Tue, Aug 26, 2014 at 07:27:53PM -0700, Olof Johansson wrote:
> On Tue, Aug 26, 2014 at 6:45 PM, Magnus Damm <magnus.damm@gmail.com> wrote:
> > Hi Simon,
> >
> > On Wed, Aug 27, 2014 at 9:35 AM, Simon Horman
> > <horms+renesas@verge.net.au> wrote:
> >> This short series builds on a previous posting
> >> of a patch to correct the value of the second memory region
> >> of the lager. It does that and also corrects the syntax
> >> used for the lager and other shmobile boards.
> >>
> >> Simon Horman (5):
> >>   ARM: shmobile: lager: correct memory map value and syntax
> >>   ARM: shmobile: henninger: correct memory map syntax
> >>   ARM: shmobile: koelsch: correct memory map syntax
> >>   ARM: shmobile: ape6evm-reference: correct memory map syntax
> >>   ARM: shmobile: ape6evm: correct memory map syntax
> >
> > Thanks for improving the current state. The patches look fine to me.
> >
> > Acked-by: Magnus Damm <damm+renesas@opensource.se>
> 
> Yep, agreed.
> 
> Acked-by: Olof Johansson <olof@lixom.net>

Thanks, I have queued these up as fixes for v3.17.
I'll send you a pull-request in the not to distant future.

Re: [PATCH v2 0/5] ARM: shmobile: correct memory maps

[Olof Johansson]

On Tue, Aug 26, 2014 at 9:03 PM, Simon Horman <horms@verge.net.au> wrote:
> On Tue, Aug 26, 2014 at 07:27:53PM -0700, Olof Johansson wrote:
>> On Tue, Aug 26, 2014 at 6:45 PM, Magnus Damm <magnus.damm@gmail.com> wrote:
>> > Hi Simon,
>> >
>> > On Wed, Aug 27, 2014 at 9:35 AM, Simon Horman
>> > <horms+renesas@verge.net.au> wrote:
>> >> This short series builds on a previous posting
>> >> of a patch to correct the value of the second memory region
>> >> of the lager. It does that and also corrects the syntax
>> >> used for the lager and other shmobile boards.
>> >>
>> >> Simon Horman (5):
>> >>   ARM: shmobile: lager: correct memory map value and syntax
>> >>   ARM: shmobile: henninger: correct memory map syntax
>> >>   ARM: shmobile: koelsch: correct memory map syntax
>> >>   ARM: shmobile: ape6evm-reference: correct memory map syntax
>> >>   ARM: shmobile: ape6evm: correct memory map syntax
>> >
>> > Thanks for improving the current state. The patches look fine to me.
>> >
>> > Acked-by: Magnus Damm <damm+renesas@opensource.se>
>>
>> Yep, agreed.
>>
>> Acked-by: Olof Johansson <olof@lixom.net>
>
> Thanks, I have queued these up as fixes for v3.17.
> I'll send you a pull-request in the not to distant future.

This is 3.18 cleanup material as far as I am concerned, so please send
it as such. :)


-Olof

Re: [PATCH v2 0/5] ARM: shmobile: correct memory maps

[Simon Horman]

On Tue, Aug 26, 2014 at 09:13:56PM -0700, Olof Johansson wrote:
> On Tue, Aug 26, 2014 at 9:03 PM, Simon Horman <horms@verge.net.au> wrote:
> > On Tue, Aug 26, 2014 at 07:27:53PM -0700, Olof Johansson wrote:
> >> On Tue, Aug 26, 2014 at 6:45 PM, Magnus Damm <magnus.damm@gmail.com> wrote:
> >> > Hi Simon,
> >> >
> >> > On Wed, Aug 27, 2014 at 9:35 AM, Simon Horman
> >> > <horms+renesas@verge.net.au> wrote:
> >> >> This short series builds on a previous posting
> >> >> of a patch to correct the value of the second memory region
> >> >> of the lager. It does that and also corrects the syntax
> >> >> used for the lager and other shmobile boards.
> >> >>
> >> >> Simon Horman (5):
> >> >>   ARM: shmobile: lager: correct memory map value and syntax
> >> >>   ARM: shmobile: henninger: correct memory map syntax
> >> >>   ARM: shmobile: koelsch: correct memory map syntax
> >> >>   ARM: shmobile: ape6evm-reference: correct memory map syntax
> >> >>   ARM: shmobile: ape6evm: correct memory map syntax
> >> >
> >> > Thanks for improving the current state. The patches look fine to me.
> >> >
> >> > Acked-by: Magnus Damm <damm+renesas@opensource.se>
> >>
> >> Yep, agreed.
> >>
> >> Acked-by: Olof Johansson <olof@lixom.net>
> >
> > Thanks, I have queued these up as fixes for v3.17.
> > I'll send you a pull-request in the not to distant future.
> 
> This is 3.18 cleanup material as far as I am concerned, so please send
> it as such. :)

Sure, will do.