Skip to content

Commit

Permalink
[POWERPC] Fix mpc52xx fdt to use correct device_type for sound devices
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Grant Likely authored and Paul Mackerras committed Jan 9, 2007
1 parent 5c334ee commit a5b6ad6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Documentation/powerpc/mpc52xx-device-tree-bindings.txt
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@ rtc@<addr> rtc *-rtc Real time clock
mscan@<addr> mscan *-mscan CAN bus controller
pci@<addr> pci *-pci PCI bridge
serial@<addr> serial *-psc-uart PSC in serial mode
i2s@<addr> i2s *-psc-i2s PSC in i2s mode
ac97@<addr> ac97 *-psc-ac97 PSC in ac97 mode
i2s@<addr> sound *-psc-i2s PSC in i2s mode
ac97@<addr> sound *-psc-ac97 PSC in ac97 mode
spi@<addr> spi *-psc-spi PSC in spi mode
irda@<addr> irda *-psc-irda PSC in IrDA mode
spi@<addr> spi *-spi MPC52xx spi device
Expand Down
4 changes: 2 additions & 2 deletions arch/powerpc/boot/dts/lite5200.dts
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@

// PSC3 in CODEC mode example
i2s@2400 { // PSC3
device_type = "i2s";
device_type = "sound";
compatible = "mpc5200-psc-i2s\0mpc52xx-psc-i2s";
reg = <2400 100>;
interrupts = <2 3 0>;
Expand All @@ -265,7 +265,7 @@

// PSC6 in AC97 mode example
ac97@2c00 { // PSC6
device_type = "ac97";
device_type = "sound";
compatible = "mpc5200-psc-ac97\0mpc52xx-psc-ac97";
reg = <2c00 100>;
interrupts = <2 4 0>;
Expand Down
4 changes: 2 additions & 2 deletions arch/powerpc/boot/dts/lite5200b.dts
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@

// PSC3 in CODEC mode example
i2s@2400 { // PSC3
device_type = "i2s";
device_type = "sound";
compatible = "mpc5200b-psc-i2s\0mpc52xx-psc-i2s";
reg = <2400 100>;
interrupts = <2 3 0>;
Expand All @@ -270,7 +270,7 @@

// PSC6 in AC97 mode example
ac97@2c00 { // PSC6
device_type = "ac97";
device_type = "sound";
compatible = "mpc5200b-psc-ac97\0mpc52xx-psc-ac97";
reg = <2c00 100>;
interrupts = <2 4 0>;
Expand Down

0 comments on commit a5b6ad6

Please sign in to comment.