From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from outmx020.isp.belgacom.be (outmx020.isp.belgacom.be [195.238.4.201]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTP id 1CF0CDDFC1 for ; Wed, 3 Jan 2007 09:53:27 +1100 (EST) Received: from outmx020.isp.belgacom.be (localhost [127.0.0.1]) by outmx020.isp.belgacom.be (8.12.11.20060308/8.12.11/Skynet-OUT-2.22) with ESMTP id l02MrMfT015516 for ; Tue, 2 Jan 2007 23:53:22 +0100 (envelope-from ) Message-ID: <459AE1EB.8090100@246tNt.com> Date: Tue, 02 Jan 2007 23:51:23 +0100 From: Sylvain Munaut MIME-Version: 1.0 To: grant.likely@secretlab.ca Subject: Re: [POWERPC] Fix mpc52xx fdt to use correct device_type for sound devices References: <11677778841167-git-send-email-grant.likely@secretlab.ca> In-Reply-To: <11677778841167-git-send-email-grant.likely@secretlab.ca> Content-Type: text/plain; charset=ISO-8859-1 Cc: linuxppc-dev@ozlabs.org, paulus@samba.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , grant.likely@secretlab.ca wrote: > From: Grant Likely > > Signed-off-by: Grant Likely > Acked-by: Sylvain Munaut > --- > > While technically this is not a bug fix as it doesn't touch any C code; > However, it does affect the documented interface for mpc52xx device trees. > Sound devices should be using 'sound' for the device_type field; not the > type of sound interface. I'd like to fix this issue before 2.6.20 to avoid > any confusion between .20 and .21 > > Cheers, > g. > > .../powerpc/mpc52xx-device-tree-bindings.txt | 4 ++-- > arch/powerpc/boot/dts/lite5200.dts | 4 ++-- > arch/powerpc/boot/dts/lite5200b.dts | 4 ++-- > 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 d077d76..7fb3b8a 100644 > --- a/Documentation/powerpc/mpc52xx-device-tree-bindings.txt > +++ b/Documentation/powerpc/mpc52xx-device-tree-bindings.txt > @@ -157,8 +157,8 @@ rtc@ rtc *-rtc Real time clock > mscan@ mscan *-mscan CAN bus controller > pci@ pci *-pci PCI bridge > serial@ serial *-psc-uart PSC in serial mode > -i2s@ i2s *-psc-i2s PSC in i2s mode > -ac97@ ac97 *-psc-ac97 PSC in ac97 mode > +i2s@ sound *-psc-i2s PSC in i2s mode > +ac97@ sound *-psc-ac97 PSC in ac97 mode > spi@ spi *-psc-spi PSC in spi mode > irda@ irda *-psc-irda PSC in IrDA mode > spi@ spi *-spi MPC52xx spi device > diff --git a/arch/powerpc/boot/dts/lite5200.dts b/arch/powerpc/boot/dts/lite5200.dts > index 8bc0d25..a8efb59 100644 > --- a/arch/powerpc/boot/dts/lite5200.dts > +++ b/arch/powerpc/boot/dts/lite5200.dts > @@ -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>; > diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts > index 81cb764..1aabee4 100644 > --- a/arch/powerpc/boot/dts/lite5200b.dts > +++ b/arch/powerpc/boot/dts/lite5200b.dts > @@ -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>; >