Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5b6ad66 authored by Grant Likely's avatar Grant Likely Committed by Paul Mackerras
Browse files

[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: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarSylvain Munaut <tnt@246tNt.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 5c334eed

Documentation/powerpc/mpc52xx-device-tree-bindings.txt

+2 −2
Original line number Diff line number Diff line
@@ -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

arch/powerpc/boot/dts/lite5200.dts

+2 −2
Original line number Diff line number Diff line
@@ -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>;
@@ -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>;

arch/powerpc/boot/dts/lite5200b.dts

+2 −2
Original line number Diff line number Diff line
@@ -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>;
@@ -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>;