From patchwork Tue Apr 30 14:09:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Baltieri X-Patchwork-Id: 16531 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-gh0-f200.google.com (mail-gh0-f200.google.com [209.85.160.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C119520065 for ; Tue, 30 Apr 2013 14:10:51 +0000 (UTC) Received: by mail-gh0-f200.google.com with SMTP id 10sf761490ghy.11 for ; Tue, 30 Apr 2013 07:10:48 -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=QIi6mg6QIpQIcP5hCIBkTDNfRNo0XH8hGaks5UEr8z8=; b=ebq25SmBbEFg/737P4kUS2A8QJfWK8HKKmqltWUmM5xEbagHBWMqe0nDk+T+e9pjIO 26EkFKfT2rTiuHCohyJSKm3GKFwVvZJr035ha1OPt8pLfqNcXgwcpwa5WyQPZToGLXrw z7ZXIMlYHEs5qrjTQqde/dHozDfC5tNunUBK+9oWKWMBs1dzM0kAbyoprwOT8M1ZOCql scyOCRZbEElmELEj4nzP0pfC/Jvx71vPq2hFzhMwE6vMuI3d6e0zfZTUWSdX0AR4/xOt afHnLcn0pMmryZv63yAUs5UOOSLbvqL485i0iRLB314QFJaBWeB333E+v4RLP/L8LfG9 V3Qg== X-Received: by 10.236.43.72 with SMTP id k48mr7339452yhb.35.1367331048676; Tue, 30 Apr 2013 07:10:48 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.128.229 with SMTP id nr5ls290545qeb.44.gmail; Tue, 30 Apr 2013 07:10:48 -0700 (PDT) X-Received: by 10.220.75.210 with SMTP id z18mr3750696vcj.64.1367331048381; Tue, 30 Apr 2013 07:10:48 -0700 (PDT) Received: from mail-ve0-x236.google.com (mail-ve0-x236.google.com [2607:f8b0:400c:c01::236]) by mx.google.com with ESMTPS id d10si12100102vdv.145.2013.04.30.07.10.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Apr 2013 07:10:48 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::236 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::236; Received: by mail-ve0-f182.google.com with SMTP id da11so409283veb.41 for ; Tue, 30 Apr 2013 07:10:48 -0700 (PDT) X-Received: by 10.52.166.103 with SMTP id zf7mr29917058vdb.94.1367331048242; Tue, 30 Apr 2013 07:10:48 -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 nf2csp108621veb; Tue, 30 Apr 2013 07:10:47 -0700 (PDT) X-Received: by 10.194.77.146 with SMTP id s18mr3545587wjw.16.1367331047251; Tue, 30 Apr 2013 07:10:47 -0700 (PDT) Received: from mail-ea0-x230.google.com (mail-ea0-x230.google.com [2a00:1450:4013:c01::230]) by mx.google.com with ESMTPS id f1si2762706eep.255.2013.04.30.07.10.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Apr 2013 07:10:47 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:4013:c01::230 is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) client-ip=2a00:1450:4013:c01::230; Received: by mail-ea0-f176.google.com with SMTP id h14so270920eak.7 for ; Tue, 30 Apr 2013 07:10:46 -0700 (PDT) X-Received: by 10.14.194.70 with SMTP id l46mr88145135een.28.1367331046563; Tue, 30 Apr 2013 07:10:46 -0700 (PDT) Received: from localhost ([2a01:2003:1:1f50:8e70:5aff:feac:ad8]) by mx.google.com with ESMTPSA id i53sm39002565eeu.5.2013.04.30.07.10.40 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 30 Apr 2013 07:10:45 -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 3/3] ASoC: ux500: register controls to card instead of codec Date: Tue, 30 Apr 2013 16:09:54 +0200 Message-Id: <1367330994-7259-4-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: ALoCoQlIdFT9WtzfhDnCXQOafA8kvFm9Q4gFgGSBbqVRfnVEj2KLbMjRZTfNPOzJgmWPMus+BTk+ X-Original-Sender: fabio.baltieri@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::236 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: , Update mop500_ab8500_machine_init to register mop500_ab8500_ctrls as card control instead of codec control, as it only contains SOC_DAPM_PIN_SWITCH definitions. Signed-off-by: Fabio Baltieri --- sound/soc/ux500/mop500_ab8500.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/ux500/mop500_ab8500.c b/sound/soc/ux500/mop500_ab8500.c index 1a5c6b9..4606194 100644 --- a/sound/soc/ux500/mop500_ab8500.c +++ b/sound/soc/ux500/mop500_ab8500.c @@ -127,9 +127,9 @@ static int mop500_ab8500_set_mclk(struct device *dev, static int mclk_input_control_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); struct mop500_ab8500_drvdata *drvdata = - snd_soc_card_get_drvdata(codec->card); + snd_soc_card_get_drvdata(card); ucontrol->value.enumerated.item[0] = drvdata->mclk_sel; @@ -139,9 +139,9 @@ static int mclk_input_control_get(struct snd_kcontrol *kcontrol, static int mclk_input_control_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); struct mop500_ab8500_drvdata *drvdata = - snd_soc_card_get_drvdata(codec->card); + snd_soc_card_get_drvdata(card); unsigned int val = ucontrol->value.enumerated.item[0]; if (val > (unsigned int)MCLK_ULPCLK) @@ -377,7 +377,7 @@ int mop500_ab8500_machine_init(struct snd_soc_pcm_runtime *rtd) drvdata->mclk_sel = MCLK_ULPCLK; /* Add controls */ - ret = snd_soc_add_codec_controls(codec, mop500_ab8500_ctrls, + ret = snd_soc_add_card_controls(codec->card, mop500_ab8500_ctrls, ARRAY_SIZE(mop500_ab8500_ctrls)); if (ret < 0) { pr_err("%s: Failed to add machine-controls (%d)!\n",