devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/3] ARM: dts: Update OMAP3430 SDP NAND and ONENAND properties
@ 2013-04-08  1:17 Jon Hunter
  2013-04-08  1:17 ` [PATCH 2/3] ARM: dts: Add NOR flash bindings for OMAP2420 H4 Jon Hunter
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Jon Hunter @ 2013-04-08  1:17 UTC (permalink / raw)
  To: Tony Lindgren, Benoit Cousson
  Cc: device-tree, linux-omap, linux-arm, Jon Hunter

The GPMC timing properties for device-tree have been updated by adding
a "-ns" or "-ps" suffix to indicate the units of time the property
represents (as suggested by Rob Herring). Therefore, update the timing
property names for the OMAP3430 SDP NAND and ONENAND devices.

Signed-off-by: Jon Hunter <jon-hunter@ti.com>
---

Hi Benoit, this is a changed that is going to be introduced for v3.10.
Feel free to squash this with the patch "ARM: dts: OMAP3: Add support
for OMAP3430 SDP board" that you have queued for v3.10 if you prefer.

 arch/arm/boot/dts/omap3430-sdp.dts |   56 ++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/arch/arm/boot/dts/omap3430-sdp.dts b/arch/arm/boot/dts/omap3430-sdp.dts
index 05cd8ba..44d2191 100644
--- a/arch/arm/boot/dts/omap3430-sdp.dts
+++ b/arch/arm/boot/dts/omap3430-sdp.dts
@@ -57,20 +57,20 @@
 
 		ti,nand-ecc-opt = "sw";
 		gpmc,device-nand;
-		gpmc,cs-on = <0>;
-		gpmc,cs-rd-off = <36>;
-		gpmc,cs-wr-off = <36>;
-		gpmc,adv-on = <6>;
-		gpmc,adv-rd-off = <24>;
-		gpmc,adv-wr-off = <36>;
-		gpmc,oe-on = <6>;
-		gpmc,oe-off = <48>;
-		gpmc,we-on = <6>;
-		gpmc,we-off = <30>;
-		gpmc,rd-cycle = <72>;
-		gpmc,wr-cycle = <72>;
-		gpmc,access = <54>;
-		gpmc,wr-access = <30>;
+		gpmc,cs-on-ns = <0>;
+		gpmc,cs-rd-off-ns = <36>;
+		gpmc,cs-wr-off-ns = <36>;
+		gpmc,adv-on-ns = <6>;
+		gpmc,adv-rd-off-ns = <24>;
+		gpmc,adv-wr-off-ns = <36>;
+		gpmc,oe-on-ns = <6>;
+		gpmc,oe-off-ns = <48>;
+		gpmc,we-on-ns = <6>;
+		gpmc,we-off-ns = <30>;
+		gpmc,rd-cycle-ns = <72>;
+		gpmc,wr-cycle-ns = <72>;
+		gpmc,access-ns = <54>;
+		gpmc,wr-access-ns = <30>;
 
 		partition@0 {
 			label = "xloader-nand";
@@ -102,20 +102,20 @@
 
 		gpmc,device-width = <2>;
 		gpmc,mux-add-data = <2>;
-		gpmc,cs-on = <0>;
-		gpmc,cs-rd-off = <84>;
-		gpmc,cs-wr-off = <72>;
-		gpmc,adv-on = <0>;
-		gpmc,adv-rd-off = <18>;
-		gpmc,adv-wr-off = <18>;
-		gpmc,oe-on = <30>;
-		gpmc,oe-off = <84>;
-		gpmc,we-on = <0>;
-		gpmc,we-off = <42>;
-		gpmc,rd-cycle = <108>;
-		gpmc,wr-cycle = <96>;
-		gpmc,access = <78>;
-		gpmc,wr-data-mux-bus = <30>;
+		gpmc,cs-on-ns = <0>;
+		gpmc,cs-rd-off-ns = <84>;
+		gpmc,cs-wr-off-ns = <72>;
+		gpmc,adv-on-ns = <0>;
+		gpmc,adv-rd-off-ns = <18>;
+		gpmc,adv-wr-off-ns = <18>;
+		gpmc,oe-on-ns = <30>;
+		gpmc,oe-off-ns = <84>;
+		gpmc,we-on-ns = <0>;
+		gpmc,we-off-ns = <42>;
+		gpmc,rd-cycle-ns = <108>;
+		gpmc,wr-cycle-ns = <96>;
+		gpmc,access-ns = <78>;
+		gpmc,wr-data-mux-bus-ns = <30>;
 
 		partition@0 {
 			label = "xloader-onenand";
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 2/3] ARM: dts: Add NOR flash bindings for OMAP2420 H4
  2013-04-08  1:17 [PATCH 1/3] ARM: dts: Update OMAP3430 SDP NAND and ONENAND properties Jon Hunter
@ 2013-04-08  1:17 ` Jon Hunter
  2013-04-08  1:17 ` [PATCH 3/3] ARM: dts: Add OMAP3430 SDP NOR flash memory binding Jon Hunter
  2013-04-08 12:12 ` [PATCH 1/3] ARM: dts: Update OMAP3430 SDP NAND and ONENAND properties Benoit Cousson
  2 siblings, 0 replies; 5+ messages in thread
