From patchwork Wed Jan 14 16:57:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 429008 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9ECEC14017B for ; Thu, 15 Jan 2015 03:57:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753117AbbANQ5p (ORCPT ); Wed, 14 Jan 2015 11:57:45 -0500 Received: from mail-wi0-f169.google.com ([209.85.212.169]:42856 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752557AbbANQ5p (ORCPT ); Wed, 14 Jan 2015 11:57:45 -0500 Received: by mail-wi0-f169.google.com with SMTP id n3so12622636wiv.0 for ; Wed, 14 Jan 2015 08:57:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=2Rdky4Ila0orGAgsOsuw6E4/huT+U8kCvcFeEXk4+5s=; b=i/t2aqkpbHzsEOV7AJermYwKnUEhzpEUFTekLmMvA4f4Mv+p445oEnYSJYO7LNtxXJ rOBGhCka/YQlPV6TkTJwMMqaGvKkzLZoghS//d9Qs/+xjXvyUkwssKOZnCXpP467611O FEOUUYbqOF35wLtKRUWcH7HeqzIUkHb5nS8HNrz1Zed9A+RITgBhjYA2Djb3H2xyIlx/ c3tK1JuBqK7MGVjrwFtnYa+/8CcZxK6OLVTnxsmCTkfUUNfp6OUuK/+vlZWns7wfTNxM zkPBehVwpybVgDpN9pN0AbLemUJJfEL9vbdKUPAvbVYrRUG3RaazjaPonIrQQTDa59RL iJKQ== X-Received: by 10.180.87.228 with SMTP id bb4mr10172704wib.71.1421254663406; Wed, 14 Jan 2015 08:57:43 -0800 (PST) Received: from cizrna.lan (37-48-38-114.tmcz.cz. [37.48.38.114]) by mx.google.com with ESMTPSA id n4sm19390733wia.7.2015.01.14.08.57.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Jan 2015 08:57:42 -0800 (PST) From: Tomeu Vizoso To: alsa-devel@alsa-project.org Cc: linux-tegra@vger.kernel.org, Javier Martinez Canillas , sjoerd.simons@collabora.co.uk, Tomeu Vizoso Subject: [PATCH] conf/ucm: GoogleNyan: Add configuration Date: Wed, 14 Jan 2015 17:57:18 +0100 Message-Id: <1421254638-14599-1-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 1.9.3 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Taken from the ChromeOS sources, this configuration should apply to all Nyan boards from Google, so far HP Chromebook 14 (nyan-blaze) and Acer Chromebook 13 (nyan-big). Signed-off-by: Tomeu Vizoso --- configure.ac | 1 + src/conf/ucm/GoogleNyan/GoogleNyan.conf | 5 ++ src/conf/ucm/GoogleNyan/HiFi.conf | 83 +++++++++++++++++++++++++++++++++ src/conf/ucm/GoogleNyan/Makefile.am | 4 ++ src/conf/ucm/Makefile.am | 2 +- 5 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 src/conf/ucm/GoogleNyan/GoogleNyan.conf create mode 100644 src/conf/ucm/GoogleNyan/HiFi.conf create mode 100644 src/conf/ucm/GoogleNyan/Makefile.am diff --git a/configure.ac b/configure.ac index 734163c..916280b 100644 --- a/configure.ac +++ b/configure.ac @@ -654,6 +654,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ src/conf/ucm/SDP4430/Makefile \ src/conf/ucm/tegraalc5632/Makefile \ src/conf/ucm/PAZ00/Makefile \ + src/conf/ucm/GoogleNyan/Makefile \ modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \ alsalisp/Makefile aserver/Makefile \ test/Makefile test/lsb/Makefile \ diff --git a/src/conf/ucm/GoogleNyan/GoogleNyan.conf b/src/conf/ucm/GoogleNyan/GoogleNyan.conf new file mode 100644 index 0000000..ebd0dd9 --- /dev/null +++ b/src/conf/ucm/GoogleNyan/GoogleNyan.conf @@ -0,0 +1,5 @@ + Comment "Nyan internal card" + SectionUseCase."HiFi" { + File "HiFi.conf" + Comment "Default" + } diff --git a/src/conf/ucm/GoogleNyan/HiFi.conf b/src/conf/ucm/GoogleNyan/HiFi.conf new file mode 100644 index 0000000..cb624e7 --- /dev/null +++ b/src/conf/ucm/GoogleNyan/HiFi.conf @@ -0,0 +1,83 @@ + SectionVerb { + Value { + OutputDspName "speaker_eq" + } + EnableSequence [ + cdev "hw:GoogleNyan" + cset "name='Left Speaker Mixer Left DAC Switch' on" + cset "name='Right Speaker Mixer Right DAC Switch' on" + cset "name='Headphone Left Switch' on" + cset "name='Headphone Right Switch' on" + cset "name='Digital EQ 3 Band Switch' off" + cset "name='Digital EQ 5 Band Switch' off" + cset "name='Digital EQ 7 Band Switch' off" + cset "name='Biquad Switch' off" + cset "name='Filter Mode' Music" + cset "name='ADC Oversampling Rate' 0" + cset "name='DMIC Mux' DMIC" + cset "name='MIC2 Mux' IN34" + cset "name='Right ADC Mixer MIC2 Switch' on" + cset "name='Left ADC Mixer MIC2 Switch' on" + cset "name='MIC2 Volume' 10" + cset "name='MIC2 Boost Volume' 0" + cset "name='Mic Jack Switch' off" + cset "name='Int Mic Switch' on" + cset "name='ADCR Boost Volume' 4" + cset "name='ADCL Boost Volume' 4" + cset "name='ADCR Volume' 11" + cset "name='ADCL Volume' 11" + cset "name='Left Speaker Mixer Left DAC Switch' on" + cset "name='Right Speaker Mixer Right DAC Switch' on" + cset "name='Speaker Left Mixer Volume' 2" + cset "name='Speaker Right Mixer Volume' 2" + cset "name='Record Path DC Blocking' on" + cset "name='Playback Path DC Blocking' on" + cset "name='Headphone Left Switch' on" + cset "name='Headphone Right Switch' on" + cset "name='HP Left Out Switch' off" + cset "name='HP Right Out Switch' off" + cset "name='Speaker Left Switch' on" + cset "name='Speaker Right Switch' on" + cset "name='Speakers Switch' on" + ] + DisableSequence [ + ] + } + SectionDevice."Headphone".0 { + Value { + JackName "Google Nyan Headphone Jack" + OutputDspName "" + } + EnableSequence [ + cdev "hw:GoogleNyan" + cset "name='Speakers Switch' off" + cset "name='HP Left Out Switch' on" + cset "name='HP Right Out Switch' on" + ] + DisableSequence [ + cdev "hw:GoogleNyan" + cset "name='HP Left Out Switch' off" + cset "name='HP Right Out Switch' off" + cset "name='Speakers Switch' on" + ] + } + SectionDevice."Mic".0 { + Value { + JackName "Google Nyan Mic Jack" + CaptureControl "MIC2" + } + EnableSequence [ + cdev "hw:GoogleNyan" + cset "name='Int Mic Switch' off" + cset "name='DMIC Mux' ADC" + cset "name='Mic Jack Switch' on" + cset "name='Record Path DC Blocking' on" + ] + DisableSequence [ + cdev "hw:GoogleNyan" + cset "name='Mic Jack Switch' off" + cset "name='DMIC Mux' DMIC" + cset "name='Int Mic Switch' on" + cset "name='Record Path DC Blocking' off" + ] + } diff --git a/src/conf/ucm/GoogleNyan/Makefile.am b/src/conf/ucm/GoogleNyan/Makefile.am new file mode 100644 index 0000000..47c7fc9 --- /dev/null +++ b/src/conf/ucm/GoogleNyan/Makefile.am @@ -0,0 +1,4 @@ +alsaconfigdir = @ALSA_CONFIG_DIR@ +ucmdir = $(alsaconfigdir)/ucm/GoogleNyan +ucm_DATA = GoogleNyan.conf HiFi.conf +EXTRA_DIST = $(ucm_DATA) diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am index bde89df..14fc7ae 100644 --- a/src/conf/ucm/Makefile.am +++ b/src/conf/ucm/Makefile.am @@ -1 +1 @@ -SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 +SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan