diff options
| author | Olof Johansson <olof@lixom.net> | 2012-12-13 01:10:45 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-12-13 01:10:45 +0100 |
| commit | 9c7466b217af784280d9fc841bbd559ef3bf33e9 (patch) | |
| tree | c21ee243e48912201b4041fbf3f9bd9165603bd8 /arch/powerpc/boot/dts/pcm030.dts | |
| parent | ARM: arm-soc: Merge branch 'next/clk' into next/pm (diff) | |
| parent | Merge tag 'tags/omap-for-v3.8/cleanup-multiplatform-no-clock-signed' of git:/... (diff) | |
| download | linux-9c7466b217af784280d9fc841bbd559ef3bf33e9.tar.xz linux-9c7466b217af784280d9fc841bbd559ef3bf33e9.zip | |
ARM: arm-soc: Merge branch 'next/pm2' into next/pm
Another smaller branch merged into next/pm before pull request.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/powerpc/boot/dts/pcm030.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/pcm030.dts | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/pcm030.dts b/arch/powerpc/boot/dts/pcm030.dts index 9e354997eb7e..96512c058033 100644 --- a/arch/powerpc/boot/dts/pcm030.dts +++ b/arch/powerpc/boot/dts/pcm030.dts @@ -59,7 +59,7 @@ #gpio-cells = <2>; }; - psc@2000 { /* PSC1 in ac97 mode */ + audioplatform: psc@2000 { /* PSC1 in ac97 mode */ compatible = "mpc5200b-psc-ac97","fsl,mpc5200b-psc-ac97"; cell-index = <0>; }; @@ -134,4 +134,9 @@ localbus { status = "disabled"; }; + + sound { + compatible = "phytec,pcm030-audio-fabric"; + asoc-platform = <&audioplatform>; + }; }; |