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

[alsa-devel] [PATCH] sound: pci: ctxfi: ctatc.c: printk replacement
by Sudip Mukherjee 26 Aug '14

26 Aug '14

printk replaced ith corresponding pr_err fixed three broken user-visible strings fixed a checkpatch warning of space before new line Signed-off-by: Sudip Mukherjee <sudip(a)vectorindia.org> --- sound/pci/ctxfi/ctatc.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c index af632bd..41597a8 100644 --- a/sound/pci/ctxfi/ctatc.c +++ b/sound/pci/ctxfi/ctatc.c @@ -185,7 +185,7 @@ static unsigned int convert_format(snd_pcm_format_t snd_format) case SNDRV_PCM_FORMAT_FLOAT_LE: return SRC_SF_F32; default: - printk(KERN_ERR "ctxfi: not recognized snd format is %d \n", + pr_err("ctxfi: not recognized snd format is %d\n", snd_format); return SRC_SF_S16; } @@ -1282,7 +1282,7 @@ static int atc_identify_card(struct ct_atc *atc, unsigned int ssid) p = snd_pci_quirk_lookup_id(vendor_id, device_id, list); if (p) { if (p->value < 0) { - printk(KERN_ERR "ctxfi: " + pr_err("ctxfi: " "Device %04x:%04x is black-listed\n", vendor_id, device_id); return -ENOENT; @@ -1315,8 +1315,7 @@ int ct_atc_create_alsa_devs(struct ct_atc *atc) err = alsa_dev_funcs[i].create(atc, i, alsa_dev_funcs[i].public_name); if (err) { - printk(KERN_ERR "ctxfi: " - "Creating alsa device %d failed!\n", i); + pr_err("ctxfi: Creating alsa device %d failed!\n", i); return err; } } @@ -1332,7 +1331,7 @@ static int atc_create_hw_devs(struct ct_atc *atc) err = create_hw_obj(atc->pci, atc->chip_type, atc->model, &hw); if (err) { - printk(KERN_ERR "Failed to create hw obj!!!\n"); + pr_err("Failed to create hw obj!!!\n"); return err; } atc->hw = hw; @@ -1351,8 +1350,7 @@ static int atc_create_hw_devs(struct ct_atc *atc) err = rsc_mgr_funcs[i].create(atc->hw, &atc->rsc_mgrs[i]); if (err) { - printk(KERN_ERR "ctxfi: " - "Failed to create rsc_mgr %d!!!\n", i); + pr_err("ctxfi: Failed to create rsc_mgr %d!!!\n", i); return err; } } @@ -1399,7 +1397,7 @@ static int atc_get_resources(struct ct_atc *atc) err = daio_mgr->get_daio(daio_mgr, &da_desc, (struct daio **)&atc->daios[i]); if (err) { - printk(KERN_ERR "ctxfi: Failed to get DAIO " + pr_err("ctxfi: Failed to get DAIO " "resource %d!!!\n", i); return err; } @@ -1603,8 +1601,7 @@ static int atc_resume(struct ct_atc *atc) /* Do hardware resume. */ err = atc_hw_resume(atc); if (err < 0) { - printk(KERN_ERR "ctxfi: pci_enable_device failed, " - "disabling device\n"); + pr_err("ctxfi: pci_enable_device failed, disabling device\n"); snd_card_disconnect(atc->card); return err; } @@ -1701,7 +1698,7 @@ int ct_atc_create(struct snd_card *card, struct pci_dev *pci, /* Find card model */ err = atc_identify_card(atc, ssid); if (err < 0) { - printk(KERN_ERR "ctatc: Card not recognised\n"); + pr_err("ctatc: Card not recognised\n"); goto error1; } @@ -1717,7 +1714,7 @@ int ct_atc_create(struct snd_card *card, struct pci_dev *pci, err = ct_mixer_create(atc, (struct ct_mixer **)&atc->mixer); if (err) { - printk(KERN_ERR "ctxfi: Failed to create mixer obj!!!\n"); + pr_err("ctxfi: Failed to create mixer obj!!!\n"); goto error1; } @@ -1744,6 +1741,6 @@ int ct_atc_create(struct snd_card *card, struct pci_dev *pci, error1: ct_atc_destroy(atc); - printk(KERN_ERR "ctxfi: Something wrong!!!\n"); + pr_err("ctxfi: Something wrong!!!\n"); return err; } -- 1.8.1.2

2 3

[alsa-devel] [PATCH] ASoC: Restore idle_bias_off initialization
by Lars-Peter Clausen 26 Aug '14

26 Aug '14

This was accidentally lost in commit f1d45cc3ae96 ("ASoC: Consolidate platform and CODEC probe/remove"). Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- sound/soc/soc-core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index e982cb0..4974b4f 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -4010,6 +4010,7 @@ static int snd_soc_component_initialize(struct snd_soc_component *component, dapm->dev = dev; dapm->component = component; dapm->bias_level = SND_SOC_BIAS_OFF; + dapm->idle_bias_off = true; if (driver->seq_notifier) dapm->seq_notifier = snd_soc_component_seq_notifier; if (driver->stream_event) @@ -4399,6 +4400,7 @@ int snd_soc_register_codec(struct device *dev, codec->component.read = snd_soc_codec_drv_read; codec->component.ignore_pmdown_time = codec_drv->ignore_pmdown_time; codec->dapm.codec = codec; + codec->dapm.idle_bias_off = codec_drv->idle_bias_off; if (codec_drv->seq_notifier) codec->dapm.seq_notifier = codec_drv->seq_notifier; if (codec_drv->set_bias_level) -- 1.8.0

2 1

Re: [alsa-devel] ASoC: bug report for ssm2602
by Lars-Peter Clausen 26 Aug '14

26 Aug '14

On 08/22/2014 11:21 AM, Scott Jiang wrote: > Hi Mark and Lars, > > commit 9d863b88ec371491e926e0828dbe3d36ead0f6f9 > Author: Lars-Peter Clausen <lars(a)metafoo.de> > Date: Sat Aug 31 18:15:23 2013 +0200 > > ASoC: ssm2602: Fix cache sync > > The ssm2602 uses regmap for caching not soc-cache, so we need to use > regcache_sync() instead of snd_soc_cache_sync(). > > According my test, regcache_sync() can't recover register values when > resume. While snd_soc_cache_sync() works fine. I used regmap_read() to > read registers in regmap layer and found it's the same as suspend. But > regcache_sync() didn't sync these registers correctly to hardware. > That does not make too much sense. snd_soc_cache_sync() is definitely a no-op when using regmap. Which kernel version are you on? Are there any additional changes to this driver in your tree? - Lars

3 6

Re: [alsa-devel] [PATCH] ALSA: virtuoso: add Xonar Essence STX II support
by Andreas Allacher 26 Aug '14

26 Aug '14

Is there any reason why the daughterboard does not work yet or hasn't it only been tested yet? Any idea how much work it would be to implement daughterboard support? Regards, Andreas At Mon, 04 Aug 2014 15:17:55 +0200, Andreas Allacher wrote: > At Mon, 04 Aug 2014 15:17:55 +0200, > Clemens Ladisch wrote: > >/ > />/ Just add the PCI ID for the STX II. It appears to work the same as the > />/ STX, except for the addition of the not-yet-supported daughterboard. > />/ > />/ Tested-by: Mario <fugazzi99 at gmail.com <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>> > />/ Tested-by: corubba <corubba at gmx.de <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>> > />/ Cc: <stable at vger.kernel.org <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>> > />/ Signed-off-by: Clemens Ladisch <clemens at ladisch.de <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>> > / > Applied, thanks. > > > Takashi > > >/ --- > />/ Documentation/sound/alsa/ALSA-Configuration.txt | 4 ++-- > />/ sound/pci/Kconfig | 4 ++-- > />/ sound/pci/oxygen/virtuoso.c | 1 + > />/ sound/pci/oxygen/xonar_pcm179x.c | 12 ++++++++++-- > />/ 4 files changed, 15 insertions(+), 6 deletions(-) > />/ > />/ diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt > />/ index 7ccf933..48148d6 100644 > />/ --- a/Documentation/sound/alsa/ALSA-Configuration.txt > />/ +++ b/Documentation/sound/alsa/ALSA-Configuration.txt > />/ @@ -2026,8 +2026,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. > />/ ------------------- > />/ > />/ Module for sound cards based on the Asus AV66/AV100/AV200 chips, > />/ - i.e., Xonar D1, DX, D2, D2X, DS, Essence ST (Deluxe), Essence STX, > />/ - HDAV1.3 (Deluxe), and HDAV1.3 Slim. > />/ + i.e., Xonar D1, DX, D2, D2X, DS, DSX, Essence ST (Deluxe), > />/ + Essence STX (II), HDAV1.3 (Deluxe), and HDAV1.3 Slim. > />/ > />/ This module supports autoprobe and multiple cards. > />/ > />/ diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig > />/ index 3a3a3a7..50dd008 100644 > />/ --- a/sound/pci/Kconfig > />/ +++ b/sound/pci/Kconfig > />/ @@ -858,8 +858,8 @@ config SND_VIRTUOSO > />/ select SND_JACK if INPUT=y || INPUT=SND > />/ help > />/ Say Y here to include support for sound cards based on the > />/ - Asus AV66/AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X, DS, > />/ - Essence ST (Deluxe), and Essence STX. > />/ + Asus AV66/AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X, DS, DSX, > />/ + Essence ST (Deluxe), and Essence STX (II). > />/ Support for the HDAV1.3 (Deluxe) and HDAV1.3 Slim is experimental; > />/ for the Xense, missing. > />/ > />/ diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c > />/ index 64b9fda..dbbbacf 100644 > />/ --- a/sound/pci/oxygen/virtuoso.c > />/ +++ b/sound/pci/oxygen/virtuoso.c > />/ @@ -53,6 +53,7 @@ static DEFINE_PCI_DEVICE_TABLE(xonar_ids) = { > />/ { OXYGEN_PCI_SUBID(0x1043, 0x835e) }, > />/ { OXYGEN_PCI_SUBID(0x1043, 0x838e) }, > />/ { OXYGEN_PCI_SUBID(0x1043, 0x8522) }, > />/ + { OXYGEN_PCI_SUBID(0x1043, 0x85f4) }, > />/ { OXYGEN_PCI_SUBID_BROKEN_EEPROM }, > />/ { } > />/ }; > />/ diff --git a/sound/pci/oxygen/xonar_pcm179x.c b/sound/pci/oxygen/xonar_pcm179x.c > />/ index c8c7f2c..e026059 100644 > />/ --- a/sound/pci/oxygen/xonar_pcm179x.c > />/ +++ b/sound/pci/oxygen/xonar_pcm179x.c > />/ @@ -100,8 +100,8 @@ > />/ */ > />/ > />/ /* > />/ - * Xonar Essence ST (Deluxe)/STX > />/ - * ----------------------------- > />/ + * Xonar Essence ST (Deluxe)/STX (II) > />/ + * ---------------------------------- > />/ * > />/ * CMI8788: > />/ * > />/ @@ -1138,6 +1138,14 @@ int get_xonar_pcm179x_model(struct oxygen *chip, > />/ chip->model.resume = xonar_stx_resume; > />/ chip->model.set_dac_params = set_pcm1796_params; > />/ break; > />/ + case 0x85f4: > />/ + chip->model = model_xonar_st; > />/ + /* TODO: daughterboard support */ > />/ + chip->model.shortname = "Xonar STX II"; > />/ + chip->model.init = xonar_stx_init; > />/ + chip->model.resume = xonar_stx_resume; > />/ + chip->model.set_dac_params = set_pcm1796_params; > />/ + break; > />/ default: > />/ return -EINVAL; > />/ } > />/ /

2 1

Re: [alsa-devel] Audio mini conference 2014?
by Koul, Vinod 26 Aug '14

26 Aug '14

On 26 Aug 2014 07:17, "Austin, Brian" <Brian.Austin(a)cirrus.com> wrote: > > > On Aug 20, 2014, at 12:01 PM, Mark Brown <broonie(a)kernel.org> wrote: > > > On Wed, Aug 20, 2014 at 02:11:07PM +0530, Vinod Koul wrote: > >> On Wed, Aug 20, 2014 at 09:33:05AM +0200, Takashi Iwai wrote: > > > >>> I thought UCM was targeted to this, but not widely used as expected? > > > >> Chrome uses t but not Android due to licensing issues. What happend to > >> tinyucm? > > > > The latest Google reference designs use something which is essentially > > tinyucm - the configuration is mostly stored in an XML configuration > > file which is read at runtime. It's not consistent with what anyone > > else uses. > > Those must be the qcom designs. They use a “tinyucm" that is xml based. > > I would like to see if we could get a consistent UCM for Android/Chrome/etc. > Has this made it into the topics list? I thought it was in the topic list sent by takashi. this is certainly something I plan to discuss :) -- ~Vinod

1 0

Re: [alsa-devel] ALSA snd-fireworks Echo AudioFire 2
by Takashi Sakamoto 26 Aug '14

26 Aug '14

Hi Harry, (C.C.ed to alsa-devel and Clemens) On Aug 25 2014 09:06, Harry van Haaren wrote:> Hi Takashi, > I can report the AudioFire2 registers correctly, see output: > [...] > On testing the device with alsa_delay[1], using 256 frames/buffer, 2 buffers. > A sine wave should be audible, however a clicking sound occurs about 3 > times per second. > > Dmesg prints a list of snd-fireworks logs: > [54749.309250] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 12 > [54749.467216] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 0A > [54749.627157] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 0A > [54749.785195] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 12 > [54749.944205] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 12 > [54750.102188] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 12 > [54750.262195] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 0A > [54750.420170] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 0A > [54750.580185] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 0A > [54750.738154] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 0A > [54750.898172] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 0A > [54751.056187] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 0A > [54751.216153] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 12 > [54751.374195] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 0A > [54751.534182] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 0A > [54751.692164] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 0A > > > The the device works using FFADO, and the mixer settings are all set > to pass trough any audio. > > Is the above information enough to help debug? Is there anything I can > do to assit you in finding this playback bug? Thanks for your report. The dmesg means that your AudioFire2 transmits packets with disorder. (I note that Fireworks driver start duplex streams for timestamp synchronization even if you use playback only.) I know that some Fireworks devices with a certain firmware (not exactly identified) sometimes perform the same behaviour. Could I ask you to confirm to see these logs always when you playback, or sometimes? # Currently I'm working for moving to my new flat. # So during a few weeks, I may not reply as you expected, sorry. Regards Takashi Sakamoto o-takashi(a)sakamocchi.jp On Aug 25 2014 09:06, Harry van Haaren wrote: > Hi Takashi, > > Thanks for your work on the Echo ALSA support! > > I can report the AudioFire2 registers correctly, see output: > > /cardX/firewire/clock: > Clock Source: 0 > Sampling Rate: 44100 > > /cardX/firewire/meters: > Physical Meters: > 6 Outputs: > Analog [0]: 22784 > Analog [1]: 19200 > Headphones [0]: 0 > Headphones [1]: 0 > S/PDIF [0]: 0 > S/PDIF [1]: 0 > 4 Inputs: > Analog [0]: 22784 > Analog [1]: 19200 > S/PDIF [0]: 0 > S/PDIF [1]: 0 > > > /cardX/firewire/firmware: > > guid_hi: 0x14860E > guid_lo: 0xD7FF1CAB > type: 0xAF2 > version: 0x0 > vendor_name: Echo Digital Audio > model_name: AudioFire2 > dsp_version: 0x0 > arm_version: 0x5070300 > fpga_version: 0x3000200 > flags: 0xA1 > max_sample_rate: 0x17700 > min_sample_rate: 0x7D00 > supported_clock: 0x9 > phys out: 0x6 > phys in: 0x4 > phys in grps: 0x2 > phys in grp[0]: type 0x0, count 0x2 > phys in grp[1]: type 0x5, count 0x2 > phys out grps: 0x3 > phys out grps[0]: type 0x0, count 0x2 > phys out grps[1]: type 0x5, count 0x2 > phys out grps[2]: type 0x1, count 0x2 > amdtp rx pcm channels 1x: 0x6 > amdtp tx pcm channels 1x: 0x4 > amdtp rx pcm channels 2x: 0x6 > amdtp tx pcm channels 2x: 0x4 > amdtp rx pcm channels 4x: 0x6 > amdtp tx pcm channels 4x: 0x4 > midi out ports: 0x1 > midi in ports: 0x1 > mixer playback channels: 0x6 > mixer capture channels: 0x4 > > > On testing the device with alsa_delay[1], using 256 frames/buffer, 2 buffers. > A sine wave should be audible, however a clicking sound occurs about 3 > times per second. > > Dmesg prints a list of snd-fireworks logs: > [54749.309250] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 12 > [54749.467216] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 0A > [54749.627157] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 0A > [54749.785195] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 12 > [54749.944205] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 12 > [54750.102188] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 12 > [54750.262195] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 0A > [54750.420170] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 0A > [54750.580185] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 0A > [54750.738154] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 0A > [54750.898172] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 0A > [54751.056187] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 0A > [54751.216153] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 12 > [54751.374195] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 0A > [54751.534182] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 0A > [54751.692164] snd-fireworks fw1.0: Detect discontinuity of CIP: 00 0A > > > The the device works using FFADO, and the mixer settings are all set > to pass trough any audio. > > Is the above information enough to help debug? Is there anything I can > do to assit you in finding this playback bug? > Greetings from Ireland, -Harry > > [1] http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-alsa-pcmi-0.2.0…

3 4

[alsa-devel] [PATCH] sound: pci: ctxfi: ctpcm.c: printk replacement
by Sudip Mukherjee 25 Aug '14

25 Aug '14

replaced printk with corresponding pr_err Signed-off-by: Sudip Mukherjee <sudip(a)vectorindia.org> --- sound/pci/ctxfi/ctpcm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/pci/ctxfi/ctpcm.c b/sound/pci/ctxfi/ctpcm.c index e8a4feb..6826c2c 100644 --- a/sound/pci/ctxfi/ctpcm.c +++ b/sound/pci/ctxfi/ctpcm.c @@ -217,7 +217,7 @@ static int ct_pcm_playback_prepare(struct snd_pcm_substream *substream) err = atc->pcm_playback_prepare(atc, apcm); if (err < 0) { - printk(KERN_ERR "ctxfi: Preparing pcm playback failed!!!\n"); + pr_err("ctxfi: Preparing pcm playback failed!!!\n"); return err; } @@ -324,7 +324,7 @@ static int ct_pcm_capture_prepare(struct snd_pcm_substream *substream) err = atc->pcm_capture_prepare(atc, apcm); if (err < 0) { - printk(KERN_ERR "ctxfi: Preparing pcm capture failed!!!\n"); + pr_err("ctxfi: Preparing pcm capture failed!!!\n"); return err; } @@ -435,7 +435,7 @@ int ct_alsa_pcm_create(struct ct_atc *atc, err = snd_pcm_new(atc->card, "ctxfi", device, playback_count, capture_count, &pcm); if (err < 0) { - printk(KERN_ERR "ctxfi: snd_pcm_new failed!! Err=%d\n", err); + pr_err("ctxfi: snd_pcm_new failed!! Err=%d\n", err); return err; } -- 1.8.1.2

2 1

[alsa-devel] [PATCH] doc: fix cross-compiling example
by Dmitry Voytik 25 Aug '14

25 Aug '14

Simplest way to configure cross-compilation with configure script is to pass '--host' option. Passing just '--target' doesn't work. Signed-off-by: Dmitry Voytik <voytikd(a)gmail.com> --- INSTALL | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/INSTALL b/INSTALL index 91a8648..47086e3 100644 --- a/INSTALL +++ b/INSTALL @@ -78,16 +78,13 @@ When you would like to cross-compile ALSA library (e.g. compile on i686 host but for arm architecture) you will need to call ./configure script with additional parameters: -CC=arm-linux-gcc ./configure --target=arm-linux +CC=arm-linux-gcc ./configure --host=arm-linux -In this example host where the library is build is guessed (should be -given with --host=platform) and target for which is the library build is -Linux on ARM architecture. You should omit setting 'CC' variable and -cross-compiler will be guessed too. +You can omit setting 'CC' variable and cross-compiler will be guessed too. So simplest version would be: -./configure --target=arm-linux +./configure --host=arm-linux For platform names in the form cpu-vendor-os (or aliases for this) you should look in 'config.guess' script. Target and all paths -- 1.7.9.5

2 1

[alsa-devel] [RESEND PATCH v4 0/2] mfd: arizona: add support for INn_MODE register
by Inha Song 25 Aug '14

25 Aug '14

This patch series add support for INn_MODE register control using platform data. Each input signal path can be configurated either as a Analogue or Digital using the INn_MODE registers. Changes for v4 - Update document content for more clarity Changes for v3 - Change to use of_property_read_u32_array - Fix a few typos - Update commit message Changes for v2 - Change to support - Update commit message - Update document content for more clarity Inha Song (2): mfd: arizona: Add support for INn_Mode register control mfd: arizona: Update DT binding to support INn_MODE init_data Documentation/devicetree/bindings/mfd/arizona.txt | 7 +++++++ drivers/mfd/arizona-core.c | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) -- 2.0.0.390.gcb682f8

1 2

[alsa-devel] [PATCH v2 1/2] mfd: arizona: Add support for INn_Mode register control
by Inha Song 25 Aug '14

25 Aug '14

Some boards need to set the INn_MODE[1:0] register to change the input signal patch. This wlf,inmode property is optional. If present values must be specified by the number of ARIZONA_MAX_INPUT. Example: - wlf,inmode = <2 0 2 0>; /* IN1, IN3 use DMIC */ Signed-off-by: Inha Song <ideal.song(a)samsung.com> --- drivers/mfd/arizona-core.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index 10a0cb9..2b68ccd 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c @@ -534,7 +534,7 @@ EXPORT_SYMBOL_GPL(arizona_of_get_named_gpio); static int arizona_of_get_core_pdata(struct arizona *arizona) { struct arizona_pdata *pdata = &arizona->pdata; - int ret, i; + int ret, i, proplen; pdata->reset = arizona_of_get_named_gpio(arizona, "wlf,reset", true); @@ -560,6 +560,15 @@ static int arizona_of_get_core_pdata(struct arizona *arizona) ret); } + proplen = of_property_count_u32_elems(arizona->dev->of_node, + "wlf,inmode"); + if (proplen > 0 && proplen <= ARRAY_SIZE(arizona->pdata.inmode)) { + for (i = 0; i < proplen; i++) + of_property_read_u32_index(arizona->dev->of_node, + "wlf,inmode", i, + &arizona->pdata.inmode[i]); + } + return 0; } -- 2.0.0.390.gcb682f8

3 3