ARM: dts: Update OMAP3430 SDP NAND and ONENAND properties
PATCH 1/3 ARM: dts: Update OMAP3430 SDP NAND and ONENAND properties
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.
---
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(-)
arch/arm/boot/dts/omap3430-sdp.dts +28 -28
@@ -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 at 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 at 0 { label = "xloader-onenand";
Signature · 1 line
1.7.10.4
PATCH 2/3 ARM: dts: Add NOR flash bindings for OMAP2420 H4
Add device-tree node for the 64MB NOR on the OMAP2420-H4 board.
--- arch/arm/boot/dts/omap2420-h4.dts | 46 +++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)
arch/arm/boot/dts/omap2420-h4.dts +46 -0
@@ -18,3 +18,49 @@ reg = <0x80000000 0x4000000>; /* 64 MB */ }; }; + +&gpmc { + ranges = <0 0 0x08000000 0x04000000>; + + nor at 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 at 0 { + label = "bootloader"; + reg = <0 0x20000>; + }; + partition at 0x20000 { + label = "params"; + reg = <0x20000 0x20000>; + }; + partition at 0x40000 { + label = "kernel"; + reg = <0x40000 0x200000>; + }; + partition at 0x240000 { + label = "file-system"; + reg = <0x240000 0x3dc0000>; + }; + }; +};
Signature · 1 line
1.7.10.4
PATCH 3/3 ARM: dts: Add OMAP3430 SDP NOR flash memory binding
In reply to Jon HunterAdd device-tree node for the 128MB NOR on the OMAP3423-SDP board.
--- arch/arm/boot/dts/omap3430-sdp.dts | 51 +++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-)
arch/arm/boot/dts/omap3430-sdp.dts +50 -1
@@ -45,9 +45,58 @@ }; &gpmc { - ranges = <1 0 0x28000000 0x08000000>, + ranges = <0 0 0x10000000 0x08000000>, + <1 0 0x28000000 0x08000000>, <2 0 0x20000000 0x10000000>; + nor at 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 at 0 { + label = "bootloader-nor"; + reg = <0 0x40000>; + }; + partition at 0x40000 { + label = "params-nor"; + reg = <0x40000 0x40000>; + }; + partition at 0x80000 { + label = "kernel-nor"; + reg = <0x80000 0x200000>; + }; + partition at 0x280000 { + label = "filesystem-nor"; + reg = <0x240000 0x7d80000>; + }; + }; + nand at 1,0 { linux,mtd-name= "micron,mt29f1g08abb"; #address-cells = <1>;
Signature · 1 line
1.7.10.4
PATCH 3/3 ARM: dts: Add OMAP3430 SDP NOR flash memory binding
Quoted 1 line · Jon Hunter
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
Quoted 1 line
From
4f486b5dddc5d960d786504b4e3e97a28b63c1c0Mon Sep 17 00:00:00 2001
From: Jon Hunter <[email protected]>
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.
--- arch/arm/boot/dts/omap3430-sdp.dts | 51 +++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-)
arch/arm/boot/dts/omap3430-sdp.dts +50 -1
@@ -45,9 +45,58 @@ }; &gpmc { - ranges = <1 0 0x28000000 0x08000000>, + ranges = <0 0 0x10000000 0x08000000>, + <1 0 0x28000000 0x08000000>, <2 0 0x20000000 0x10000000>; + nor at 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 at 0 { + label = "bootloader-nor"; + reg = <0 0x40000>; + }; + partition at 0x40000 { + label = "params-nor"; + reg = <0x40000 0x40000>; + }; + partition at 0x80000 { + label = "kernel-nor"; + reg = <0x80000 0x200000>; + }; + partition at 0x280000 { + label = "filesystem-nor"; + reg = <0x240000 0x7d80000>; + }; + }; + nand at 1,0 { linux,mtd-name= "micron,mt29f1g08abb"; #address-cells = <1>;
Signature · 1 line
1.7.10.4
PATCH 1/3 ARM: dts: Update OMAP3430 SDP NAND and ONENAND properties
In reply to Jon HunterHi Jon,
Quoted 11 lines · 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 <[email protected]>---
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
Quoted 78 lines
arch/arm/boot/dts/omap3430-sdp.dts | 56 ++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 28 deletions(-)arch/arm/boot/dts/omap3430-sdp.dts +28
-28@@ -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 at 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 at 0 { label = "xloader-onenand";