diff mbox

ARM: dts: omap3-devkit8000: fix NAND memory binding

Message ID 1369296697-22495-1-git-send-email-florian.vaussard@epfl.ch (mailing list archive)
State New, archived
Headers show

Commit Message

Florian Vaussard May 23, 2013, 8:11 a.m. UTC
Commit d36b4cd 'ARM: OMAP2+: Add additional GPMC timing parameters'
updated GPMC binding, but omap3-devkit8000 was not updated accordingly,
resulting in a broken configuration.

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
---
 arch/arm/boot/dts/omap3-devkit8000.dts |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)

Comments

Florian Vaussard May 31, 2013, 1:49 p.m. UTC | #1
Hello,

Gentle ping. Does someone has any comments on this fix? Can someone 
tests on the real hardware?

Regards,

Florian

On 05/23/2013 10:11 AM, Florian Vaussard wrote:
> Commit d36b4cd 'ARM: OMAP2+: Add additional GPMC timing parameters'
> updated GPMC binding, but omap3-devkit8000 was not updated accordingly,
> resulting in a broken configuration.
>
> Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
> ---
>   arch/arm/boot/dts/omap3-devkit8000.dts |   29 +++++++++++++++--------------
>   1 files changed, 15 insertions(+), 14 deletions(-)
>
> diff --git a/arch/arm/boot/dts/omap3-devkit8000.dts b/arch/arm/boot/dts/omap3-devkit8000.dts
> index 8a5cdcc..e5b35f5 100644
> --- a/arch/arm/boot/dts/omap3-devkit8000.dts
> +++ b/arch/arm/boot/dts/omap3-devkit8000.dts
> @@ -123,20 +123,21 @@
>   		reg = <0 0 0>; /* CS0, offset 0 */
>   		nand-bus-width = <16>;
>
> -		gpmc,sync-clk = <0>;
> -		gpmc,cs-on = <0>;
> -		gpmc,cs-rd-off = <44>;
> -		gpmc,cs-wr-off = <44>;
> -		gpmc,adv-on = <6>;
> -		gpmc,adv-rd-off = <34>;
> -		gpmc,adv-wr-off = <44>;
> -		gpmc,we-off = <40>;
> -		gpmc,oe-off = <54>;
> -		gpmc,access = <64>;
> -		gpmc,rd-cycle = <82>;
> -		gpmc,wr-cycle = <82>;
> -		gpmc,wr-access = <40>;
> -		gpmc,wr-data-mux-bus = <0>;
> +		gpmc,device-nand;
> +		gpmc,sync-clki-ps = <0>;
> +		gpmc,cs-on-ns = <0>;
> +		gpmc,cs-rd-off-ns = <44>;
> +		gpmc,cs-wr-off-ns = <44>;
> +		gpmc,adv-on-ns = <6>;
> +		gpmc,adv-rd-off-ns = <34>;
> +		gpmc,adv-wr-off-ns = <44>;
> +		gpmc,we-off-ns = <40>;
> +		gpmc,oe-off-ns = <54>;
> +		gpmc,access-ns = <64>;
> +		gpmc,rd-cycle-ns = <82>;
> +		gpmc,wr-cycle-ns = <82>;
> +		gpmc,wr-access-ns = <40>;
> +		gpmc,wr-data-mux-bus-ns = <0>;
>
>   		#address-cells = <1>;
>   		#size-cells = <1>;
>
Florian Vaussard June 11, 2013, 2:53 p.m. UTC | #2
Hello,

On 05/31/2013 03:49 PM, Florian Vaussard wrote:
> Hello,
>
> Gentle ping. Does someone has any comments on this fix? Can someone
> tests on the real hardware?
>

Nobody has this hardware somewhere in a drawer? :-)

Regards,

Florian