From: Jon Hunter @ 2013-04-08  1:17 UTC (permalink / raw)
  To: Tony Lindgren, Benoit Cousson
  Cc: device-tree, linux-omap, linux-arm, Jon Hunter

Add device-tree node for the 64MB NOR on the OMAP2420-H4 board.

Signed-off-by: Jon Hunter <jon-hunter@ti.com>
---
 arch/arm/boot/dts/omap2420-h4.dts |   46 +++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/arch/arm/boot/dts/omap2420-h4.dts b/arch/arm/boot/dts/omap2420-h4.dts
index 9b0d077..68282ee 100644
--- a/arch/arm/boot/dts/omap2420-h4.dts
+++ b/arch/arm/boot/dts/omap2420-h4.dts
@@ -18,3 +18,49 @@
 		reg = <0x80000000 0x4000000>; /* 64 MB */
 	};
 };
+
+&gpmc {
+	ranges = <0 0 0x08000000 0x04000000>;
+
+	nor@0,0 {
+		compatible = "cfi-flash";
+		linux,mtd-name= "intel,ge28f256l18b85";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		reg = <0 0 0x04000000>;
+		bank-width = <2>;
+
+		gpmc,mux-add-data = <2>;
+		gpmc,cs-on-ns = <10>;
+		gpmc,cs-rd-off-ns = <160>;
+		gpmc,cs-wr-off-ns = <160>;
+		gpmc,adv-on-ns = <20>;
+		gpmc,adv-rd-off-ns = <50>;
+		gpmc,adv-wr-off-ns = <50>;
+		gpmc,oe-on-ns = <60>;
+		gpmc,oe-off-ns = <120>;
+		gpmc,we-on-ns = <60>;
+		gpmc,we-off-ns = <120>;
+		gpmc,rd-cycle-ns = <170>;
+		gpmc,wr-cycle-ns = <170>;
+		gpmc,access-ns = <150>;
+		gpmc,page-burst-access-ns = <10>;
+
+		partition@0 {
+			label = "bootloader";
+			reg = <0 0x20000>;
+		};
+		partition@0x20000 {
+			label = "params";
+			reg = <0x20000 0x20000>;
+		};
+		partition@0x40000 {
+			label = "kernel";
+			reg = <0x40000 0x200000>;
+		};
+		partition@0x240000 {
+			label = "file-system";
+			reg = <0x240000 0x3dc0000>;
+		};
+	};
+};
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 3/3] ARM: dts: Add OMAP3430 SDP NOR flash memory binding
  2013-04-08  1:17 [PATCH 1/3] ARM: dts: Update OMAP3430 SDP NAND and ONENAND properties Jon Hunter
  2013-04-08  1:17 ` [PATCH 2/3] ARM: dts: Add NOR flash bindings for OMAP2420 H4 Jon Hunter
@ 2013-04-08  1:17 ` Jon Hunter
  2013-04-08  1:30   ` Jon Hunter
  2013-04-08 12:12 ` [PATCH 1/3] ARM: dts: Update OMAP3430 SDP NAND and ONENAND properties Benoit Cousson
  2 siblings, 1 reply; 5+ messages in thread
From: Jon Hunter @ 2013-04-08  1:17 UTC (permalink / raw)
  To: Tony Lindgren, Benoit Cousson
  Cc: device-tree, linux-omap, linux-arm, Jon Hunter

