summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/spear300-evb.dts
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-05-14 17:31:45 +0200
committerArnd Bergmann <arnd@arndb.de>2012-05-14 17:31:45 +0200
commit66a2886d867343eff6bf2646bea2c923d0cbf620 (patch)
treead44dcca4fa410ab2c16b4964f6c19571421b4df /arch/arm/boot/dts/spear300-evb.dts
parentd2819f80d465672b09c2f4cb52303b7f951c4d0f (diff)
parentf613e220aebfafb653f7ce264950c15c99e27f2a (diff)
Merge branch 'spear/dt' into spear/clock
Conflicts: arch/arm/mach-spear3xx/clock.c arch/arm/mach-spear3xx/include/mach/generic.h arch/arm/mach-spear3xx/include/mach/misc_regs.h arch/arm/mach-spear3xx/spear320.c arch/arm/mach-spear6xx/clock.c arch/arm/mach-spear6xx/include/mach/misc_regs.h Resolve even more merge conflicts. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/spear300-evb.dts')
-rw-r--r--arch/arm/boot/dts/spear300-evb.dts187
1 files changed, 106 insertions, 81 deletions
diff --git a/arch/arm/boot/dts/spear300-evb.dts b/arch/arm/boot/dts/spear300-evb.dts
index 402ca0d55011..fc82b1a26458 100644
--- a/arch/arm/boot/dts/spear300-evb.dts
+++ b/arch/arm/boot/dts/spear300-evb.dts
@@ -87,6 +87,31 @@
smi: flash@fc000000 {
status = "okay";
+ clock-rate=<50000000>;
+
+ flash@f8000000 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ reg = <0xf8000000 0x800000>;
+ st,smi-fast-mode;
+
+ partition@0 {
+ label = "xloader";
+ reg = <0x0 0x10000>;
+ };
+ partition@10000 {
+ label = "u-boot";
+ reg = <0x10000 0x40000>;
+ };
+ partition@50000 {
+ label = "linux";
+ reg = <0x50000 0x2c0000>;
+ };
+ partition@310000 {
+ label = "rootfs";
+ reg = <0x310000 0x4f0000>;
+ };
+ };
};
spi0: spi@d0100000 {
@@ -119,87 +144,87 @@
};
kbd@a0000000 {
- linux,keymap = < 0x00010000
- 0x00020100
- 0x00030200
- 0x00040300
- 0x00050400
- 0x00060500
- 0x00070600
- 0x00080700
- 0x00090800
- 0x000a0001
- 0x000c0101
- 0x000d0201
- 0x000e0301
- 0x000f0401
- 0x00100501
- 0x00110601
- 0x00120701
- 0x00130801
- 0x00140002
- 0x00150102
- 0x00160202
- 0x00170302
- 0x00180402
- 0x00190502
- 0x001a0602
- 0x001b0702
- 0x001c0802
- 0x001d0003
- 0x001e0103
- 0x001f0203
- 0x00200303
- 0x00210403
- 0x00220503
- 0x00230603
- 0x00240703
- 0x00250803
- 0x00260004
- 0x00270104
- 0x00280204
- 0x00290304
- 0x002a0404
- 0x002b0504
- 0x002c0604
- 0x002d0704
- 0x002e0804
- 0x002f0005
- 0x00300105
- 0x00310205
- 0x00320305
- 0x00330405
- 0x00340505
- 0x00350605
- 0x00360705
- 0x00370805
- 0x00380006
- 0x00390106
- 0x003a0206
- 0x003b0306
- 0x003c0406
- 0x003d0506
- 0x003e0606
- 0x003f0706
- 0x00400806
- 0x00410007
- 0x00420107
- 0x00430207
- 0x00440307
- 0x00450407
- 0x00460507
- 0x00470607
- 0x00480707
- 0x00490807
- 0x004a0008
- 0x004b0108
- 0x004c0208
- 0x004d0308
- 0x004e0408
- 0x004f0508
- 0x00500608
- 0x00510708
- 0x00520808 >;
+ linux,keymap = < 0x00000001
+ 0x00010002
+ 0x00020003
+ 0x00030004
+ 0x00040005
+ 0x00050006
+ 0x00060007
+ 0x00070008
+ 0x00080009
+ 0x0100000a
+ 0x0101000c
+ 0x0102000d
+ 0x0103000e
+ 0x0104000f
+ 0x01050010
+ 0x01060011
+ 0x01070012
+ 0x01080013
+ 0x02000014
+ 0x02010015
+ 0x02020016
+ 0x02030017
+ 0x02040018
+ 0x02050019
+ 0x0206001a
+ 0x0207001b
+ 0x0208001c
+ 0x0300001d
+ 0x0301001e
+ 0x0302001f
+ 0x03030020
+ 0x03040021
+ 0x03050022
+ 0x03060023
+ 0x03070024
+ 0x03080025
+ 0x04000026
+ 0x04010027
+ 0x04020028
+ 0x04030029
+ 0x0404002a
+ 0x0405002b
+ 0x0406002c
+ 0x0407002d
+ 0x0408002e
+ 0x0500002f
+ 0x05010030
+ 0x05020031
+ 0x05030032
+ 0x05040033
+ 0x05050034
+ 0x05060035
+ 0x05070036
+ 0x05080037
+ 0x06000038
+ 0x06010039
+ 0x0602003a
+ 0x0603003b
+ 0x0604003c
+ 0x0605003d
+ 0x0606003e
+ 0x0607003f
+ 0x06080040
+ 0x07000041
+ 0x07010042
+ 0x07020043
+ 0x07030044
+ 0x07040045
+ 0x07050046
+ 0x07060047
+ 0x07070048
+ 0x07080049
+ 0x0800004a
+ 0x0801004b
+ 0x0802004c
+ 0x0803004d
+ 0x0804004e
+ 0x0805004f
+ 0x08060050
+ 0x08070051
+ 0x08080052 >;
autorepeat;
st,mode = <0>;
status = "okay";