> Regards,
>
> Florian
>
> On 05/23/2013 10:11 AM, Florian Vaussard wrote:
>> Commit d36b4cd 'ARM: OMAP2+: Add additional GPMC timing parameters'
>> updated GPMC binding, but omap3-devkit8000 was not updated accordingly,
>> resulting in a broken configuration.
>>
>> Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
>> ---
>>   arch/arm/boot/dts/omap3-devkit8000.dts |   29
>> +++++++++++++++--------------
>>   1 files changed, 15 insertions(+), 14 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/omap3-devkit8000.dts
>> b/arch/arm/boot/dts/omap3-devkit8000.dts
>> index 8a5cdcc..e5b35f5 100644
>> --- a/arch/arm/boot/dts/omap3-devkit8000.dts
>> +++ b/arch/arm/boot/dts/omap3-devkit8000.dts
>> @@ -123,20 +123,21 @@
>>           reg = <0 0 0>; /* CS0, offset 0 */
>>           nand-bus-width = <16>;
>>
>> -        gpmc,sync-clk = <0>;
>> -        gpmc,cs-on = <0>;
>> -        gpmc,cs-rd-off = <44>;
>> -        gpmc,cs-wr-off = <44>;
>> -        gpmc,adv-on = <6>;
>> -        gpmc,adv-rd-off = <34>;
>> -        gpmc,adv-wr-off = <44>;
>> -        gpmc,we-off = <40>;
>> -        gpmc,oe-off = <54>;
>> -        gpmc,access = <64>;
>> -        gpmc,rd-cycle = <82>;
>> -        gpmc,wr-cycle = <82>;
>> -        gpmc,wr-access = <40>;
>> -        gpmc,wr-data-mux-bus = <0>;
>> +        gpmc,device-nand;
>> +        gpmc,sync-clki-ps = <0>;
>> +        gpmc,cs-on-ns = <0>;
>> +        gpmc,cs-rd-off-ns = <44>;
>> +        gpmc,cs-wr-off-ns = <44>;
>> +        gpmc,adv-on-ns = <6>;
>> +        gpmc,adv-rd-off-ns = <34>;
>> +        gpmc,adv-wr-off-ns = <44>;
>> +        gpmc,we-off-ns = <40>;
>> +        gpmc,oe-off-ns = <54>;
>> +        gpmc,access-ns = <64>;
>> +        gpmc,rd-cycle-ns = <82>;
>> +        gpmc,wr-cycle-ns = <82>;
>> +        gpmc,wr-access-ns = <40>;
>> +        gpmc,wr-data-mux-bus-ns = <0>;
>>
>>           #address-cells = <1>;
>>           #size-cells = <1>;
>>
>
Grant Likely June 11, 2013, 9:54 p.m. UTC | #3
On Tue, 11 Jun 2013 16:53:19 +0200, Florian Vaussard <florian.vaussard@epfl.ch> wrote:
> Hello,
> 
> On 05/31/2013 03:49 PM, Florian Vaussard wrote:
> > Hello,
> >
> > Gentle ping. Does someone has any comments on this fix? Can someone
> > tests on the real hardware?
> >
> 
> Nobody has this hardware somewhere in a drawer? :-)

I've just gone ahead and applied it. As you say it's broken anyway, so
if this is also broken, then at least it is /less/ broken. :)

g.

