diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-28 17:15:34 +1100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-28 17:15:34 +1100 |
commit | 6469c92e0a4879e57bccbbacb2b724672a4fa8fb (patch) | |
tree | 65b3377bdea03342f64f5cd414d61824ff2cf354 /arch/powerpc/boot/dts/warp.dts | |
parent | 0411648e445d850ded24aba98f1774c417bf5658 (diff) | |
parent | 0b21bcd5b52779be0c18a6c201ae8f060d3b2bf2 (diff) | |
download | kernel_samsung_smdk4412-6469c92e0a4879e57bccbbacb2b724672a4fa8fb.zip kernel_samsung_smdk4412-6469c92e0a4879e57bccbbacb2b724672a4fa8fb.tar.gz kernel_samsung_smdk4412-6469c92e0a4879e57bccbbacb2b724672a4fa8fb.tar.bz2 |
Merge commit 'jwb/jwb-merge' into merge
Manual merge of:
arch/powerpc/configs/44x/warp_defconfig
Diffstat (limited to 'arch/powerpc/boot/dts/warp.dts')
-rw-r--r-- | arch/powerpc/boot/dts/warp.dts | 42 |
1 files changed, 41 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/warp.dts b/arch/powerpc/boot/dts/warp.dts index f4e4ba6..7e183ff 100644 --- a/arch/powerpc/boot/dts/warp.dts +++ b/arch/powerpc/boot/dts/warp.dts @@ -149,12 +149,17 @@ reg = <0x00000002 0x00004000 0x00000A00>; }; - nor_flash@0,0 { + nor@0,0 { compatible = "amd,s29gl032a", "cfi-flash"; bank-width = <2>; reg = <0x00000000 0x00000000 0x00400000>; #address-cells = <1>; #size-cells = <1>; + + partition@0 { + label = "splash"; + reg = <0x00000000 0x00020000>; + }; partition@300000 { label = "fpga"; reg = <0x0300000 0x00040000>; @@ -168,6 +173,41 @@ reg = <0x0380000 0x00080000>; }; }; + + ndfc@1,0 { + compatible = "ibm,ndfc"; + reg = <0x00000001 0x00000000 0x00002000>; + ccr = <0x00001000>; + bank-settings = <0x80002222>; + #address-cells = <1>; + #size-cells = <1>; + + nand { + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "kernel"; + reg = <0x00000000 0x00200000>; + }; + partition@200000 { + label = "root"; + reg = <0x00200000 0x03E00000>; + }; + partition@40000000 { + label = "persistent"; + reg = <0x04000000 0x04000000>; + }; + partition@80000000 { + label = "persistent1"; + reg = <0x08000000 0x04000000>; + }; + partition@C0000000 { + label = "persistent2"; + reg = <0x0C000000 0x04000000>; + }; + }; + }; }; UART0: serial@ef600300 { |