Add device-tree node for the 128MB NOR on the OMAP3423-SDP board.

Signed-off-by: Jon Hunter <jon-hunter@ti.com>
---
 arch/arm/boot/dts/omap3430-sdp.dts |   51 +++++++++++++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/omap3430-sdp.dts b/arch/arm/boot/dts/omap3430-sdp.dts
index 44d2191..144ae43 100644
--- a/arch/arm/boot/dts/omap3430-sdp.dts
+++ b/arch/arm/boot/dts/omap3430-sdp.dts
@@ -45,9 +45,58 @@
 };
 
 &gpmc {
-	ranges = <1 0 0x28000000 0x08000000>,
+	ranges = <0 0 0x10000000 0x08000000>,
+		 <1 0 0x28000000 0x08000000>,
 		 <2 0 0x20000000 0x10000000>;
 
+	nor@0,0 {
+		compatible = "cfi-flash";
+		linux,mtd-name= "intel,pf48f6000m0y1be";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		reg = <0 0 0x08000000>;
+		bank-width = <2>;
+
+		gpmc,mux-add-data = <2>;
+		gpmc,cs-on-ns = <0>;
+		gpmc,cs-rd-off-ns = <186>;
+		gpmc,cs-wr-off-ns = <186>;
+		gpmc,adv-on-ns = <12>;
+		gpmc,adv-rd-off-ns = <48>;
+		gpmc,adv-wr-off-ns = <48>;
+		gpmc,oe-on-ns = <54>;
+		gpmc,oe-off-ns = <168>;
+		gpmc,we-on-ns = <54>;
+		gpmc,we-off-ns = <168>;
+		gpmc,rd-cycle-ns = <186>;
+		gpmc,wr-cycle-ns = <186>;
+		gpmc,access-ns = <114>;
+		gpmc,page-burst-access-ns = <6>;
+		gpmc,bus-turnaround-ns = <12>;
+		gpmc,cycle2cycle-delay-ns = <18>;
+		gpmc,wr-data-mux-bus-ns = <90>;
+		gpmc,wr-access-ns = <186>;
+		gpmc,cycle2cycle-samecsen;
+		gpmc,cycle2cycle-diffcsen;
+
+		partition@0 {
+			label = "bootloader-nor";
+			reg = <0 0x40000>;
+		};
+		partition@0x40000 {
+			label = "params-nor";
+			reg = <0x40000 0x40000>;
+		};
+		partition@0x80000 {
+			label = "kernel-nor";
+			reg = <0x80000 0x200000>;
+		};
+		partition@0x280000 {
+			label = "filesystem-nor";
+			reg = <0x240000 0x7d80000>;
+		};
+	};
+
 	nand@1,0 {
 		linux,mtd-name= "micron,mt29f1g08abb";
 		#address-cells = <1>;
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH 3/3] ARM: dts: Add OMAP3430 SDP NOR flash memory binding
  2013-04-08  1:17 ` [PATCH 3/3] ARM: dts: Add OMAP3430 SDP NOR flash memory binding Jon Hunter
@ 2013-04-08  1:30   ` Jon Hunter
  0 siblings, 0 replies; 5+ messages in thread
From: Jon Hunter @ 2013-04-08  1:30 UTC (permalink / raw)
  To: Jon Hunter
  Cc: Tony Lindgren, Benoit Cousson, device-tree, linux-omap, linux-arm


On 04/07/2013 08:17 PM, Jon Hunter wrote:
> Add device-tree node for the 128MB NOR on the OMAP3423-SDP board.

Bugger ... it seems I have invented and new board. OMAP3423 SDP
does not exist. Fixed below.

Jon

>From 4f486b5dddc5d960d786504b4e3e97a28b63c1c0 Mon Sep 17 00:00:00 2001
From: Jon Hunter <jon-hunter@ti.com>
Date: Thu, 21 Feb 2013 18:52:05 -0600
Subject: [PATCH 3/3] ARM: dts: Add OMAP3430 SDP NOR flash memory binding

Add device-tree node for the 128MB NOR on the OMAP3430-SDP board.

Signed-off-by: Jon Hunter <jon-hunter@ti.com>
---
 arch/arm/boot/dts/omap3430-sdp.dts |   51 +++++++++++++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/omap3430-sdp.dts b/arch/arm/boot/dts/omap3430-sdp.dts
index 44d2191..144ae43 100644
--- a/arch/arm/boot/dts/omap3430-sdp.dts
+++ b/arch/arm/boot/dts/omap3430-sdp.dts
@@ -45,9 +45,58 @@
 };
 
 &gpmc {
-	ranges = <1 0 0x28000000 0x08000000>,
+	ranges = <0 0 0x10000000 0x08000000>,
+		 <1 0 0x28000000 0x08000000>,
 		 <2 0 0x20000000 0x10000000>;
 
+	nor@0,0 {
+		compatible = "cfi-flash";
+		linux,mtd-name= "intel,pf48f6000m0y1be";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		reg = <0 0 0x08000000>;
+		bank-width = <2>;
+
+		gpmc,mux-add-data = <2>;
+		gpmc,cs-on-ns = <0>;
+		gpmc,cs-rd-off-ns = <186>;
+		gpmc,cs-wr-off-ns = <186>;
+		gpmc,adv-on-ns = <12>;
+		gpmc,adv-rd-off-ns = <48>;
+		gpmc,adv-wr-off-ns = <48>;
+		gpmc,oe-on-ns = <54>;
+		gpmc,oe-off-ns = <168>;
+		gpmc,we-on-ns = <54>;
+		gpmc,we-off-ns = <168>;
+		gpmc,rd-cycle-ns = <186>;
+		gpmc,wr-cycle-ns = <186>;
+		gpmc,access-ns = <114>;
+		gpmc,page-burst-access-ns = <6>;
+		gpmc,bus-turnaround-ns = <12>;
+		gpmc,cycle2cycle-delay-ns = <18>;
+		gpmc,wr-data-mux-bus-ns = <90>;
+		gpmc,wr-access-ns = <186>;
+		gpmc,cycle2cycle-samecsen;
+		gpmc,cycle2cycle-diffcsen;
+
+		partition@0 {
+			label = "bootloader-nor";
+			reg = <0 0x40000>;
+		};
+		partition@0x40000 {
+			label = "params-nor";
+			reg = <0x40000 0x40000>;
+		};
+		partition@0x80000 {
+			label = "kernel-nor";
+			reg = <0x80000 0x200000>;
+		};
+		partition@0x280000 {
+			label = "filesystem-nor";
+			reg = <0x240000 0x7d80000>;
+		};
+	};
+
 	nand@1,0 {
 		linux,mtd-name= "micron,mt29f1g08abb";
 		#address-cells = <1>;
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/3] ARM: dts: Update OMAP3430 SDP NAND and ONENAND properties
  2013-04-08  1:17 [PATCH 1/3] ARM: dts: Update OMAP3430 SDP NAND and ONENAND properties Jon Hunter
  2013-04-08  1:17 ` [PATCH 2/3] ARM: dts: Add NOR flash bindings for OMAP2420 H4 Jon Hunter
  2013-04-08  1:17 ` [PATCH 3/3] ARM: dts: Add OMAP3430 SDP NOR flash memory binding Jon Hunter
@ 2013-04-08 12:12 ` Benoit Cousson
  2 siblings, 0 replies; 5+ messages in thread
From: Benoit Cousson @ 2013-04-08 12:12 UTC (permalink / raw)
  To: Jon Hunter; +Cc: Tony Lindgren, device-tree, linux-omap, linux-arm

Hi Jon,

On 04/08/2013 03:17 AM, Jon Hunter wrote:
> The GPMC timing properties for device-tree have been updated by adding
> a "-ns" or "-ps" suffix to indicate the units of time the property
> represents (as suggested by Rob Herring). Therefore, update the timing
> property names for the OMAP3430 SDP NAND and ONENAND devices.
> 
> Signed-off-by: Jon Hunter <jon-hunter@ti.com>
> ---
> 
> Hi Benoit, this is a changed that is going to be introduced for v3.10.
> Feel free to squash this with the patch "ARM: dts: OMAP3: Add support
> for OMAP3430 SDP board" that you have queued for v3.10 if you prefer.

I applied them like that. I did not want to rebase again the whole series.


Regards,
Benoit


>  arch/arm/boot/dts/omap3430-sdp.dts |   56 ++++++++++++++++++------------------
>  1 file changed, 28 insertions(+), 28 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/omap3430-sdp.dts b/arch/arm/boot/dts/omap3430-sdp.dts
> index 05cd8ba..44d2191 100644
> --- a/arch/arm/boot/dts/omap3430-sdp.dts
> +++ b/arch/arm/boot/dts/omap3430-sdp.dts
> @@ -57,20 +57,20 @@
>  
>  		ti,nand-ecc-opt = "sw";
>  		gpmc,device-nand;
> -		gpmc,cs-on = <0>;
> -		gpmc,cs-rd-off = <36>;
> -		gpmc,cs-wr-off = <36>;
> -		gpmc,adv-on = <6>;
> -		gpmc,adv-rd-off = <24>;
> -		gpmc,adv-wr-off = <36>;
> -		gpmc,oe-on = <6>;
> -		gpmc,oe-off = <48>;
> -		gpmc,we-on = <6>;
> -		gpmc,we-off = <30>;
> -		gpmc,rd-cycle = <72>;
> -		gpmc,wr-cycle = <72>;
> -		gpmc,access = <54>;
> -		gpmc,wr-access = <30>;
> +		gpmc,cs-on-ns = <0>;
> +		gpmc,cs-rd-off-ns = <36>;
> +		gpmc,cs-wr-off-ns = <36>;
> +		gpmc,adv-on-ns = <6>;
> +		gpmc,adv-rd-off-ns = <24>;
> +		gpmc,adv-wr-off-ns = <36>;
> +		gpmc,oe-on-ns = <6>;
> +		gpmc,oe-off-ns = <48>;
> +		gpmc,we-on-ns = <6>;
> +		gpmc,we-off-ns = <30>;
> +		gpmc,rd-cycle-ns = <72>;
> +		gpmc,wr-cycle-ns = <72>;
> +		gpmc,access-ns = <54>;
> +		gpmc,wr-access-ns = <30>;
>  
>  		partition@0 {
>  			label = "xloader-nand";
> @@ -102,20 +102,20 @@
>  
>  		gpmc,device-width = <2>;
>  		gpmc,mux-add-data = <2>;
> -		gpmc,cs-on = <0>;
> -		gpmc,cs-rd-off = <84>;
> -		gpmc,cs-wr-off = <72>;
> -		gpmc,adv-on = <0>;
> -		gpmc,adv-rd-off = <18>;
> -		gpmc,adv-wr-off = <18>;
> -		gpmc,oe-on = <30>;
> -		gpmc,oe-off = <84>;
> -		gpmc,we-on = <0>;
> -		gpmc,we-off = <42>;
> -		gpmc,rd-cycle = <108>;
> -		gpmc,wr-cycle = <96>;
> -		gpmc,access = <78>;
> -		gpmc,wr-data-mux-bus = <30>;
> +		gpmc,cs-on-ns = <0>;
> +		gpmc,cs-rd-off-ns = <84>;
> +		gpmc,cs-wr-off-ns = <72>;
> +		gpmc,adv-on-ns = <0>;
> +		gpmc,adv-rd-off-ns = <18>;
> +		gpmc,adv-wr-off-ns = <18>;
> +		gpmc,oe-on-ns = <30>;
> +		gpmc,oe-off-ns = <84>;
> +		gpmc,we-on-ns = <0>;
> +		gpmc,we-off-ns = <42>;
> +		gpmc,rd-cycle-ns = <108>;
> +		gpmc,wr-cycle-ns = <96>;
> +		gpmc,access-ns = <78>;
> +		gpmc,wr-data-mux-bus-ns = <30>;
>  
>  		partition@0 {
>  			label = "xloader-onenand";
> 


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2013-04-08 12:12 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-08  1:17 [PATCH 1/3] ARM: dts: Update OMAP3430 SDP NAND and ONENAND properties Jon Hunter
2013-04-08  1:17 ` [PATCH 2/3] ARM: dts: Add NOR flash bindings for OMAP2420 H4 Jon Hunter
2013-04-08  1:17 ` [PATCH 3/3] ARM: dts: Add OMAP3430 SDP NOR flash memory binding Jon Hunter
2013-04-08  1:30   ` Jon Hunter
2013-04-08 12:12 ` [PATCH 1/3] ARM: dts: Update OMAP3430 SDP NAND and ONENAND properties Benoit Cousson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).