> 
> Regards,
> 
> Florian
> 
> > Regards,
> >
> > Florian
> >
> > On 05/23/2013 10:11 AM, Florian Vaussard wrote:
> >> Commit d36b4cd 'ARM: OMAP2+: Add additional GPMC timing parameters'
> >> updated GPMC binding, but omap3-devkit8000 was not updated accordingly,
> >> resulting in a broken configuration.
> >>
> >> Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
> >> ---
> >>   arch/arm/boot/dts/omap3-devkit8000.dts |   29
> >> +++++++++++++++--------------
> >>   1 files changed, 15 insertions(+), 14 deletions(-)
> >>
> >> diff --git a/arch/arm/boot/dts/omap3-devkit8000.dts
> >> b/arch/arm/boot/dts/omap3-devkit8000.dts
> >> index 8a5cdcc..e5b35f5 100644
> >> --- a/arch/arm/boot/dts/omap3-devkit8000.dts
> >> +++ b/arch/arm/boot/dts/omap3-devkit8000.dts
> >> @@ -123,20 +123,21 @@
> >>           reg = <0 0 0>; /* CS0, offset 0 */
> >>           nand-bus-width = <16>;
> >>
> >> -        gpmc,sync-clk = <0>;
> >> -        gpmc,cs-on = <0>;
> >> -        gpmc,cs-rd-off = <44>;
> >> -        gpmc,cs-wr-off = <44>;
> >> -        gpmc,adv-on = <6>;
> >> -        gpmc,adv-rd-off = <34>;
> >> -        gpmc,adv-wr-off = <44>;
> >> -        gpmc,we-off = <40>;
> >> -        gpmc,oe-off = <54>;
> >> -        gpmc,access = <64>;
> >> -        gpmc,rd-cycle = <82>;
> >> -        gpmc,wr-cycle = <82>;
> >> -        gpmc,wr-access = <40>;
> >> -        gpmc,wr-data-mux-bus = <0>;
> >> +        gpmc,device-nand;
> >> +        gpmc,sync-clki-ps = <0>;
> >> +        gpmc,cs-on-ns = <0>;
> >> +        gpmc,cs-rd-off-ns = <44>;
> >> +        gpmc,cs-wr-off-ns = <44>;
> >> +        gpmc,adv-on-ns = <6>;
> >> +        gpmc,adv-rd-off-ns = <34>;
> >> +        gpmc,adv-wr-off-ns = <44>;
> >> +        gpmc,we-off-ns = <40>;
> >> +        gpmc,oe-off-ns = <54>;
> >> +        gpmc,access-ns = <64>;
> >> +        gpmc,rd-cycle-ns = <82>;
> >> +        gpmc,wr-cycle-ns = <82>;
> >> +        gpmc,wr-access-ns = <40>;
> >> +        gpmc,wr-data-mux-bus-ns = <0>;
> >>
> >>           #address-cells = <1>;
> >>           #size-cells = <1>;
> >>
> >
> 
> -- 
> Florian Vaussard
> EPFL - STI - IMT - LSRO1
> MEB330 - Station 9
> 1015 Lausanne / Switzerland
> 
> tel: +41 21 693 78 39
> fax: +41 21 693 78 07
> http://lsro.epfl.ch
> _______________________________________________
> devicetree-discuss mailing list
> devicetree-discuss@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/devicetree-discuss
diff mbox

Patch

diff --git a/arch/arm/boot/dts/omap3-devkit8000.dts b/arch/arm/boot/dts/omap3-devkit8000.dts
index 8a5cdcc..e5b35f5 100644
--- a/arch/arm/boot/dts/omap3-devkit8000.dts
+++ b/arch/arm/boot/dts/omap3-devkit8000.dts
@@ -123,20 +123,21 @@ 
 		reg = <0 0 0>; /* CS0, offset 0 */
 		nand-bus-width = <16>;
 
-		gpmc,sync-clk = <0>;
-		gpmc,cs-on = <0>;
-		gpmc,cs-rd-off = <44>;
-		gpmc,cs-wr-off = <44>;
-		gpmc,adv-on = <6>;
-		gpmc,adv-rd-off = <34>;
-		gpmc,adv-wr-off = <44>;
-		gpmc,we-off = <40>;
-		gpmc,oe-off = <54>;
-		gpmc,access = <64>;
-		gpmc,rd-cycle = <82>;
-		gpmc,wr-cycle = <82>;
-		gpmc,wr-access = <40>;
-		gpmc,wr-data-mux-bus = <0>;
+		gpmc,device-nand;
+		gpmc,sync-clki-ps = <0>;
+		gpmc,cs-on-ns = <0>;
+		gpmc,cs-rd-off-ns = <44>;
+		gpmc,cs-wr-off-ns = <44>;
+		gpmc,adv-on-ns = <6>;
+		gpmc,adv-rd-off-ns = <34>;
+		gpmc,adv-wr-off-ns = <44>;
+		gpmc,we-off-ns = <40>;
+		gpmc,oe-off-ns = <54>;
+		gpmc,access-ns = <64>;
+		gpmc,rd-cycle-ns = <82>;
+		gpmc,wr-cycle-ns = <82>;
+		gpmc,wr-access-ns = <40>;
+		gpmc,wr-data-mux-bus-ns = <0>;
 
 		#address-cells = <1>;
 		#size-cells = <1>;