aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2007-01-02 17:44:44 -0500
committerPaul Mackerras <paulus@samba.org>2007-01-09 01:03:02 -0500
commita5b6ad6691763ee5eba46665d014d5abfe433df2 (patch)
treea25799e05b039915ba9c0e3c6b0ede56e360bf50
parent5c334eed6ecd66cebfbc80267149e755510d8bc8 (diff)
[POWERPC] Fix mpc52xx fdt to use correct device_type for sound devices
This corrects the documented interface for mpc52xx device trees. Sound devices should be using 'sound' for the device_type field, not the type of sound interface. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Sylvain Munaut <tnt@246tNt.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--Documentation/powerpc/mpc52xx-device-tree-bindings.txt4
-rw-r--r--arch/powerpc/boot/dts/lite5200.dts4
-rw-r--r--arch/powerpc/boot/dts/lite5200b.dts4
3 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/powerpc/mpc52xx-device-tree-bindings.txt b/Documentation/powerpc/mpc52xx-device-tree-bindings.txt
index d077d764f82b..7fb3b8a44eb6 100644
--- a/Documentation/powerpc/mpc52xx-device-tree-bindings.txt
+++ b/Documentation/powerpc/mpc52xx-device-tree-bindings.txt
@@ -157,8 +157,8 @@ rtc@<addr> rtc *-rtc Real time clock
157mscan@<addr> mscan *-mscan CAN bus controller 157mscan@<addr> mscan *-mscan CAN bus controller
158pci@<addr> pci *-pci PCI bridge 158pci@<addr> pci *-pci PCI bridge
159serial@<addr> serial *-psc-uart PSC in serial mode 159serial@<addr> serial *-psc-uart PSC in serial mode
160i2s@<addr> i2s *-psc-i2s PSC in i2s mode 160i2s@<addr> sound *-psc-i2s PSC in i2s mode
161ac97@<addr> ac97 *-psc-ac97 PSC in ac97 mode 161ac97@<addr> sound *-psc-ac97 PSC in ac97 mode
162spi@<addr> spi *-psc-spi PSC in spi mode 162spi@<addr> spi *-psc-spi PSC in spi mode
163irda@<addr> irda *-psc-irda PSC in IrDA mode 163irda@<addr> irda *-psc-irda PSC in IrDA mode
164spi@<addr> spi *-spi MPC52xx spi device 164spi@<addr> spi *-spi MPC52xx spi device
diff --git a/arch/powerpc/boot/dts/lite5200.dts b/arch/powerpc/boot/dts/lite5200.dts
index 8bc0d259796d..a8efb59f5dd7 100644
--- a/arch/powerpc/boot/dts/lite5200.dts
+++ b/arch/powerpc/boot/dts/lite5200.dts
@@ -238,7 +238,7 @@
238 238
239 // PSC3 in CODEC mode example 239 // PSC3 in CODEC mode example
240 i2s@2400 { // PSC3 240 i2s@2400 { // PSC3
241 device_type = "i2s"; 241 device_type = "sound";
242 compatible = "mpc5200-psc-i2s\0mpc52xx-psc-i2s"; 242 compatible = "mpc5200-psc-i2s\0mpc52xx-psc-i2s";
243 reg = <2400 100>; 243 reg = <2400 100>;
244 interrupts = <2 3 0>; 244 interrupts = <2 3 0>;
@@ -265,7 +265,7 @@
265 265
266 // PSC6 in AC97 mode example 266 // PSC6 in AC97 mode example
267 ac97@2c00 { // PSC6 267 ac97@2c00 { // PSC6
268 device_type = "ac97"; 268 device_type = "sound";
269 compatible = "mpc5200-psc-ac97\0mpc52xx-psc-ac97"; 269 compatible = "mpc5200-psc-ac97\0mpc52xx-psc-ac97";
270 reg = <2c00 100>; 270 reg = <2c00 100>;
271 interrupts = <2 4 0>; 271 interrupts = <2 4 0>;
diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts
index 81cb76418a78..1aabee432d86 100644
--- a/arch/powerpc/boot/dts/lite5200b.dts
+++ b/arch/powerpc/boot/dts/lite5200b.dts
@@ -243,7 +243,7 @@
243 243
244 // PSC3 in CODEC mode example 244 // PSC3 in CODEC mode example
245 i2s@2400 { // PSC3 245 i2s@2400 { // PSC3
246 device_type = "i2s"; 246 device_type = "sound";
247 compatible = "mpc5200b-psc-i2s\0mpc52xx-psc-i2s"; 247 compatible = "mpc5200b-psc-i2s\0mpc52xx-psc-i2s";
248 reg = <2400 100>; 248 reg = <2400 100>;
249 interrupts = <2 3 0>; 249 interrupts = <2 3 0>;
@@ -270,7 +270,7 @@
270 270
271 // PSC6 in AC97 mode example 271 // PSC6 in AC97 mode example
272 ac97@2c00 { // PSC6 272 ac97@2c00 { // PSC6
273 device_type = "ac97"; 273 device_type = "sound";
274 compatible = "mpc5200b-psc-ac97\0mpc52xx-psc-ac97"; 274 compatible = "mpc5200b-psc-ac97\0mpc52xx-psc-ac97";
275 reg = <2c00 100>; 275 reg = <2c00 100>;
276 interrupts = <2 4 0>; 276 interrupts = <2 4 0>;