- Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] wm9713 and virtual Line mixer
by Robert Jarzmik 21 Jan '08

21 Jan '08

Trivial patch for the forgotten virtual line mixer in wm9713. Missing this mixer causes Mono Mixer and Speaker Mixer lack of support for input from Line Left and Line Right signals. -- Robert

2 1

[alsa-devel] "Help to debug" in ALSA wiki
by Jaroslav Kysela 21 Jan '08

21 Jan '08

Hi all, I would like to introduce "Help to debug" link in the ALSA wiki. The primary motivation is to provide information to users what we need to know to help us to debug things. Also next information is for potential developers to debug our code providing links to hardware specification and debug tools. Actually, I feel that especially for HDA support information is split in a group of main HDA developers, but we are lacking other links like how to compile ALSA driver from sources using a distribution or so. I would like to ask all developers to add and improve texts in this section of wiki, so we can just redirect users there (if required, of course). Thanks, Jaroslav ----- Jaroslav Kysela <perex(a)perex.cz> Linux Kernel Sound Maintainer ALSA Project, Red Hat, Inc.

1 0

[alsa-devel] [Fwd: problem with audigy2 ZS remote]
by Stefano Radaelli 20 Jan '08

20 Jan '08

The problem still exists. Also the mic on the livedrive panel don't works without initialization. If I start windows and reboot in linux the panel is initialized and works(that confirm it is not an hardware problem) Thanks -------- Messaggio Originale -------- Oggetto: problem with audigy2 ZS remote Data: Mon, 25 Jun 2007 18:47:59 +0200 Da: Stefano Radaelli <puttext(a)tiscali.it> A: alsa-devel(a)alsa-project.org Hi all! Sorry for my bad english. I have a problem with the livedrive of an audigy2 ZS. After some upgrades (on a gentoo linux system) the eternal panel seems to stop working. Even after the "initialization" (with echo on the midi device), the IR led not blink on remote action. This worked correctly in the past but after some upgrade (i don't know exactly what) it stoipped working. I don't known where i have to look (logs?) or what type of debugging it's necessary. Help me please

1 0

Re: [alsa-devel] Si3054 and Lenovo3000 n100
by Brian Hinz 20 Jan '08

20 Jan '08

11c1:1040 is not an SiLabs chip, it's an agere - see alsa bug #0003316: https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3316 and agere still has not released a driver or documentation yet: http://linmodems.technion.ac.il/archive-seventh/msg03029.html it probably should be removed from patch_si3054.c though... -brian ------------------------------ Message: 3 Date: Mon, 14 Jan 2008 12:07:15 +0100 From: Takashi Iwai Subject: Re: [alsa-devel] Si3054 and Lenovo3000 n100 To: Vasily Khoruzhick Cc: Andy Shevchenko , alsa-devel(a)alsa-project.org Message-ID: Content-Type: text/plain; charset=US-ASCII At Sun, 13 Jan 2008 19:10:44 +0200, Vasily Khoruzhick wrote: > > On 13 January 2008 18:15:06 Andy Shevchenko wrote: >> Hi Vasily Khoruzhick! >> >> On Sun, Jan 13, 2008 at 04:49:45PM +0200, Vasily Khoruzhick wrote next: >>> Hi, I have problems with setting up internal modem (regular si3054 >>> sitting on hda bus) with subj notebook. >> >> Do you belive that the Si3054 clone? What is ids of your modem codec? >> If you get 11c1:1040 you lose this game. >> >> P.S. IIRC the n200 has unsupported modem codec. I guess your model too. > > Btw, if it isn't compatible with Si3054, why its id added to patch_si3054.c > file? Possibly mistakenly :) Takashi

1 0

[alsa-devel] conversion of opti93x driver to use cs4231-lib
by Krzysztof Helt 20 Jan '08

20 Jan '08

Hi, I posted some time ago two patches which converts opti93x driver to use cs4231-lib library. The opti93x chips are almost compatible with the cs4231 differing mostly by mixer. This change greatly reduces the source of the opti drivers. Here are patches: [addition of opti93x details to the cs4231-lib] http://mailman.alsa-project.org/pipermail/alsa-devel/2007-September/003395.… and [conversion of opti93x driver to use cs4231-lib] http://mailman.alsa-project.org/pipermail/alsa-devel/2007-September/003396.… I will rediff the second patch as there were some changes to opti93x driver after sending the patch. If it is not a good idea to do such conversion, please reply and drop patches. Regards, Krzysztof ------------------------------------------------------------ Walcz w kosmicznej wojnie w nowej grze! Kliknij >>> http://link.interia.pl/f1cc1

