aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2011-10-20 00:16:01 -0400
committerKumar Gala <galak@kernel.crashing.org>2011-11-24 03:01:35 -0500
commit38b8f1687f732e0d54340429acd5751b8c679690 (patch)
treedcbf4c467badd282b1317bc97f2c287d5a702038 /arch/powerpc
parentfc2478e728b252c33d9655b234584a24c524d7e3 (diff)
powerpc/85xx: Update SPI binding to match binding spec for P1020RDB
The SPI node is out of date with regards to the binding for fsl-espi and driver support. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/boot/dts/p1020rdb.dts30
-rw-r--r--arch/powerpc/boot/dts/p1020si.dtsi5
2 files changed, 15 insertions, 20 deletions
diff --git a/arch/powerpc/boot/dts/p1020rdb.dts b/arch/powerpc/boot/dts/p1020rdb.dts
index 8b1a7ee5ed7b..b31e7ecf24f8 100644
--- a/arch/powerpc/boot/dts/p1020rdb.dts
+++ b/arch/powerpc/boot/dts/p1020rdb.dts
@@ -149,49 +149,45 @@
149 }; 149 };
150 150
151 spi@7000 { 151 spi@7000 {
152 152 flash@0 {
153 fsl_m25p80@0 {
154 #address-cells = <1>; 153 #address-cells = <1>;
155 #size-cells = <1>; 154 #size-cells = <1>;
156 compatible = "fsl,espi-flash"; 155 compatible = "spansion,s25sl12801";
157 reg = <0>; 156 reg = <0>;
158 linux,modalias = "fsl_m25p80"; 157 spi-max-frequency = <40000000>; /* input clock */
159 modal = "s25sl128b";
160 spi-max-frequency = <50000000>;
161 mode = <0>;
162 158
163 partition@0 { 159 partition@u-boot {
164 /* 512KB for u-boot Bootloader Image */ 160 /* 512KB for u-boot Bootloader Image */
165 reg = <0x0 0x00080000>; 161 reg = <0x0 0x00080000>;
166 label = "SPI (RO) U-Boot Image"; 162 label = "u-boot";
167 read-only; 163 read-only;
168 }; 164 };
169 165
170 partition@80000 { 166 partition@dtb {
171 /* 512KB for DTB Image */ 167 /* 512KB for DTB Image */
172 reg = <0x00080000 0x00080000>; 168 reg = <0x00080000 0x00080000>;
173 label = "SPI (RO) DTB Image"; 169 label = "dtb";
174 read-only; 170 read-only;
175 }; 171 };
176 172
177 partition@100000 { 173 partition@kernel {
178 /* 4MB for Linux Kernel Image */ 174 /* 4MB for Linux Kernel Image */
179 reg = <0x00100000 0x00400000>; 175 reg = <0x00100000 0x00400000>;
180 label = "SPI (RO) Linux Kernel Image"; 176 label = "kernel";
181 read-only; 177 read-only;
182 }; 178 };
183 179
184 partition@500000 { 180 partition@fs {
185 /* 4MB for Compressed RFS Image */ 181 /* 4MB for Compressed RFS Image */
186 reg = <0x00500000 0x00400000>; 182 reg = <0x00500000 0x00400000>;
187 label = "SPI (RO) Compressed RFS Image"; 183 label = "file system";
188 read-only; 184 read-only;
189 }; 185 };
190 186
191 partition@900000 { 187 partition@jffs-fs {
192 /* 7MB for JFFS2 based RFS */ 188 /* 7MB for JFFS2 based RFS */
193 reg = <0x00900000 0x00700000>; 189 reg = <0x00900000 0x00700000>;
194 label = "SPI (RW) JFFS2 RFS"; 190 label = "file system jffs2";
195 }; 191 };
196 }; 192 };
197 }; 193 };
diff --git a/arch/powerpc/boot/dts/p1020si.dtsi b/arch/powerpc/boot/dts/p1020si.dtsi
index 58f6b30e029c..25e10cf5a6bc 100644
--- a/arch/powerpc/boot/dts/p1020si.dtsi
+++ b/arch/powerpc/boot/dts/p1020si.dtsi
@@ -112,14 +112,13 @@
112 }; 112 };
113 113
114 spi@7000 { 114 spi@7000 {
115 cell-index = <0>;
116 #address-cells = <1>; 115 #address-cells = <1>;
117 #size-cells = <0>; 116 #size-cells = <0>;
118 compatible = "fsl,espi"; 117 compatible = "fsl,p1020-espi", "fsl,mpc8536-espi";
119 reg = <0x7000 0x1000>; 118 reg = <0x7000 0x1000>;
120 interrupts = <59 0x2>; 119 interrupts = <59 0x2>;
121 interrupt-parent = <&mpic>; 120 interrupt-parent = <&mpic>;
122 mode = "cpu"; 121 fsl,espi-num-chipselects = <4>;
123 }; 122 };
124 123
125 gpio: gpio-controller@f000 { 124 gpio: gpio-controller@f000 {