Re: [PATCH 3/3] ARM: dts: OMAP3: Use MTD constants for OMAP3 boards
On Tue, 11 Jun 2013 17:29:43 +0200, Javier Martinez Canillas
wrote:
> On 06/11/2013 04:48 PM, Florian Vaussard wrote:
> > Use the MTD constants for NAND and OneNAND nodes used in OMAP3
> > DTS.
> >
> > Signed-off-by: Florian Vaussard
> > ---
> > arch/arm/boot/dts/omap3-devkit8000.dts | 10 +-
> > arch/arm/boot/dts/omap3-igep0020.dts | 10 +-
> > arch/arm/boot/dts/omap3-igep0030.dts | 10 +-
> > arch/arm/boot/dts/omap3430-sdp.dts | 28 ++--
> > 4 files changed, 29 insertions(+), 29 deletions(-)
> >
> > diff --git a/arch/arm/boot/dts/omap3-devkit8000.dts
> > b/arch/arm/boot/dts/omap3-devkit8000.dts
> > index 5be71b1..08699cb 100644
> > --- a/arch/arm/boot/dts/omap3-devkit8000.dts
> > +++ b/arch/arm/boot/dts/omap3-devkit8000.dts
> > @@ -143,27 +143,27 @@
> >
> > x-loader@0 {
> > label = "X-Loader";
> > - reg = <0 0x8>;
> > + reg = <(0 * SZ_128K) (4 * SZ_128K)>;
> > };
> >
> > bootloaders@8 {
> > label = "U-Boot";
> > - reg = <0x8 0x1e>;
> > + reg = <(4 * SZ_128K) (15 * SZ_128K)>;
> > };
> >
> > bootloaders_env@26 {
> > label = "U-Boot Env";
> > - reg = <0x26 0x2>;
> > + reg = <(19 * SZ_128K) (1 * SZ_128K)>;
> > };
> >
> > kernel@28 {
> > label = "Kernel";
> > - reg = <0x28 0x40>;
> > + reg = <(20 * SZ_128K) (32 * SZ_128K)>;
> > };
> >
> > filesystem@68 {
> > label = "File System";
> > - reg = <0x68 0xf98>;
> > + reg = <(52 * SZ_128K) MTDPART_SIZ_FULL>;
> > };
> > };
> > };
> > diff --git a/arch/arm/boot/dts/omap3-igep0020.dts
> > b/arch/arm/boot/dts/omap3-igep0020.dts
> > index e8c4828..3476b3c 100644
> > --- a/arch/arm/boot/dts/omap3-igep0020.dts
> > +++ b/arch/arm/boot/dts/omap3-igep0020.dts
> > @@ -97,23 +97,23 @@
> >
> > partition@0 {
> > label = "SPL";
> > - reg = <0 0x10>;
> > + reg = <(0 * SZ_256K) (4 * SZ_256K)>;
> > };
> > partition@0x8 {
> > label = "U-Boot";
> > - reg = <0x10 0x18>;
> > + reg = <(4 * SZ_256K) (6 * SZ_256K)>;
> > };
> > partition@0x1c {
> > label = "Environment";
> > - reg = <0x28 0x10>;
> > + reg = <(10 * SZ_256K) (4 * SZ_256K)>;
> > };
> > partition@0x28 {
> > label = "Kernel";
> > - reg = <0x38 0x30>;
> > + reg = <(14 * SZ_256K) (12 * SZ_256K)>;
> > };
> > partition@0x78 {
> > label = "Filesystem";
> > - reg = <0x68 0x1f98>;
> > + reg = <(26 * SZ_256K) MTDPART_SIZ_FULL>;
> > };
> > };
> >
> > diff --git a/arch/arm/boot/dts/omap3-igep0030.dts
> > b/arch/arm/boot/dts/omap3-igep0030.dts
> > index 644d053..e4f078c 100644
> > --- a/arch/arm/boot/dts/omap3-igep0030.dts
> > +++ b/arch/arm/boot/dts/omap3-igep0030.dts
> > @@ -72,23 +72,23 @@
> >
> > partition@0 {
> > label = "SPL";
> > - reg = <0 0x10>;
> > + reg = <(0 * SZ_256K) (4 * SZ_256K)>;
> > };
> > partition@0x8 {
> > label = "U-Boot";
> > - reg = <0x10 0x18>;
> > + reg = <(4 * SZ_256K) (6 * SZ_256K)>;
> > };
> > partition@0x1c {
> > label = "Environment";
> > - reg = <0x28 0x10>;
> > + reg = <(10 * SZ_256K) (4 * SZ_256K)>;
> > };
> > partition@0x28 {
> > label = "Kernel";
> > - reg = <0x38 0x30>;
> > + reg = <(14 * SZ_256K) (12 * SZ_256K)>;
> > };
> > partition@0x78 {
> > label = "Filesystem";
> > - reg = <0x68 0x1f98>;
> > + reg = <(26 * SZ_256K) MTDPART_SIZ_FULL>;
> > };
> > };
> > };
>
> Hi Florian,
>
> I don't have access to my IGEP board so I can test it right now but the patch
> looks good to me.
>
> In fact I wanted to use MTDPART_SIZ_FULL when added the NAND nodes since not
> all
> IGEP boards have 512MB flash but I didn't know that a value of 0 meant that.
>
> So thanks a lot for doing this!
>
> Acked-by: Javier Martinez Canillas
However, the binding doesn't allow for that and so it
Re: [PATCH 3/3] ARM: dts: OMAP3: Use MTD constants for OMAP3 boards
Hello, On 06/11/2013 06:27 PM, Stephen Warren wrote: On 06/11/2013 08:48 AM, Florian Vaussard wrote: Use the MTD constants for NAND and OneNAND nodes used in OMAP3 DTS. I don't quite understand the split between patches 2/3 and 3/3; isn't the edit to omap3-overo.dtsi (part of) a board file, and hence logically part of this patch? I'd be tempted just to squash the two together. But, this is a nit; not a big deal. Patch 2/3 was adding a new node, whereas patch 3/3 was converting existing nodes. But your point is perfectly valid. Regards, Florian -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/3] ARM: dts: OMAP3: Use MTD constants for OMAP3 boards
Hello Javier,
On 06/11/2013 05:29 PM, Javier Martinez Canillas wrote:
On 06/11/2013 04:48 PM, Florian Vaussard wrote:
Use the MTD constants for NAND and OneNAND nodes used in OMAP3
DTS.
Signed-off-by: Florian Vaussard
---
arch/arm/boot/dts/omap3-devkit8000.dts | 10 +-
arch/arm/boot/dts/omap3-igep0020.dts | 10 +-
arch/arm/boot/dts/omap3-igep0030.dts | 10 +-
arch/arm/boot/dts/omap3430-sdp.dts | 28 ++--
4 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/arch/arm/boot/dts/omap3-devkit8000.dts
b/arch/arm/boot/dts/omap3-devkit8000.dts
index 5be71b1..08699cb 100644
--- a/arch/arm/boot/dts/omap3-devkit8000.dts
+++ b/arch/arm/boot/dts/omap3-devkit8000.dts
@@ -143,27 +143,27 @@
x-loader@0 {
label = "X-Loader";
- reg = <0 0x8>;
+ reg = <(0 * SZ_128K) (4 * SZ_128K)>;
};
bootloaders@8 {
label = "U-Boot";
- reg = <0x8 0x1e>;
+ reg = <(4 * SZ_128K) (15 * SZ_128K)>;
};
bootloaders_env@26 {
label = "U-Boot Env";
- reg = <0x26 0x2>;
+ reg = <(19 * SZ_128K) (1 * SZ_128K)>;
};
kernel@28 {
label = "Kernel";
- reg = <0x28 0x40>;
+ reg = <(20 * SZ_128K) (32 * SZ_128K)>;
};
filesystem@68 {
label = "File System";
- reg = <0x68 0xf98>;
+ reg = <(52 * SZ_128K) MTDPART_SIZ_FULL>;
};
};
};
diff --git a/arch/arm/boot/dts/omap3-igep0020.dts
b/arch/arm/boot/dts/omap3-igep0020.dts
index e8c4828..3476b3c 100644
--- a/arch/arm/boot/dts/omap3-igep0020.dts
+++ b/arch/arm/boot/dts/omap3-igep0020.dts
@@ -97,23 +97,23 @@
partition@0 {
label = "SPL";
- reg = <0 0x10>;
+ reg = <(0 * SZ_256K) (4 * SZ_256K)>;
};
partition@0x8 {
label = "U-Boot";
- reg = <0x10 0x18>;
+ reg = <(4 * SZ_256K) (6 * SZ_256K)>;
};
partition@0x1c {
label = "Environment";
- reg = <0x28 0x10>;
+ reg = <(10 * SZ_256K) (4 * SZ_256K)>;
};
partition@0x28 {
label = "Kernel";
- reg = <0x38 0x30>;
+ reg = <(14 * SZ_256K) (12 * SZ_256K)>;
};
partition@0x78 {
label = "Filesystem";
- reg = <0x68 0x1f98>;
+ reg = <(26 * SZ_256K) MTDPART_SIZ_FULL>;
};
};
diff --git a/arch/arm/boot/dts/omap3-igep0030.dts
b/arch/arm/boot/dts/omap3-igep0030.dts
index 644d053..e4f078c 100644
--- a/arch/arm/boot/dts/omap3-igep0030.dts
+++ b/arch/arm/boot/dts/omap3-igep0030.dts
@@ -72,23 +72,23 @@
partition@0 {
label = "SPL";
- reg = <0 0x10>;
+ reg = <(0 * SZ_256K) (4 * SZ_256K)>;
};
partition@0x8 {
label = "U-Boot";
- reg = <0x10 0x18>;
+ reg = <(4 * SZ_256K) (6 * SZ_256K)>;
};
partition@0x1c {
label = "Environment";
- reg = <0x28 0x10>;
+ reg = <(10 * SZ_256K) (4 * SZ_256K)>;
};
partition@0x28 {
label = "Kernel";
- reg = <0x38 0x30>;
+ reg = <(14 * SZ_256K) (12 * SZ_256K)>;
};
partition@0x78 {
label = "Filesystem";
- reg = <0x68 0x1f98>;
+ reg = <(26 * SZ_256K) MTDPART_SIZ_FULL>;
};
};
};
Hi Florian,
I don't have access to my IGEP board so I can test it right now but the patch
looks good to me.
In fact I wanted to use MTDPART_SIZ_FULL when added the NAND nodes since not all
IGEP boards have 512MB flash but I didn't know that a value of 0 meant that.
I had the same problem, and found that 0 was correctly parsed and later
expanded to
the correct value when probing the NAND.
So thanks a lot for doing this!
Acked-by: Javier Martinez Canillas
Thank you.
Florian
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the b
Re: [PATCH 3/3] ARM: dts: OMAP3: Use MTD constants for OMAP3 boards
On 06/11/2013 08:48 AM, Florian Vaussard wrote: > Use the MTD constants for NAND and OneNAND nodes used in OMAP3 > DTS. I don't quite understand the split between patches 2/3 and 3/3; isn't the edit to omap3-overo.dtsi (part of) a board file, and hence logically part of this patch? I'd be tempted just to squash the two together. But, this is a nit; not a big deal. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/3] ARM: dts: OMAP3: Use MTD constants for OMAP3 boards
On 06/11/2013 04:48 PM, Florian Vaussard wrote:
> Use the MTD constants for NAND and OneNAND nodes used in OMAP3
> DTS.
>
> Signed-off-by: Florian Vaussard
> ---
> arch/arm/boot/dts/omap3-devkit8000.dts | 10 +-
> arch/arm/boot/dts/omap3-igep0020.dts | 10 +-
> arch/arm/boot/dts/omap3-igep0030.dts | 10 +-
> arch/arm/boot/dts/omap3430-sdp.dts | 28 ++--
> 4 files changed, 29 insertions(+), 29 deletions(-)
>
> diff --git a/arch/arm/boot/dts/omap3-devkit8000.dts
> b/arch/arm/boot/dts/omap3-devkit8000.dts
> index 5be71b1..08699cb 100644
> --- a/arch/arm/boot/dts/omap3-devkit8000.dts
> +++ b/arch/arm/boot/dts/omap3-devkit8000.dts
> @@ -143,27 +143,27 @@
>
> x-loader@0 {
> label = "X-Loader";
> - reg = <0 0x8>;
> + reg = <(0 * SZ_128K) (4 * SZ_128K)>;
> };
>
> bootloaders@8 {
> label = "U-Boot";
> - reg = <0x8 0x1e>;
> + reg = <(4 * SZ_128K) (15 * SZ_128K)>;
> };
>
> bootloaders_env@26 {
> label = "U-Boot Env";
> - reg = <0x26 0x2>;
> + reg = <(19 * SZ_128K) (1 * SZ_128K)>;
> };
>
> kernel@28 {
> label = "Kernel";
> - reg = <0x28 0x40>;
> + reg = <(20 * SZ_128K) (32 * SZ_128K)>;
> };
>
> filesystem@68 {
> label = "File System";
> - reg = <0x68 0xf98>;
> + reg = <(52 * SZ_128K) MTDPART_SIZ_FULL>;
> };
> };
> };
> diff --git a/arch/arm/boot/dts/omap3-igep0020.dts
> b/arch/arm/boot/dts/omap3-igep0020.dts
> index e8c4828..3476b3c 100644
> --- a/arch/arm/boot/dts/omap3-igep0020.dts
> +++ b/arch/arm/boot/dts/omap3-igep0020.dts
> @@ -97,23 +97,23 @@
>
> partition@0 {
> label = "SPL";
> - reg = <0 0x10>;
> + reg = <(0 * SZ_256K) (4 * SZ_256K)>;
> };
> partition@0x8 {
> label = "U-Boot";
> - reg = <0x10 0x18>;
> + reg = <(4 * SZ_256K) (6 * SZ_256K)>;
> };
> partition@0x1c {
> label = "Environment";
> - reg = <0x28 0x10>;
> + reg = <(10 * SZ_256K) (4 * SZ_256K)>;
> };
> partition@0x28 {
> label = "Kernel";
> - reg = <0x38 0x30>;
> + reg = <(14 * SZ_256K) (12 * SZ_256K)>;
> };
> partition@0x78 {
> label = "Filesystem";
> - reg = <0x68 0x1f98>;
> + reg = <(26 * SZ_256K) MTDPART_SIZ_FULL>;
> };
> };
>
> diff --git a/arch/arm/boot/dts/omap3-igep0030.dts
> b/arch/arm/boot/dts/omap3-igep0030.dts
> index 644d053..e4f078c 100644
> --- a/arch/arm/boot/dts/omap3-igep0030.dts
> +++ b/arch/arm/boot/dts/omap3-igep0030.dts
> @@ -72,23 +72,23 @@
>
> partition@0 {
> label = "SPL";
> - reg = <0 0x10>;
> + reg = <(0 * SZ_256K) (4 * SZ_256K)>;
> };
> partition@0x8 {
> label = "U-Boot";
> - reg = <0x10 0x18>;
> + reg = <(4 * SZ_256K) (6 * SZ_256K)>;
> };
> partition@0x1c {
> label = "Environment";
> - reg = <0x28 0x10>;
> + reg = <(10 * SZ_256K) (4 * SZ_256K)>;
> };
> partition@0x28 {
> label = "Kernel";
> - reg = <0x38 0x30>;
> + reg = <(14 * SZ_256K) (12 * SZ_256K)>;
> };
> partition@0x78 {
> label = "Filesystem";
> - reg = <0x68 0x1f98>;
> + reg = <(26 * SZ_256K) MTDPART_SIZ_FULL>;
> };
> };
> };
Hi Florian,
I don't have access to my IGEP board so I can test it right now but the patch
looks good to me.
In fact I wanted to use MTDPART_SIZ_FULL when added the NAND nodes since not all
IGEP boards have 512MB flash but I didn't know that a value of 0 meant that.
So thanks a lot for doing this!
Acked-by: Javier Martinez Canillas
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/3] ARM: dts: OMAP3: Use MTD constants for OMAP3 boards
Use the MTD constants for NAND and OneNAND nodes used in OMAP3
DTS.
Signed-off-by: Florian Vaussard
---
arch/arm/boot/dts/omap3-devkit8000.dts | 10 +-
arch/arm/boot/dts/omap3-igep0020.dts | 10 +-
arch/arm/boot/dts/omap3-igep0030.dts | 10 +-
arch/arm/boot/dts/omap3430-sdp.dts | 28 ++--
4 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/arch/arm/boot/dts/omap3-devkit8000.dts
b/arch/arm/boot/dts/omap3-devkit8000.dts
index 5be71b1..08699cb 100644
--- a/arch/arm/boot/dts/omap3-devkit8000.dts
+++ b/arch/arm/boot/dts/omap3-devkit8000.dts
@@ -143,27 +143,27 @@
x-loader@0 {
label = "X-Loader";
- reg = <0 0x8>;
+ reg = <(0 * SZ_128K) (4 * SZ_128K)>;
};
bootloaders@8 {
label = "U-Boot";
- reg = <0x8 0x1e>;
+ reg = <(4 * SZ_128K) (15 * SZ_128K)>;
};
bootloaders_env@26 {
label = "U-Boot Env";
- reg = <0x26 0x2>;
+ reg = <(19 * SZ_128K) (1 * SZ_128K)>;
};
kernel@28 {
label = "Kernel";
- reg = <0x28 0x40>;
+ reg = <(20 * SZ_128K) (32 * SZ_128K)>;
};
filesystem@68 {
label = "File System";
- reg = <0x68 0xf98>;
+ reg = <(52 * SZ_128K) MTDPART_SIZ_FULL>;
};
};
};
diff --git a/arch/arm/boot/dts/omap3-igep0020.dts
b/arch/arm/boot/dts/omap3-igep0020.dts
index e8c4828..3476b3c 100644
--- a/arch/arm/boot/dts/omap3-igep0020.dts
+++ b/arch/arm/boot/dts/omap3-igep0020.dts
@@ -97,23 +97,23 @@
partition@0 {
label = "SPL";
- reg = <0 0x10>;
+ reg = <(0 * SZ_256K) (4 * SZ_256K)>;
};
partition@0x8 {
label = "U-Boot";
- reg = <0x10 0x18>;
+ reg = <(4 * SZ_256K) (6 * SZ_256K)>;
};
partition@0x1c {
label = "Environment";
- reg = <0x28 0x10>;
+ reg = <(10 * SZ_256K) (4 * SZ_256K)>;
};
partition@0x28 {
label = "Kernel";
- reg = <0x38 0x30>;
+ reg = <(14 * SZ_256K) (12 * SZ_256K)>;
};
partition@0x78 {
label = "Filesystem";
- reg = <0x68 0x1f98>;
+ reg = <(26 * SZ_256K) MTDPART_SIZ_FULL>;
};
};
diff --git a/arch/arm/boot/dts/omap3-igep0030.dts
b/arch/arm/boot/dts/omap3-igep0030.dts
index 644d053..e4f078c 100644
--- a/arch/arm/boot/dts/omap3-igep0030.dts
+++ b/arch/arm/boot/dts/omap3-igep0030.dts
@@ -72,23 +72,23 @@
partition@0 {
label = "SPL";
- reg = <0 0x10>;
+ reg = <(0 * SZ_256K) (4 * SZ_256K)>;
};
partition@0x8 {
label = "U-Boot";
- reg = <0x10 0x18>;
+ reg = <(4 * SZ_256K) (6 * SZ_256K)>;
};
partition@0x1c {
label = "Environment";
- reg = <0x28 0x10>;
+ reg = <(10 * SZ_256K) (4 * SZ_256K)>;
};
partition@0x28 {
label = "Kernel";
- reg = <0x38 0x30>;
+ reg = <(14 * SZ_256K) (12 * SZ_256K)>;
};
partition@0x78 {
label = "Filesystem";
- reg = <0x68 0x1f98>;
+ reg = <(26 * SZ_256K) MTDPART_SIZ_FULL>;
};
};
};
diff --git a/arch/arm/boot/dts/omap3430-sdp.dts
b/arch/arm/boot/dts/omap3430-sdp.dts
index 2a725a0..dd69ee0 100644
--- a/arch/arm/boot/dts/omap3430-sdp.dts
+++ b/arch/arm/boot/dts/omap3430-sdp.dts
@@ -81,19 +81,19 @@
partition@0 {
label = "bootloader-nor";
- reg = <0 0x4>;
+ reg = <(0 * SZ_128K) (2 * SZ_128K)>;
};
partition@0x4 {
label = "params-nor";
- reg = <0x4 0x4>;
+ reg = <(2 * SZ_128K) (2 * SZ_128K)>;
};
partition@0x8 {
la