5 7

[alsa-devel] Last call - get on the linux dev Gadget Labs card mailing list if you want to be notified
by Mike Mazarick 19 Jan '08

19 Jan '08

There is a project to develop a Gadget Labs Alsa driver for Linux audio. A mailing list has been established for this project so people could track the progress and release to the public of the linux driver for the GL card. There are currently ~10 people subscribed (it's a very small list). If you have any interest in knowing when a linux driver is available for this card, I'd highly recommend following the progress by subscribing to the mailing list. This will be significant to you primarily if you have a Gadget Labs card and want to use it with Mac OS X, because it will start to be feasible (and relatively easy) to have a Mac OS X driver when a linux driver is complete. It is also significant to you if you want an inexpensive way to get 8 channels of analog in/out from your computer with a high quality audio using linux audio tools. The Gadget Labs card was 'state of the art' 8 years ago, and is currently the least expensive way to get more than 4 channels of studio quality input/output to/from your computer (however, the other cards available are also excellent and close in price). Of course, we are always interested in anyone that can help with this effort by providing beta testing of the software, assistance with coding the driver, assistance with documentation, general 'cheering us on' and encouragement, etc. The list is scheduled to go 'private' and available for subscribers only in 5 days or less. If you are interested in this, please subscribe before the list goes 'private'. You will be able to subscribe after the list goes private, but won't be able to see postings with the latest information until after you have subscribed and been approved by the mailing list moderator. The way to subscribe to the mailing list is here: https://lists.sourceforge.net/lists/listinfo/wavepro-driver-developers The project summary page is here: http://sourceforge.net/projects/wavepro-driver/ The project web page is here: http://wavepro-driver.sourceforge.net/ -Mike Mazarick

1 0

Re: [alsa-devel] [PATCH] Change of cold reset and ac97 register cache
by Robert Jarzmik 19 Jan '08

19 Jan '08

Mark Brown <broonie(a)opensource.wolfsonmicro.com> writes: > Just to clarify, it is the initial reset on chip probe that is causing > problems for you rather than a call later on? If the driver state and > chip state are out of sync after that then that suggests that there is > an error in the register defaults or some other similar issue. It's the initial on chip probe in my case. > > After that, I need to setup a specific GPIO to trigger loud speaker > > amplificator. The trouble is that I do not want to trigger another GPIO which > > powers another amplificator. > > My code basically reads de GPIO register, put the right bit, and stores back. > > But because of cache/chip difference, I trigger the other GPIO. > > How exactly are you doing these accesses and which registers is it that > trigger the problem - is it setting the GPIO state or configuring the > GPIO pin modes? I'm setting up a wm9713 GPIO (GPIO8) as input, and then set the pull-up register to power my speaker amplification. As we said, I'll implement a machine dependent solution, assuming there'll be in the future a mecanism in ASoC v2 allowing hook inscription for the reset phase. I'll synchronize the cache in this specific function, and will wait ASoC to catch up or propose a patch. -- Robert PS: Sorry for the list, in my last reply I forgot alsa-devel.

2 1

[alsa-devel] [PATCH] hda_codec: Added power management for ADC/DAC's
by Matthew Ranostay 19 Jan '08

19 Jan '08

Added power management support to muted DACs and ADCs. They are set into D3 state when both channels are muted, and D0 when unmuted. We specify the ADC in the HDA_CODEC_MUTE_IDX instead of the ADC mux, so that we can easily know which node to power manage, and we use the connection list to get the needed mux node. Signed-off-by: Matthew Ranostay <mranostay(a)embeddedalley.com> --- diff -r 1cb5fe1b2443 pci/hda/hda_codec.c --- a/pci/hda/hda_codec.c Thu Jan 17 17:44:49 2008 +0100 +++ b/pci/hda/hda_codec.c Fri Jan 18 11:16:36 2008 -0500 @@ -1091,11 +1091,19 @@ int snd_hda_mixer_amp_switch_get(struct { struct hda_codec *codec = snd_kcontrol_chip(kcontrol); hda_nid_t nid = get_amp_nid(kcontrol); + hda_nid_t conn_list[1]; int chs = get_amp_channels(kcontrol); int dir = get_amp_direction(kcontrol); int idx = get_amp_index(kcontrol); + int wcaps = get_wcaps(codec, nid); + int wtype = (wcaps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; long *valp = ucontrol->value.integer.value; + /* if pin is a adc get the mux connection */ + if (wtype == AC_WID_AUD_IN) { + snd_hda_get_connections(codec, nid, conn_list, 1); + nid = conn_list[0]; + } if (chs & 1) *valp++ = (snd_hda_codec_amp_read(codec, nid, 0, dir, idx) & HDA_AMP_MUTE) ? 0 : 1; @@ -1109,24 +1117,52 @@ int snd_hda_mixer_amp_switch_put(struct struct snd_ctl_elem_value *ucontrol) { struct hda_codec *codec = snd_kcontrol_chip(kcontrol); + hda_nid_t ctl_nid = get_amp_nid(kcontrol); hda_nid_t nid = get_amp_nid(kcontrol); + hda_nid_t conn_list[1]; int chs = get_amp_channels(kcontrol); int dir = get_amp_direction(kcontrol); int idx = get_amp_index(kcontrol); + int wcaps = get_wcaps(codec, nid); + int wtype = (wcaps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; long *valp = ucontrol->value.integer.value; - int change = 0; + int change = 0, val = 0; snd_hda_power_up(codec); + /* if pin is a adc get the mux connection */ + if (wtype == AC_WID_AUD_IN) { + snd_hda_get_connections(codec, nid, conn_list, 1); + nid = conn_list[0]; + } if (chs & 1) { change = snd_hda_codec_amp_update(codec, nid, 0, dir, idx, HDA_AMP_MUTE, *valp ? 0 : HDA_AMP_MUTE); + val = !*valp; valp++; } - if (chs & 2) + if (chs & 2) { change |= snd_hda_codec_amp_update(codec, nid, 1, dir, idx, HDA_AMP_MUTE, *valp ? 0 : HDA_AMP_MUTE); + val &= !*valp; + } + + /* check for power management support */ + if ((wcaps & AC_WCAP_POWER) && (wcaps != AC_WID_AUD_MIX)) { + if ((chs != 3) && (wcaps & AC_WCAP_STEREO)) { + struct hda_amp_info *info; + info = get_alloc_amp_hash(codec, + HDA_HASH_KEY(nid, dir, idx)); + /* get the other channel value */ + val &= !(get_vol_mute(codec, info, nid, + ~chs & 3, dir, idx) & HDA_AMP_MUTE); + } + /* power down adc/dac if both channels are muted */ + snd_hda_codec_write(codec, ctl_nid, 0, AC_VERB_SET_POWER_STATE, + val ? AC_PWRST_D3 : 0); + } + #ifdef CONFIG_SND_HDA_POWER_SAVE if (codec->patch_ops.check_power_status) codec->patch_ops.check_power_status(codec, nid); diff -r 1cb5fe1b2443 pci/hda/patch_sigmatel.c --- a/pci/hda/patch_sigmatel.c Thu Jan 17 17:44:49 2008 +0100 +++ b/pci/hda/patch_sigmatel.c Thu Jan 17 20:17:50 2008 -0500 @@ -638,10 +638,10 @@ static struct snd_kcontrol_new stac92hd7 STAC_ANALOG_LOOPBACK(0xFA0, 0x7A1, 3), HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x20, 0x0, HDA_OUTPUT), - HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x20, 0x0, HDA_OUTPUT), + HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1a, 0x0, HDA_OUTPUT), HDA_CODEC_VOLUME_IDX("Capture Volume", 0x1, 0x21, 0x0, HDA_OUTPUT), - HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x21, 0x0, HDA_OUTPUT), + HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x1b, 0x0, HDA_OUTPUT), HDA_CODEC_VOLUME("Front Mic Mixer Capture Volume", 0x1d, 0, HDA_INPUT), HDA_CODEC_MUTE("Front Mic Mixer Capture Switch", 0x1d, 0, HDA_INPUT), @@ -664,10 +664,10 @@ static struct snd_kcontrol_new stac92hd7 STAC_ANALOG_LOOPBACK(0xFA0, 0x7A1, 4), HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x20, 0x0, HDA_OUTPUT), - HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x20, 0x0, HDA_OUTPUT), + HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1a, 0x0, HDA_OUTPUT), HDA_CODEC_VOLUME_IDX("Capture Volume", 0x1, 0x21, 0x0, HDA_OUTPUT), - HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x21, 0x0, HDA_OUTPUT), + HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x1b, 0x0, HDA_OUTPUT), HDA_CODEC_VOLUME("Front Mic Mixer Capture Volume", 0x1d, 0, HDA_INPUT), HDA_CODEC_MUTE("Front Mic Mixer Capture Switch", 0x1d, 0, HDA_INPUT), @@ -690,10 +690,10 @@ static struct snd_kcontrol_new stac92hd7 STAC_ANALOG_LOOPBACK(0xFA0, 0x7A1, 5), HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x20, 0x0, HDA_OUTPUT), - HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x20, 0x0, HDA_OUTPUT), + HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1a, 0x0, HDA_OUTPUT), HDA_CODEC_VOLUME_IDX("Capture Volume", 0x1, 0x21, 0x0, HDA_OUTPUT), - HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x21, 0x0, HDA_OUTPUT), + HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x1b, 0x0, HDA_OUTPUT), HDA_CODEC_VOLUME("Front Mic Mixer Capture Volume", 0x1d, 0, HDA_INPUT), HDA_CODEC_MUTE("Front Mic Mixer Capture Switch", 0x1d, 0, HDA_INPUT), @@ -716,11 +716,11 @@ static struct snd_kcontrol_new stac92hd7 STAC_INPUT_SOURCE(2), HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x1c, 0x0, HDA_OUTPUT), - HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1c, 0x0, HDA_OUTPUT), + HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x12, 0x0, HDA_OUTPUT), HDA_CODEC_VOLUME_IDX("Capture Mux Volume", 0x0, 0x1a, 0x0, HDA_OUTPUT), HDA_CODEC_VOLUME_IDX("Capture Volume", 0x1, 0x1d, 0x0, HDA_OUTPUT), - HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x1d, 0x0, HDA_OUTPUT), + HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x13, 0x0, HDA_OUTPUT), HDA_CODEC_VOLUME_IDX("Capture Mux Volume", 0x1, 0x1b, 0x0, HDA_OUTPUT), HDA_CODEC_MUTE("Analog Loopback 1", 0x17, 0x3, HDA_INPUT), @@ -735,11 +735,11 @@ static struct snd_kcontrol_new stac92hd7 STAC_ANALOG_LOOPBACK(0xFA0, 0x7A0, 2), HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x1c, 0x0, HDA_OUTPUT), - HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1c, 0x0, HDA_OUTPUT), + HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x12, 0x0, HDA_OUTPUT), HDA_CODEC_VOLUME_IDX("Capture Mux Volume", 0x0, 0x1a, 0x0, HDA_OUTPUT), HDA_CODEC_VOLUME_IDX("Capture Volume", 0x1, 0x1d, 0x0, HDA_OUTPUT), - HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x1d, 0x0, HDA_OUTPUT), + HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x13, 0x0, HDA_OUTPUT), HDA_CODEC_VOLUME_IDX("Capture Mux Volume", 0x1, 0x1b, 0x0, HDA_OUTPUT), HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x14, 0x1, 0, HDA_INPUT),

2 1

[alsa-devel] HDA codec graphing
by Claudio Matsuoka 19 Jan '08

19 Jan '08

After a lot of time published only as a git repository, I created a page and tarball for Eduardo Habkost's codecgraph tool to graph the layout of HDA codecs. It may be useful for those tweaking or troubleshooting existing drivers. The page has also examples of different codec layouts rendered in SVG. See details at http://helllabs.org/codecgraph/.

5 10

[alsa-devel] [PATCH v4] [POWERPC] Update MPC8610 HPCD to support audio drivers
by Timur Tabi 18 Jan '08

18 Jan '08

Update the MPC8610 HPCD files to support the audio driver. Update booting-without-of.txt with information on the SSI device. Signed-off-by: Timur Tabi <timur(a)freescale.com> --- Rebased for Kumar's repo. Documentation/powerpc/booting-without-of.txt | 41 ++++++ arch/powerpc/boot/dts/mpc8610_hpcd.dts | 113 +++++++++++++++++- arch/powerpc/configs/mpc8610_hpcd_defconfig | 171 +++++++++++++++++++++++++- arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 15 +++ 4 files changed, 336 insertions(+), 4 deletions(-) diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt index a13d457..6ac726d 100644 --- a/Documentation/powerpc/booting-without-of.txt +++ b/Documentation/powerpc/booting-without-of.txt @@ -56,6 +56,7 @@ Table of Contents m) Chipselect/Local Bus n) 4xx/Axon EMAC ethernet nodes o) Xilinx IP cores + p) Freescale Synchronous Serial Interface VII - Specifying interrupt information for devices 1) interrupts property @@ -2575,6 +2576,46 @@ platforms are moved over to use the flattened-device-tree model. Requred properties: - current-speed : Baud rate of uartlite + p) Freescale Synchronous Serial Interface + + The SSI is a serial device that communicates with audio codecs. It can + be programmed in AC97, I2S, left-justified, or right-justified modes. + + Required properties: + - compatible : compatible list, containing "fsl,ssi" + - cell-index : the SSI, <0> = SSI1, <1> = SSI2, and so on + - reg : offset and length of the register set for the device + - interrupts : <a b> where a is the interrupt number and b is a + field that represents an encoding of the sense and + level information for the interrupt. This should be + encoded based on the information in section 2) + depending on the type of interrupt controller you + have. + - interrupt-parent : the phandle for the interrupt controller that + services interrupts for this device. + - fsl,mode : the operating mode for the SSI interface + "i2s-slave" - I2S mode, SSI is clock slave + "i2s-master" - I2S mode, SSI is clock master + "lj-slave" - left-justified mode, SSI is clock slave + "lj-master" - l.j. mode, SSI is clock master + "rj-slave" - right-justified mode, SSI is clock slave + "rj-master" - r.j., SSI is clock master + "ac97-slave" - AC97 mode, SSI is clock slave + "ac97-master" - AC97 mode, SSI is clock master + + Optional properties: + - codec-handle : phandle to a 'codec' node that defines an audio + codec connected to this SSI. This node is typically + a child of an I2C or other control node. + + Child 'codec' node required properties: + - compatible : compatible list, contains the name of the codec + + Child 'codec' node optional properties: + - clock-frequency : The frequency of the input clock, which typically + comes from an on-board dedicated oscillator. + + More devices will be defined as this spec matures. VII - Specifying interrupt information for devices diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts index 01040a7..d98715c 100644 --- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts +++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts @@ -1,7 +1,7 @@ /* * MPC8610 HPCD Device Tree Source * - * Copyright 2007 Freescale Semiconductor Inc. + * Copyright 2007-2008 Freescale Semiconductor Inc. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License Version 2 as published @@ -49,6 +49,7 @@ #size-cells = <1>; #interrupt-cells = <2>; device_type = "soc"; + compatible = "fsl,mpc8610-immr", "simple-bus"; ranges = <0 e0000000 00100000>; reg = <e0000000 1000>; bus-frequency = <0>; @@ -62,6 +63,13 @@ interrupts = <2b 2>; interrupt-parent = <&mpic>; dfsrr; + + cs4270:codec@4f { + compatible = "cirrus,cs4270"; + reg = <4f>; + /* MCLK source is a stand-alone oscillator */ + clock-frequency = <bb8000>; + }; }; i2c@3100 { @@ -111,6 +119,109 @@ reg = <e0000 1000>; fsl,has-rstcr; }; + + i2s@16000 { + compatible = "fsl,mpc8610-ssi"; + cell-index = <0>; + reg = <16000 100>; + interrupt-parent = <&mpic>; + interrupts = <3e 2>; + fsl,mode = "i2s-slave"; + codec-handle = <&cs4270>; + }; + + ssi@16100 { + compatible = "fsl,mpc8610-ssi"; + cell-index = <1>; + reg = <16100 100>; + interrupt-parent = <&mpic>; + interrupts = <3f 2>; + }; + + dma@21300 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "fsl,mpc8610-dma", "fsl,eloplus-dma"; + cell-index = <0>; + reg = <21300 4>; /* DMA general status register */ + ranges = <0 21100 200>; + + dma-channel@0 { + compatible = "fsl,mpc8610-dma-channel", + "fsl,eloplus-dma-channel"; + cell-index = <0>; + reg = <0 80>; + interrupt-parent = <&mpic>; + interrupts = <14 2>; + }; + dma-channel@1 { + compatible = "fsl,mpc8610-dma-channel", + "fsl,eloplus-dma-channel"; + cell-index = <1>; + reg = <80 80>; + interrupt-parent = <&mpic>; + interrupts = <15 2>; + }; + dma-channel@2 { + compatible = "fsl,mpc8610-dma-channel", + "fsl,eloplus-dma-channel"; + cell-index = <2>; + reg = <100 80>; + interrupt-parent = <&mpic>; + interrupts = <16 2>; + }; + dma-channel@3 { + compatible = "fsl,mpc8610-dma-channel", + "fsl,eloplus-dma-channel"; + cell-index = <3>; + reg = <180 80>; + interrupt-parent = <&mpic>; + interrupts = <17 2>; + }; + }; + + dma@c300 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "fsl,mpc8610-dma", "fsl,mpc8540-dma"; + cell-index = <1>; + reg = <c300 4>; /* DMA general status register */ + ranges = <0 c100 200>; + + dma-channel@0 { + compatible = "fsl,mpc8610-dma-channel", + "fsl,mpc8540-dma-channel"; + cell-index = <0>; + reg = <0 80>; + interrupt-parent = <&mpic>; + interrupts = <3c 2>; + }; + dma-channel@1 { + compatible = "fsl,mpc8610-dma-channel", + "fsl,mpc8540-dma-channel"; + cell-index = <1>; + reg = <80 80>; + interrupt-parent = <&mpic>; + interrupts = <3d 2>; + }; + dma-channel@2 { + compatible = "fsl,mpc8610-dma-channel", + "fsl,mpc8540-dma-channel"; + cell-index = <2>; + reg = <100 80>; + interrupt-parent = <&mpic>; + interrupts = <3e 2>; + }; + dma-channel@3 { + compatible = "fsl,mpc8610-dma-channel", + "fsl,mpc8540-dma-channel"; + cell-index = <3>; + reg = <180 80>; + interrupt-parent = <&mpic>; + interrupts = <3f 2>; + }; + }; + }; pci0: pci@e0008000 { diff --git a/arch/powerpc/configs/mpc8610_hpcd_defconfig b/arch/powerpc/configs/mpc8610_hpcd_defconfig index 9614d24..2500ef4 100644 --- a/arch/powerpc/configs/mpc8610_hpcd_defconfig +++ b/arch/powerpc/configs/mpc8610_hpcd_defconfig @@ -696,7 +696,7 @@ CONFIG_SERIAL_8250_RSA=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_JSM is not set -CONFIG_SERIAL_OF_PLATFORM=y +# CONFIG_SERIAL_OF_PLATFORM is not set CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # CONFIG_IPMI_HANDLER is not set @@ -708,7 +708,60 @@ CONFIG_UNIX98_PTYS=y # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set CONFIG_DEVPORT=y -# CONFIG_I2C is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +# CONFIG_I2C_CHARDEV is not set + +# +# I2C Algorithms +# +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +# CONFIG_I2C_ALI1535 is not set +# CONFIG_I2C_ALI1563 is not set +# CONFIG_I2C_ALI15X3 is not set +# CONFIG_I2C_AMD756 is not set +# CONFIG_I2C_AMD8111 is not set +# CONFIG_I2C_I801 is not set +# CONFIG_I2C_I810 is not set +# CONFIG_I2C_PIIX4 is not set +CONFIG_I2C_MPC=y +# CONFIG_I2C_NFORCE2 is not set +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_PROSAVAGE is not set +# CONFIG_I2C_SAVAGE4 is not set +# CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set +# CONFIG_I2C_VOODOO3 is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_DS1682 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_M41T00 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set # # SPI support @@ -763,7 +816,119 @@ CONFIG_DUMMY_CONSOLE=y # # Sound # -# CONFIG_SOUND is not set +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y +# CONFIG_SND_PCM_OSS_PLUGINS is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +# CONFIG_SND_SUPPORT_OLD_API is not set +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# PCI devices +# +# CONFIG_SND_AD1889 is not set +# CONFIG_SND_ALS300 is not set +# CONFIG_SND_ALS4000 is not set +# CONFIG_SND_ALI5451 is not set +# CONFIG_SND_ATIIXP is not set +# CONFIG_SND_ATIIXP_MODEM is not set +# CONFIG_SND_AU8810 is not set +# CONFIG_SND_AU8820 is not set +# CONFIG_SND_AU8830 is not set +# CONFIG_SND_AZT3328 is not set +# CONFIG_SND_BT87X is not set +# CONFIG_SND_CA0106 is not set +# CONFIG_SND_CMIPCI is not set +# CONFIG_SND_CS4281 is not set +# CONFIG_SND_CS46XX is not set +# CONFIG_SND_CS5530 is not set +# CONFIG_SND_DARLA20 is not set +# CONFIG_SND_GINA20 is not set +# CONFIG_SND_LAYLA20 is not set +# CONFIG_SND_DARLA24 is not set +# CONFIG_SND_GINA24 is not set +# CONFIG_SND_LAYLA24 is not set +# CONFIG_SND_MONA is not set +# CONFIG_SND_MIA is not set +# CONFIG_SND_ECHO3G is not set +# CONFIG_SND_INDIGO is not set +# CONFIG_SND_INDIGOIO is not set +# CONFIG_SND_INDIGODJ is not set +# CONFIG_SND_EMU10K1 is not set +# CONFIG_SND_EMU10K1X is not set +# CONFIG_SND_ENS1370 is not set +# CONFIG_SND_ENS1371 is not set +# CONFIG_SND_ES1938 is not set +# CONFIG_SND_ES1968 is not set +# CONFIG_SND_FM801 is not set +# CONFIG_SND_HDA_INTEL is not set +# CONFIG_SND_HDSP is not set +# CONFIG_SND_HDSPM is not set +# CONFIG_SND_ICE1712 is not set +# CONFIG_SND_ICE1724 is not set +# CONFIG_SND_INTEL8X0 is not set +# CONFIG_SND_INTEL8X0M is not set +# CONFIG_SND_KORG1212 is not set +# CONFIG_SND_MAESTRO3 is not set +# CONFIG_SND_MIXART is not set +# CONFIG_SND_NM256 is not set +# CONFIG_SND_PCXHR is not set +# CONFIG_SND_RIPTIDE is not set +# CONFIG_SND_RME32 is not set +# CONFIG_SND_RME96 is not set +# CONFIG_SND_RME9652 is not set +# CONFIG_SND_SONICVIBES is not set +# CONFIG_SND_TRIDENT is not set +# CONFIG_SND_VIA82XX is not set +# CONFIG_SND_VIA82XX_MODEM is not set +# CONFIG_SND_VX222 is not set +# CONFIG_SND_YMFPCI is not set + +# +# ALSA PowerMac devices +# + +# +# ALSA PowerPC devices +# + +# +# System on Chip audio support +# +CONFIG_SND_SOC=y + +# +# SoC Audio support for SuperH +# + +# +# ALSA SoC audio for Freescale SOCs +# +CONFIG_SND_SOC_MPC8610=y +CONFIG_SND_SOC_MPC8610_HPCD=y +CONFIG_SND_SOC_CS4270=y +CONFIG_SND_SOC_CS4270_VD33_ERRATA=y + CONFIG_HID_SUPPORT=y CONFIG_HID=y # CONFIG_HID_DEBUG is not set diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c index c6d2f48..0b07485 100644 --- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c +++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c @@ -34,9 +34,24 @@ #include <asm/mpic.h> +#include <linux/of_platform.h> #include <sysdev/fsl_pci.h> #include <sysdev/fsl_soc.h> +static struct of_device_id __initdata mpc8610_ids[] = { + { .compatible = "fsl,mpc8610-immr", }, + {} +}; + +static int __init mpc8610_declare_of_platform_devices(void) +{ + /* Without this call, the SSI device driver won't get probed. */ + of_platform_bus_probe(NULL, mpc8610_ids, NULL); + + return 0; +} +machine_device_initcall(mpc86xx_hpcd, mpc8610_declare_of_platform_devices); + void __init mpc86xx_hpcd_init_irq(void) { -- 1.5.2.4

2 1