Patchwork [12/22] ARM: dts: Remove '0x's from OMAP2420 H4 DTS file

login
register
mail settings
Submitter Lee Jones
Date July 22, 2013, 10:52 a.m.
Message ID <1374490361-25769-12-git-send-email-lee.jones@linaro.org>
Download mbox | patch
Permalink /patch/260625/
State New
Headers show

Comments

Lee Jones - July 22, 2013, 10:52 a.m.
Cc: Benoît Cousson <b-cousson@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: linux-omap@vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/omap2420-h4.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Lee Jones - Aug. 13, 2013, 3:44 p.m.
Tony, Benoit,

Poke

On Mon, 22 Jul 2013, Lee Jones wrote:

> Cc: Benoît Cousson <b-cousson@ti.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: linux-omap@vger.kernel.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>  arch/arm/boot/dts/omap2420-h4.dts | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/omap2420-h4.dts b/arch/arm/boot/dts/omap2420-h4.dts
> index 224c08f..34cdecb 100644
> --- a/arch/arm/boot/dts/omap2420-h4.dts
> +++ b/arch/arm/boot/dts/omap2420-h4.dts
> @@ -50,15 +50,15 @@
>  			label = "bootloader";
>  			reg = <0 0x20000>;
>  		};
> -		partition@0x20000 {
> +		partition@20000 {
>  			label = "params";
>  			reg = <0x20000 0x20000>;
>  		};
> -		partition@0x40000 {
> +		partition@40000 {
>  			label = "kernel";
>  			reg = <0x40000 0x200000>;
>  		};
> -		partition@0x240000 {
> +		partition@240000 {
>  			label = "file-system";
>  			reg = <0x240000 0x3dc0000>;
>  		};
Tony Lindgren - Aug. 14, 2013, 7:30 a.m.
* Lee Jones <lee.jones@linaro.org> [130813 08:51]:
> Tony, Benoit,
> 
> Poke

Looks like Benoit's new email address is bcousson@baylibre.com.
Probably best for Benoit to pick these to avoid merge conflicts.

Regards,

Tony
 
> On Mon, 22 Jul 2013, Lee Jones wrote:
> 
> > Cc: Benoît Cousson <b-cousson@ti.com>
> > Cc: Tony Lindgren <tony@atomide.com>
> > Cc: linux-omap@vger.kernel.org
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > ---
> >  arch/arm/boot/dts/omap2420-h4.dts | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/arch/arm/boot/dts/omap2420-h4.dts b/arch/arm/boot/dts/omap2420-h4.dts
> > index 224c08f..34cdecb 100644
> > --- a/arch/arm/boot/dts/omap2420-h4.dts
> > +++ b/arch/arm/boot/dts/omap2420-h4.dts
> > @@ -50,15 +50,15 @@
> >  			label = "bootloader";
> >  			reg = <0 0x20000>;
> >  		};
> > -		partition@0x20000 {
> > +		partition@20000 {
> >  			label = "params";
> >  			reg = <0x20000 0x20000>;
> >  		};
> > -		partition@0x40000 {
> > +		partition@40000 {
> >  			label = "kernel";
> >  			reg = <0x40000 0x200000>;
> >  		};
> > -		partition@0x240000 {
> > +		partition@240000 {
> >  			label = "file-system";
> >  			reg = <0x240000 0x3dc0000>;
> >  		};
> 
> -- 
> Lee Jones
> Linaro ST-Ericsson Landing Team Lead
> Linaro.org │ Open source software for ARM SoCs
> Follow Linaro: Facebook | Twitter | Blog
Benoit Cousson - Aug. 14, 2013, 7:43 a.m.
Hi Lee,

Thanks for that cleanup.

On 14/08/2013 09:30, Tony Lindgren wrote:
> * Lee Jones <lee.jones@linaro.org> [130813 08:51]:
>> Tony, Benoit,
>>
>> Poke
>
> Looks like Benoit's new email address is bcousson@baylibre.com.
> Probably best for Benoit to pick these to avoid merge conflicts.

I've just applied the 7 following patches. Let me know if I missed 
something.

6b9fa1b ARM: dts: Remove '0x's from OMAP5 DTS file
79390b8 ARM: dts: Remove '0x's from OMAP4 DTS file
dd60fef ARM: dts: Remove '0x's from OMAP3430 SDP DTS file
bfef1cb ARM: dts: Remove '0x's from OMAP3 DTS file
5f547ac ARM: dts: Remove '0x's from OMAP3 IGEP0030 DTS file
27939fc ARM: dts: Remove '0x's from OMAP3 IGEP0020 DTS file
62eb4d1 ARM: dts: Remove '0x's from OMAP2420 H4 DTS file

Regards,
Benoit

>
> Regards,
>
> Tony
>
>> On Mon, 22 Jul 2013, Lee Jones wrote:
>>
>>> Cc: Benoît Cousson <b-cousson@ti.com>
>>> Cc: Tony Lindgren <tony@atomide.com>
>>> Cc: linux-omap@vger.kernel.org
>>> Signed-off-by: Lee Jones <lee.jones@linaro.org>
>>> ---
>>>   arch/arm/boot/dts/omap2420-h4.dts | 6 +++---
>>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/arch/arm/boot/dts/omap2420-h4.dts b/arch/arm/boot/dts/omap2420-h4.dts
>>> index 224c08f..34cdecb 100644
>>> --- a/arch/arm/boot/dts/omap2420-h4.dts
>>> +++ b/arch/arm/boot/dts/omap2420-h4.dts
>>> @@ -50,15 +50,15 @@
>>>   			label = "bootloader";
>>>   			reg = <0 0x20000>;
>>>   		};
>>> -		partition@0x20000 {
>>> +		partition@20000 {
>>>   			label = "params";
>>>   			reg = <0x20000 0x20000>;
>>>   		};
>>> -		partition@0x40000 {
>>> +		partition@40000 {
>>>   			label = "kernel";
>>>   			reg = <0x40000 0x200000>;
>>>   		};
>>> -		partition@0x240000 {
>>> +		partition@240000 {
>>>   			label = "file-system";
>>>   			reg = <0x240000 0x3dc0000>;
>>>   		};
>>
>> --
>> Lee Jones
>> Linaro ST-Ericsson Landing Team Lead
>> Linaro.org │ Open source software for ARM SoCs
>> Follow Linaro: Facebook | Twitter | Blog
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
Lee Jones - Aug. 14, 2013, 8 a.m.
> >Looks like Benoit's new email address is bcousson@baylibre.com.
> >Probably best for Benoit to pick these to avoid merge conflicts.

Ah nice, thanks Tony.

> I've just applied the 7 following patches. Let me know if I missed
> something.
> 
> 6b9fa1b ARM: dts: Remove '0x's from OMAP5 DTS file
> 79390b8 ARM: dts: Remove '0x's from OMAP4 DTS file
> dd60fef ARM: dts: Remove '0x's from OMAP3430 SDP DTS file
> bfef1cb ARM: dts: Remove '0x's from OMAP3 DTS file
> 5f547ac ARM: dts: Remove '0x's from OMAP3 IGEP0030 DTS file
> 27939fc ARM: dts: Remove '0x's from OMAP3 IGEP0020 DTS file
> 62eb4d1 ARM: dts: Remove '0x's from OMAP2420 H4 DTS file

Nope, looks good. Thanks Benoit.

Patch

diff --git a/arch/arm/boot/dts/omap2420-h4.dts b/arch/arm/boot/dts/omap2420-h4.dts
index 224c08f..34cdecb 100644
--- a/arch/arm/boot/dts/omap2420-h4.dts
+++ b/arch/arm/boot/dts/omap2420-h4.dts
@@ -50,15 +50,15 @@ 
 			label = "bootloader";
 			reg = <0 0x20000>;
 		};
-		partition@0x20000 {
+		partition@20000 {
 			label = "params";
 			reg = <0x20000 0x20000>;
 		};
-		partition@0x40000 {
+		partition@40000 {
 			label = "kernel";
 			reg = <0x40000 0x200000>;
 		};
-		partition@0x240000 {
+		partition@240000 {
 			label = "file-system";
 			reg = <0x240000 0x3dc0000>;
 		};