This patch adds multi-chip support for the Micron MT29F8G08FAB NAND flash memory on the TQM8548 modules. Signed-off-by: Wolfgang Grandegger --- arch/powerpc/boot/dts/tqm8548-bigflash.dts | 7 +++++-- arch/powerpc/boot/dts/tqm8548.dts | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) Index: linux-2.6/arch/powerpc/boot/dts/tqm8548-bigflash.dts =================================================================== --- linux-2.6.orig/arch/powerpc/boot/dts/tqm8548-bigflash.dts 2009-03-30 12:01:22.015719619 +0200 +++ linux-2.6/arch/powerpc/boot/dts/tqm8548-bigflash.dts 2009-03-30 12:01:45.007720662 +0200 @@ -380,10 +380,13 @@ upm@3,0 { #address-cells = <0>; #size-cells = <0>; - compatible = "fsl,upm-nand"; + compatible = "tqc,tqm8548-upm-nand", "fsl,upm-nand"; reg = <3 0x0 0x800>; fsl,upm-addr-offset = <0x10>; fsl,upm-cmd-offset = <0x08>; + /* Micron MT29F8G08FAB multi-chip device */ + fsl,upm-addr-line-cs-offsets = <0x0 0x200>; + fsl,upm-wait-flags = <0x5>; chip-delay = <25>; // in micro-seconds nand@0 { @@ -392,7 +395,7 @@ partition@0 { label = "fs"; - reg = <0x00000000 0x01000000>; + reg = <0x00000000 0x10000000>; }; }; }; Index: linux-2.6/arch/powerpc/boot/dts/tqm8548.dts =================================================================== --- linux-2.6.orig/arch/powerpc/boot/dts/tqm8548.dts 2009-03-30 12:01:22.015719619 +0200 +++ linux-2.6/arch/powerpc/boot/dts/tqm8548.dts 2009-03-30 12:01:45.008720246 +0200 @@ -380,10 +380,13 @@ upm@3,0 { #address-cells = <0>; #size-cells = <0>; - compatible = "fsl,upm-nand"; + compatible = "tqc,tqm8548-upm-nand", "fsl,upm-nand"; reg = <3 0x0 0x800>; fsl,upm-addr-offset = <0x10>; fsl,upm-cmd-offset = <0x08>; + /* Micron MT29F8G08FAB multi-chip device */ + fsl,upm-addr-line-cs-offsets = <0x0 0x200>; + fsl,upm-wait-flags = <0x5>; chip-delay = <25>; // in micro-seconds nand@0 { @@ -392,7 +395,7 @@ partition@0 { label = "fs"; - reg = <0x00000000 0x01000000>; + reg = <0x00000000 0x10000000>; }; }; };