From: Sylvain Munaut <tnt@246tNt.com>
To: grant.likely@secretlab.ca
Cc: linuxppc-dev@ozlabs.org, paulus@samba.org
Subject: Re: [POWERPC] Fix mpc52xx fdt to use correct device_type for sound devices
Date: Tue, 02 Jan 2007 23:51:23 +0100 [thread overview]
Message-ID: <459AE1EB.8090100@246tNt.com> (raw)
In-Reply-To: <11677778841167-git-send-email-grant.likely@secretlab.ca>
grant.likely@secretlab.ca wrote:
> From: Grant Likely <grant.likely@secretlab.ca>
>
> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
>
Acked-by: Sylvain Munaut <tnt@246tNt.com>
> ---
>
> 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@<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
> 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>;
>
prev parent reply other threads:[~2007-01-02 22:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-02 22:44 [POWERPC] Fix mpc52xx fdt to use correct device_type for sound devices grant.likely
2007-01-02 22:51 ` Sylvain Munaut [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=459AE1EB.8090100@246tNt.com \
--to=tnt@246tnt.com \
--cc=grant.likely@secretlab.ca \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.