[POWERPC] Small fixes for the Ebony device tree

This patch corrects a number of minor errors in the Ebony device tree:
- Missing (given as 0) cache sizes are added to the CPU node
- device_type properties are removed from nodes which don't
have a reasonably well defined device_type binding. This does require
a very small code change to locate the busses to be probed for
of_platform devices by 'compatible' instead of 'device_type'.
- A node is added for the SRAM controller
- The unit address of the small-flash node is adjusted to
correctly reflect the reg property.
- device_type values for the MAL and ZMII are updated to
reflected more up-to-date versions of the binding.
- An incorrect offset in the partition map for the large-flash
node is corrected.
- Some redundant values, already commented out are removed
entirely.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

authored by David Gibson and committed by Paul Mackerras c72ea777 f7c0d13b

+16 -27
+13 -24
arch/powerpc/boot/dts/ebony.dts
··· 33 33 timebase-frequency = <0>; // Filled in by zImage 34 34 i-cache-line-size = <32>; 35 35 d-cache-line-size = <32>; 36 - i-cache-size = <0>; 37 - d-cache-size = <0>; 36 + i-cache-size = <8000>; /* 32 kB */ 37 + d-cache-size = <8000>; /* 32 kB */ 38 38 dcr-controller; 39 39 dcr-access-method = "native"; 40 40 }; ··· 46 46 }; 47 47 48 48 UIC0: interrupt-controller0 { 49 - device_type = "ibm,uic"; 50 49 compatible = "ibm,uic-440gp", "ibm,uic"; 51 50 interrupt-controller; 52 51 cell-index = <0>; ··· 57 58 }; 58 59 59 60 UIC1: interrupt-controller1 { 60 - device_type = "ibm,uic"; 61 61 compatible = "ibm,uic-440gp", "ibm,uic"; 62 62 interrupt-controller; 63 63 cell-index = <1>; ··· 69 71 }; 70 72 71 73 CPC0: cpc { 72 - device_type = "ibm,cpc"; 73 74 compatible = "ibm,cpc-440gp"; 74 75 dcr-reg = <0b0 003 0e0 010>; 75 76 // FIXME: anything else? 76 77 }; 77 78 78 79 plb { 79 - device_type = "ibm,plb"; 80 80 compatible = "ibm,plb-440gp", "ibm,plb4"; 81 81 #address-cells = <2>; 82 82 #size-cells = <1>; 83 83 ranges; 84 84 clock-frequency = <0>; // Filled in by zImage 85 85 86 - SDRAM0: sdram { 87 - device_type = "memory-controller"; 88 - compatible = "ibm,sdram-440gp", "ibm,sdram"; 86 + SDRAM0: memory-controller { 87 + compatible = "ibm,sdram-440gp"; 89 88 dcr-reg = <010 2>; 90 89 // FIXME: anything else? 91 90 }; 92 91 92 + SRAM0: sram { 93 + compatible = "ibm,sram-440gp"; 94 + dcr-reg = <020 8 00a 1>; 95 + }; 96 + 93 97 DMA0: dma { 94 98 // FIXME: ??? 95 - device_type = "ibm,dma-4xx"; 96 - compatible = "ibm,dma-440gp", "ibm,dma-4xx"; 99 + compatible = "ibm,dma-440gp"; 97 100 dcr-reg = <100 027>; 98 101 }; 99 102 100 103 MAL0: mcmal { 101 - device_type = "mcmal-dma"; 102 104 compatible = "ibm,mcmal-440gp", "ibm,mcmal"; 103 105 dcr-reg = <180 62>; 104 106 num-tx-chans = <4>; ··· 117 119 }; 118 120 119 121 POB0: opb { 120 - device_type = "ibm,opb"; 121 122 compatible = "ibm,opb-440gp", "ibm,opb"; 122 123 #address-cells = <1>; 123 124 #size-cells = <1>; ··· 130 133 clock-frequency = <0>; // Filled in by zImage 131 134 132 135 EBC0: ebc { 133 - device_type = "ibm,ebc"; 134 - compatible = "ibm,ebc-440gp"; 136 + compatible = "ibm,ebc-440gp", "ibm,ebc"; 135 137 dcr-reg = <012 2>; 136 138 #address-cells = <2>; 137 139 #size-cells = <1>; ··· 143 147 interrupts = <5 4>; 144 148 interrupt-parent = <&UIC1>; 145 149 146 - small-flash@0,0 { 150 + small-flash@0,80000 { 147 151 device_type = "rom"; 148 152 compatible = "direct-mapped"; 149 153 probe-type = "JEDEC"; ··· 155 159 156 160 ds1743@1,0 { 157 161 /* NVRAM & RTC */ 158 - device_type = "nvram"; 159 162 compatible = "ds1743"; 160 163 reg = <1 0 2000>; 161 164 }; ··· 165 170 probe-type = "JEDEC"; 166 171 bank-width = <1>; 167 172 partitions = <0 380000 168 - 280000 80000>; 173 + 380000 80000>; 169 174 partition-names = "fs", "firmware"; 170 175 reg = <2 0 400000>; 171 176 }; ··· 221 226 222 227 GPIO0: gpio@40000700 { 223 228 /* FIXME */ 224 - device_type = "gpio"; 225 229 compatible = "ibm,gpio-440gp"; 226 230 reg = <40000700 20>; 227 231 }; 228 232 229 233 ZMII0: emac-zmii@40000780 { 230 - device_type = "emac-zmii"; 231 234 compatible = "ibm,zmii-440gp", "ibm,zmii"; 232 235 reg = <40000780 c>; 233 236 }; ··· 292 299 293 300 chosen { 294 301 linux,stdout-path = "/plb/opb/serial@40000200"; 295 - // linux,initrd-start = <0>; /* FIXME */ 296 - // linux,initrd-end = <0>; 297 - // bootargs = ""; 298 302 }; 299 303 }; 300 -
+3 -3
arch/powerpc/platforms/44x/ebony.c
··· 27 27 #include "44x.h" 28 28 29 29 static struct of_device_id ebony_of_bus[] = { 30 - { .type = "ibm,plb", }, 31 - { .type = "ibm,opb", }, 32 - { .type = "ibm,ebc", }, 30 + { .compatible = "ibm,plb4", }, 31 + { .compatible = "ibm,opb", }, 32 + { .compatible = "ibm,ebc", }, 33 33 {}, 34 34 }; 35 35