From patchwork Tue Apr 30 14:09:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Baltieri X-Patchwork-Id: 16530 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f71.google.com (mail-vb0-f71.google.com [209.85.212.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 95A3520065 for ; Tue, 30 Apr 2013 14:10:41 +0000 (UTC) Received: by mail-vb0-f71.google.com with SMTP id w15sf855857vbb.2 for ; Tue, 30 Apr 2013 07:10:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=ZYHIjcQ8mqIuCFcjktNH7dffF39RS4DIEm2vbsSQ8Mo=; b=RQ6d4cMjttY+EwEsKwqh3VIDldG6FN9xIoKOMdI0GexOYkr03roOeA1UmT8KfASnWP aTyVPZMprr0PutTAaRBt2dLldZSFTDjSSdMS5sbdheb3g6QjmMOd536PCzBH7A1DlPOa 7ZgNmQJVNetCsi2/ZcPqURIAbuGCRb+QNYvMzBz87VA/o2k6KEJpcEi/2LPK9zsvrolr 1KtfP9J1jBB59FwqtqDPrmz9V6/M6aGRZC0qe5OE30RwQrXw+1JME4lux+NTki4gg1Yv zMqUCtRAdWn8hIqIGu1llQfJmsarCZt0xDDkPUnFr8uyls4WCBZO2HeUayfyIao4F/qZ gU6g== X-Received: by 10.236.41.137 with SMTP id h9mr26456187yhb.43.1367331038468; Tue, 30 Apr 2013 07:10:38 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.58.172 with SMTP id s12ls265632qeq.18.gmail; Tue, 30 Apr 2013 07:10:38 -0700 (PDT) X-Received: by 10.52.72.106 with SMTP id c10mr22607279vdv.31.1367331038223; Tue, 30 Apr 2013 07:10:38 -0700 (PDT) Received: from mail-ve0-x22f.google.com (mail-ve0-x22f.google.com [2607:f8b0:400c:c01::22f]) by mx.google.com with ESMTPS id gr7si12131028vdc.77.2013.04.30.07.10.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Apr 2013 07:10:38 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::22f is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::22f; Received: by mail-ve0-f175.google.com with SMTP id m1so413511ves.34 for ; Tue, 30 Apr 2013 07:10:38 -0700 (PDT) X-Received: by 10.220.189.9 with SMTP id dc9mr21478827vcb.8.1367331038062; Tue, 30 Apr 2013 07:10:38 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp108612veb; Tue, 30 Apr 2013 07:10:37 -0700 (PDT) X-Received: by 10.15.36.2 with SMTP id h2mr136086976eev.2.1367331036426; Tue, 30 Apr 2013 07:10:36 -0700 (PDT) Received: from mail-ee0-f45.google.com (mail-ee0-f45.google.com [74.125.83.45]) by mx.google.com with ESMTPS id 45si6205744eed.144.2013.04.30.07.10.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Apr 2013 07:10:36 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.45 is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) client-ip=74.125.83.45; Received: by mail-ee0-f45.google.com with SMTP id l10so276732eei.18 for ; Tue, 30 Apr 2013 07:10:36 -0700 (PDT) X-Received: by 10.15.36.2 with SMTP id h2mr136086915eev.2.1367331035919; Tue, 30 Apr 2013 07:10:35 -0700 (PDT) Received: from localhost ([2a01:2003:1:1f50:8e70:5aff:feac:ad8]) by mx.google.com with ESMTPSA id l6sm15425517eem.9.2013.04.30.07.10.29 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 30 Apr 2013 07:10:35 -0700 (PDT) From: Fabio Baltieri To: Mark Brown , Liam Girdwood Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Linus Walleij , Lee Jones , Ola Lilja , Fabio Baltieri Subject: [PATCH 2/3] ASoC: ux500: move clock controls to ab8500-codec Date: Tue, 30 Apr 2013 16:09:53 +0200 Message-Id: <1367330994-7259-3-git-send-email-fabio.baltieri@linaro.org> X-Mailer: git-send-email 1.8.2 In-Reply-To: <1367330994-7259-1-git-send-email-fabio.baltieri@linaro.org> References: <1367330994-7259-1-git-send-email-fabio.baltieri@linaro.org> X-Gm-Message-State: ALoCoQnPIHb0KEUxOKqZ/Os9AcZ1BDqXyXqLJgmKpU1TJVf0aGQ55sskZ+kNBTFDj47tpHDyx4Tn X-Original-Sender: fabio.baltieri@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::22f is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Move ab8500 clock control definitions to the ab8500 codec driver, leaving only card specific setting in mop500_ab8500_ctrls. Signed-off-by: Fabio Baltieri --- sound/soc/codecs/ab8500-codec.c | 10 ++++++++++ sound/soc/ux500/mop500_ab8500.c | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c index a153b16..925e625 100644 --- a/sound/soc/codecs/ab8500-codec.c +++ b/sound/soc/codecs/ab8500-codec.c @@ -1615,6 +1615,16 @@ static SOC_ENUM_SINGLE_EXT_DECL(soc_enum_sidstate, enum_sid_state); static SOC_ENUM_SINGLE_EXT_DECL(soc_enum_ancstate, enum_anc_state); static struct snd_kcontrol_new ab8500_ctrls[] = { + /* Digital interface - Clocks */ + SOC_SINGLE("Digital Interface Master Generator Switch", + AB8500_DIGIFCONF1, AB8500_DIGIFCONF1_ENMASTGEN, + 1, 0), + SOC_SINGLE("Digital Interface 0 Bit-clock Switch", + AB8500_DIGIFCONF1, AB8500_DIGIFCONF1_ENFSBITCLK0, + 1, 0), + SOC_SINGLE("Digital Interface 1 Bit-clock Switch", + AB8500_DIGIFCONF1, AB8500_DIGIFCONF1_ENFSBITCLK1, + 1, 0), /* Charge pump */ SOC_ENUM("Charge Pump High Threshold For Low Voltage", soc_enum_envdeththre), diff --git a/sound/soc/ux500/mop500_ab8500.c b/sound/soc/ux500/mop500_ab8500.c index 78cce23..1a5c6b9 100644 --- a/sound/soc/ux500/mop500_ab8500.c +++ b/sound/soc/ux500/mop500_ab8500.c @@ -162,16 +162,6 @@ static struct snd_kcontrol_new mop500_ab8500_ctrls[] = { SOC_ENUM_EXT("Master Clock Select", soc_enum_mclk, mclk_input_control_get, mclk_input_control_put), - /* Digital interface - Clocks */ - SOC_SINGLE("Digital Interface Master Generator Switch", - AB8500_DIGIFCONF1, AB8500_DIGIFCONF1_ENMASTGEN, - 1, 0), - SOC_SINGLE("Digital Interface 0 Bit-clock Switch", - AB8500_DIGIFCONF1, AB8500_DIGIFCONF1_ENFSBITCLK0, - 1, 0), - SOC_SINGLE("Digital Interface 1 Bit-clock Switch", - AB8500_DIGIFCONF1, AB8500_DIGIFCONF1_ENFSBITCLK1, - 1, 0), SOC_DAPM_PIN_SWITCH("Headset Left"), SOC_DAPM_PIN_SWITCH("Headset Right"), SOC_DAPM_PIN_SWITCH("Earpiece"),