From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?B?R2HDq3RhbiBDYXJsaWVy?= Subject: [PATCH Resend] ASoC: imx-mc13783: use defines instead of numerical address of register Date: Thu, 06 Sep 2012 08:13:23 +0200 Message-ID: <50483F03.8070307@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com [209.85.212.179]) by alsa0.perex.cz (Postfix) with ESMTP id 3F801260311 for ; Thu, 6 Sep 2012 08:14:21 +0200 (CEST) Received: by wibhq4 with SMTP id hq4so789760wib.2 for ; Wed, 05 Sep 2012 23:14:21 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org Cc: Fabio Estevam , =?UTF-8?B?UGhpbGlwcGUgUsOpdG9ybmF6?= , broonie@opensource.wolfsonmicro.com, Sascha Hauer List-Id: alsa-devel@alsa-project.org Rm9yZ290IHRvIGNjIE1hcmsgQnJvd24sIHNvcnJ5LgoKVGhpcyB1c2VzIGFscmVhZHkgZGVmaW5l ZCBuYW1lIG9mIHJlZ2lzdGVycyBhbmQgbWFrZXMgY29kZSBtb3JlIHJlYWRhYmxlLgoKU2lnbmVk LW9mZi1ieTogR2HDq3RhbiBDYXJsaWVyIDxnY2VtYmVkQGdtYWlsLmNvbT4KLS0tCiAgc291bmQv c29jL2NvZGVjcy9tYzEzNzgzLmMgfCAgIDU4IAorKysrKysrKysrKysrKysrKysrKysrKy0tLS0t LS0tLS0tLS0tLS0tLS0tCiAgMSBmaWxlcyBjaGFuZ2VkLCAzMSBpbnNlcnRpb25zKCspLCAyNyBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zb3VuZC9zb2MvY29kZWNzL21jMTM3ODMuYyBiL3Nv dW5kL3NvYy9jb2RlY3MvbWMxMzc4My5jCmluZGV4IDhmNzI2YzAuLmJiZmE1NTMgMTAwNjQ0Ci0t LSBhL3NvdW5kL3NvYy9jb2RlY3MvbWMxMzc4My5jCisrKyBiL3NvdW5kL3NvYy9jb2RlY3MvbWMx Mzc4My5jCkBAIC00MjYsMTYgKzQyNiwxNiBAQCBzdGF0aWMgaW50IG1jMTM3ODNfc2V0X3RkbV9z bG90X3N5bmMoc3RydWN0IApzbmRfc29jX2RhaSAqZGFpLAogIH0KICAgc3RhdGljIGNvbnN0IHN0 cnVjdCBzbmRfa2NvbnRyb2xfbmV3IG1jMWxfYW1wX2N0bCA9Ci0JU09DX0RBUE1fU0lOR0xFKCJT d2l0Y2giLCAzOCwgNywgMSwgMCk7CisJU09DX0RBUE1fU0lOR0xFKCJTd2l0Y2giLCBNQzEzNzgz X0FVRElPX1RYLCA3LCAxLCAwKTsKICAgc3RhdGljIGNvbnN0IHN0cnVjdCBzbmRfa2NvbnRyb2xf bmV3IG1jMXJfYW1wX2N0bCA9Ci0JU09DX0RBUE1fU0lOR0xFKCJTd2l0Y2giLCAzOCwgNSwgMSwg MCk7CisJU09DX0RBUE1fU0lOR0xFKCJTd2l0Y2giLCBNQzEzNzgzX0FVRElPX1RYLCA1LCAxLCAw KTsKICAgc3RhdGljIGNvbnN0IHN0cnVjdCBzbmRfa2NvbnRyb2xfbmV3IG1jMl9hbXBfY3RsID0K LQlTT0NfREFQTV9TSU5HTEUoIlN3aXRjaCIsIDM4LCA5LCAxLCAwKTsKKwlTT0NfREFQTV9TSU5H TEUoIlN3aXRjaCIsIE1DMTM3ODNfQVVESU9fVFgsIDksIDEsIDApOwogICBzdGF0aWMgY29uc3Qg c3RydWN0IHNuZF9rY29udHJvbF9uZXcgYXR4X2FtcF9jdGwgPQotCVNPQ19EQVBNX1NJTkdMRSgi U3dpdGNoIiwgMzgsIDExLCAxLCAwKTsKKwlTT0NfREFQTV9TSU5HTEUoIlN3aXRjaCIsIE1DMTM3 ODNfQVVESU9fVFgsIDExLCAxLCAwKTsKICAgIC8qIFZpcnR1YWwgbXV4LiBUaGUgY2hpcCBkb2Vz IHRoZSBpbnB1dCBzZWxlY3Rpb24gYXV0b21hdGljYWxseQpAQCAtNDYxLDIyICs0NjEsMjIgQEAg c3RhdGljIGNvbnN0IHN0cnVjdCBzbmRfa2NvbnRyb2xfbmV3IHJpZ2h0X2lucHV0X211eCA9CiAg CVNPQ19EQVBNX0VOVU1fVklSVCgiUm91dGUiLCBhZGNyX2VudW0pOwogICBzdGF0aWMgY29uc3Qg c3RydWN0IHNuZF9rY29udHJvbF9uZXcgc2FtcF9jdGwgPQotCVNPQ19EQVBNX1NJTkdMRSgiU3dp dGNoIiwgMzYsIDMsIDEsIDApOworCVNPQ19EQVBNX1NJTkdMRSgiU3dpdGNoIiwgTUMxMzc4M19B VURJT19SWDAsIDMsIDEsIDApOwogICBzdGF0aWMgY29uc3Qgc3RydWN0IHNuZF9rY29udHJvbF9u ZXcgbGFtcF9jdGwgPQotCVNPQ19EQVBNX1NJTkdMRSgiU3dpdGNoIiwgMzYsIDUsIDEsIDApOwor CVNPQ19EQVBNX1NJTkdMRSgiU3dpdGNoIiwgTUMxMzc4M19BVURJT19SWDAsIDUsIDEsIDApOwog ICBzdGF0aWMgY29uc3Qgc3RydWN0IHNuZF9rY29udHJvbF9uZXcgaGxhbXBfY3RsID0KLQlTT0Nf REFQTV9TSU5HTEUoIlN3aXRjaCIsIDM2LCAxMCwgMSwgMCk7CisJU09DX0RBUE1fU0lOR0xFKCJT d2l0Y2giLCBNQzEzNzgzX0FVRElPX1JYMCwgMTAsIDEsIDApOwogICBzdGF0aWMgY29uc3Qgc3Ry dWN0IHNuZF9rY29udHJvbF9uZXcgaHJhbXBfY3RsID0KLQlTT0NfREFQTV9TSU5HTEUoIlN3aXRj aCIsIDM2LCA5LCAxLCAwKTsKKwlTT0NfREFQTV9TSU5HTEUoIlN3aXRjaCIsIE1DMTM3ODNfQVVE SU9fUlgwLCA5LCAxLCAwKTsKICAgc3RhdGljIGNvbnN0IHN0cnVjdCBzbmRfa2NvbnRyb2xfbmV3 IGxsYW1wX2N0bCA9Ci0JU09DX0RBUE1fU0lOR0xFKCJTd2l0Y2giLCAzNiwgMTYsIDEsIDApOwor CVNPQ19EQVBNX1NJTkdMRSgiU3dpdGNoIiwgTUMxMzc4M19BVURJT19SWDAsIDE2LCAxLCAwKTsK ICAgc3RhdGljIGNvbnN0IHN0cnVjdCBzbmRfa2NvbnRyb2xfbmV3IGxyYW1wX2N0bCA9Ci0JU09D X0RBUE1fU0lOR0xFKCJTd2l0Y2giLCAzNiwgMTUsIDEsIDApOworCVNPQ19EQVBNX1NJTkdMRSgi U3dpdGNoIiwgTUMxMzc4M19BVURJT19SWDAsIDE1LCAxLCAwKTsKICAgc3RhdGljIGNvbnN0IHN0 cnVjdCBzbmRfc29jX2RhcG1fd2lkZ2V0IG1jMTM3ODNfZGFwbV93aWRnZXRzW10gPSB7CiAgLyog SW5wdXQgKi8KQEAgLTQ4NywxMyArNDg3LDEzIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3Qgc25kX3Nv Y19kYXBtX3dpZGdldCAKbWMxMzc4M19kYXBtX3dpZGdldHNbXSA9IHsKICAJU05EX1NPQ19EQVBN X0lOUFVUKCJSWElOTCIpLAogIAlTTkRfU09DX0RBUE1fSU5QVVQoIlRYSU4iKSwKICAtCVNORF9T T0NfREFQTV9TVVBQTFkoIk1DMSBCaWFzIiwgMzgsIDAsIDAsIE5VTEwsIDApLAotCVNORF9TT0Nf REFQTV9TVVBQTFkoIk1DMiBCaWFzIiwgMzgsIDEsIDAsIE5VTEwsIDApLAorCVNORF9TT0NfREFQ TV9TVVBQTFkoIk1DMSBCaWFzIiwgTUMxMzc4M19BVURJT19UWCwgMCwgMCwgTlVMTCwgMCksCisJ U05EX1NPQ19EQVBNX1NVUFBMWSgiTUMyIEJpYXMiLCBNQzEzNzgzX0FVRElPX1RYLCAxLCAwLCBO VUxMLCAwKSwKICAtCVNORF9TT0NfREFQTV9TV0lUQ0goIk1DMUwgQW1wIiwgMzgsIDcsIDAsICZt YzFsX2FtcF9jdGwpLAotCVNORF9TT0NfREFQTV9TV0lUQ0goIk1DMVIgQW1wIiwgMzgsIDUsIDAs ICZtYzFyX2FtcF9jdGwpLAotCVNORF9TT0NfREFQTV9TV0lUQ0goIk1DMiBBbXAiLCAzOCwgOSwg MCwgJm1jMl9hbXBfY3RsKSwKLQlTTkRfU09DX0RBUE1fU1dJVENIKCJUWElOIEFtcCIsIDM4LCAx MSwgMCwgJmF0eF9hbXBfY3RsKSwKKwlTTkRfU09DX0RBUE1fU1dJVENIKCJNQzFMIEFtcCIsIE1D MTM3ODNfQVVESU9fVFgsIDcsIDAsICZtYzFsX2FtcF9jdGwpLAorCVNORF9TT0NfREFQTV9TV0lU Q0goIk1DMVIgQW1wIiwgTUMxMzc4M19BVURJT19UWCwgNSwgMCwgJm1jMXJfYW1wX2N0bCksCisJ U05EX1NPQ19EQVBNX1NXSVRDSCgiTUMyIEFtcCIsIE1DMTM3ODNfQVVESU9fVFgsIDksIDAsICZt YzJfYW1wX2N0bCksCisJU05EX1NPQ19EQVBNX1NXSVRDSCgiVFhJTiBBbXAiLCBNQzEzNzgzX0FV RElPX1RYLCAxMSwgMCwgJmF0eF9hbXBfY3RsKSwKICAgCVNORF9TT0NfREFQTV9WSVJUX01VWCgi UEdBIExlZnQgSW5wdXQgTXV4IiwgU05EX1NPQ19OT1BNLCAwLCAwLAogIAkJCSAgICAgICZsZWZ0 X2lucHV0X211eCksCkBAIC01MDMsMTIgKzUwMywxMiBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IHNu ZF9zb2NfZGFwbV93aWRnZXQgCm1jMTM3ODNfZGFwbV93aWRnZXRzW10gPSB7CiAgCVNORF9TT0Nf REFQTV9QR0EoIlBHQSBMZWZ0IElucHV0IiwgU05EX1NPQ19OT1BNLCAwLCAwLCBOVUxMLCAwKSwK ICAJU05EX1NPQ19EQVBNX1BHQSgiUEdBIFJpZ2h0IElucHV0IiwgU05EX1NPQ19OT1BNLCAwLCAw LCBOVUxMLCAwKSwKICAtCVNORF9TT0NfREFQTV9BREMoIkFEQyIsICJDYXB0dXJlIiwgNDAsIDEx LCAwKSwKLQlTTkRfU09DX0RBUE1fU1VQUExZKCJBRENfUmVzZXQiLCA0MCwgMTUsIDAsIE5VTEws IDApLAorCVNORF9TT0NfREFQTV9BREMoIkFEQyIsICJDYXB0dXJlIiwgTUMxMzc4M19BVURJT19D T0RFQywgMTEsIDApLAorCVNORF9TT0NfREFQTV9TVVBQTFkoIkFEQ19SZXNldCIsIE1DMTM3ODNf QVVESU9fQ09ERUMsIDE1LCAwLCBOVUxMLCAwKSwKICAgLyogT3V0cHV0ICovCi0JU05EX1NPQ19E QVBNX1NVUFBMWSgiREFDX0UiLCA0MSwgMTEsIDAsIE5VTEwsIDApLAotCVNORF9TT0NfREFQTV9T VVBQTFkoIkRBQ19SZXNldCIsIDQxLCAxNSwgMCwgTlVMTCwgMCksCisJU05EX1NPQ19EQVBNX1NV UFBMWSgiREFDX0UiLCBNQzEzNzgzX0FVRElPX0RBQywgMTEsIDAsIE5VTEwsIDApLAorCVNORF9T T0NfREFQTV9TVVBQTFkoIkRBQ19SZXNldCIsIE1DMTM3ODNfQVVESU9fREFDLCAxNSwgMCwgTlVM TCwgMCksCiAgCVNORF9TT0NfREFQTV9PVVRQVVQoIlJYT1VUTCIpLAogIAlTTkRfU09DX0RBUE1f T1VUUFVUKCJSWE9VVFIiKSwKICAJU05EX1NPQ19EQVBNX09VVFBVVCgiSFNMIiksCkBAIC01MTYs MTQgKzUxNiwxOCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IHNuZF9zb2NfZGFwbV93aWRnZXQgCm1j MTM3ODNfZGFwbV93aWRnZXRzW10gPSB7CiAgCVNORF9TT0NfREFQTV9PVVRQVVQoIkxTUCIpLAog IAlTTkRfU09DX0RBUE1fT1VUUFVUKCJTUCIpLAogIC0JU05EX1NPQ19EQVBNX1NXSVRDSCgiU3Bl YWtlciBBbXAiLCAzNiwgMywgMCwgJnNhbXBfY3RsKSwKKwlTTkRfU09DX0RBUE1fU1dJVENIKCJT cGVha2VyIEFtcCIsIE1DMTM3ODNfQVVESU9fUlgwLCAzLCAwLCAmc2FtcF9jdGwpLAogIAlTTkRf U09DX0RBUE1fU1dJVENIKCJMb3Vkc3BlYWtlciBBbXAiLCBTTkRfU09DX05PUE0sIDAsIDAsICZs YW1wX2N0bCksCi0JU05EX1NPQ19EQVBNX1NXSVRDSCgiSGVhZHNldCBBbXAgTGVmdCIsIDM2LCAx MCwgMCwgJmhsYW1wX2N0bCksCi0JU05EX1NPQ19EQVBNX1NXSVRDSCgiSGVhZHNldCBBbXAgUmln aHQiLCAzNiwgOSwgMCwgJmhyYW1wX2N0bCksCi0JU05EX1NPQ19EQVBNX1NXSVRDSCgiTGluZSBv dXQgQW1wIExlZnQiLCAzNiwgMTYsIDAsICZsbGFtcF9jdGwpLAotCVNORF9TT0NfREFQTV9TV0lU Q0goIkxpbmUgb3V0IEFtcCBSaWdodCIsIDM2LCAxNSwgMCwgJmxyYW1wX2N0bCksCi0JU05EX1NP Q19EQVBNX0RBQygiREFDIiwgIlBsYXliYWNrIiwgMzYsIDIyLCAwKSwKLQlTTkRfU09DX0RBUE1f UEdBKCJEQUMgUEdBIiwgMzcsIDUsIDAsIE5VTEwsIDApLAorCVNORF9TT0NfREFQTV9TV0lUQ0go IkhlYWRzZXQgQW1wIExlZnQiLCBNQzEzNzgzX0FVRElPX1JYMCwgMTAsIDAsCisJCQkmaGxhbXBf Y3RsKSwKKwlTTkRfU09DX0RBUE1fU1dJVENIKCJIZWFkc2V0IEFtcCBSaWdodCIsIE1DMTM3ODNf QVVESU9fUlgwLCA5LCAwLAorCQkJJmhyYW1wX2N0bCksCisJU05EX1NPQ19EQVBNX1NXSVRDSCgi TGluZSBvdXQgQW1wIExlZnQiLCBNQzEzNzgzX0FVRElPX1JYMCwgMTYsIDAsCisJCQkmbGxhbXBf Y3RsKSwKKwlTTkRfU09DX0RBUE1fU1dJVENIKCJMaW5lIG91dCBBbXAgUmlnaHQiLCBNQzEzNzgz X0FVRElPX1JYMCwgMTUsIDAsCisJCQkmbHJhbXBfY3RsKSwKKwlTTkRfU09DX0RBUE1fREFDKCJE QUMiLCAiUGxheWJhY2siLCBNQzEzNzgzX0FVRElPX1JYMCwgMjIsIDApLAorCVNORF9TT0NfREFQ TV9QR0EoIkRBQyBQR0EiLCBNQzEzNzgzX0FVRElPX1JYMSwgNSwgMCwgTlVMTCwgMCksCiAgfTsK ICAgc3RhdGljIHN0cnVjdCBzbmRfc29jX2RhcG1fcm91dGUgbWMxMzc4M19yb3V0ZXNbXSA9IHsK LS0gCjEuNy43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkFsc2EtZGV2ZWwgbWFpbGluZyBsaXN0CkFsc2EtZGV2ZWxAYWxzYS1wcm9qZWN0Lm9yZwpo dHRwOi8vbWFpbG1hbi5hbHNhLXByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8vYWxzYS1kZXZl bAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: gcembed@gmail.com (=?UTF-8?B?R2HDq3RhbiBDYXJsaWVy?=) Date: Thu, 06 Sep 2012 08:13:23 +0200 Subject: [PATCH Resend] ASoC: imx-mc13783: use defines instead of numerical address of register Message-ID: <50483F03.8070307@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Forgot to cc Mark Brown, sorry. This uses already defined name of registers and makes code more readable. Signed-off-by: Ga?tan Carlier --- sound/soc/codecs/mc13783.c | 58 +++++++++++++++++++++++-------------------- 1 files changed, 31 insertions(+), 27 deletions(-) diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c index 8f726c0..bbfa553 100644 --- a/sound/soc/codecs/mc13783.c +++ b/sound/soc/codecs/mc13783.c @@ -426,16 +426,16 @@ static int mc13783_set_tdm_slot_sync(struct snd_soc_dai *dai, } static const struct snd_kcontrol_new mc1l_amp_ctl = - SOC_DAPM_SINGLE("Switch", 38, 7, 1, 0); + SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_TX, 7, 1, 0); static const struct snd_kcontrol_new mc1r_amp_ctl = - SOC_DAPM_SINGLE("Switch", 38, 5, 1, 0); + SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_TX, 5, 1, 0); static const struct snd_kcontrol_new mc2_amp_ctl = - SOC_DAPM_SINGLE("Switch", 38, 9, 1, 0); + SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_TX, 9, 1, 0); static const struct snd_kcontrol_new atx_amp_ctl = - SOC_DAPM_SINGLE("Switch", 38, 11, 1, 0); + SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_TX, 11, 1, 0); /* Virtual mux. The chip does the input selection automatically @@ -461,22 +461,22 @@ static const struct snd_kcontrol_new right_input_mux = SOC_DAPM_ENUM_VIRT("Route", adcr_enum); static const struct snd_kcontrol_new samp_ctl = - SOC_DAPM_SINGLE("Switch", 36, 3, 1, 0); + SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_RX0, 3, 1, 0); static const struct snd_kcontrol_new lamp_ctl = - SOC_DAPM_SINGLE("Switch", 36, 5, 1, 0); + SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_RX0, 5, 1, 0); static const struct snd_kcontrol_new hlamp_ctl = - SOC_DAPM_SINGLE("Switch", 36, 10, 1, 0); + SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_RX0, 10, 1, 0); static const struct snd_kcontrol_new hramp_ctl = - SOC_DAPM_SINGLE("Switch", 36, 9, 1, 0); + SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_RX0, 9, 1, 0); static const struct snd_kcontrol_new llamp_ctl = - SOC_DAPM_SINGLE("Switch", 36, 16, 1, 0); + SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_RX0, 16, 1, 0); static const struct snd_kcontrol_new lramp_ctl = - SOC_DAPM_SINGLE("Switch", 36, 15, 1, 0); + SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_RX0, 15, 1, 0); static const struct snd_soc_dapm_widget mc13783_dapm_widgets[] = { /* Input */ @@ -487,13 +487,13 @@ static const struct snd_soc_dapm_widget mc13783_dapm_widgets[] = { SND_SOC_DAPM_INPUT("RXINL"), SND_SOC_DAPM_INPUT("TXIN"), - SND_SOC_DAPM_SUPPLY("MC1 Bias", 38, 0, 0, NULL, 0), - SND_SOC_DAPM_SUPPLY("MC2 Bias", 38, 1, 0, NULL, 0), + SND_SOC_DAPM_SUPPLY("MC1 Bias", MC13783_AUDIO_TX, 0, 0, NULL, 0), + SND_SOC_DAPM_SUPPLY("MC2 Bias", MC13783_AUDIO_TX, 1, 0, NULL, 0), - SND_SOC_DAPM_SWITCH("MC1L Amp", 38, 7, 0, &mc1l_amp_ctl), - SND_SOC_DAPM_SWITCH("MC1R Amp", 38, 5, 0, &mc1r_amp_ctl), - SND_SOC_DAPM_SWITCH("MC2 Amp", 38, 9, 0, &mc2_amp_ctl), - SND_SOC_DAPM_SWITCH("TXIN Amp", 38, 11, 0, &atx_amp_ctl), + SND_SOC_DAPM_SWITCH("MC1L Amp", MC13783_AUDIO_TX, 7, 0, &mc1l_amp_ctl), + SND_SOC_DAPM_SWITCH("MC1R Amp", MC13783_AUDIO_TX, 5, 0, &mc1r_amp_ctl), + SND_SOC_DAPM_SWITCH("MC2 Amp", MC13783_AUDIO_TX, 9, 0, &mc2_amp_ctl), + SND_SOC_DAPM_SWITCH("TXIN Amp", MC13783_AUDIO_TX, 11, 0, &atx_amp_ctl), SND_SOC_DAPM_VIRT_MUX("PGA Left Input Mux", SND_SOC_NOPM, 0, 0, &left_input_mux), @@ -503,12 +503,12 @@ static const struct snd_soc_dapm_widget mc13783_dapm_widgets[] = { SND_SOC_DAPM_PGA("PGA Left Input", SND_SOC_NOPM, 0, 0, NULL, 0), SND_SOC_DAPM_PGA("PGA Right Input", SND_SOC_NOPM, 0, 0, NULL, 0), - SND_SOC_DAPM_ADC("ADC", "Capture", 40, 11, 0), - SND_SOC_DAPM_SUPPLY("ADC_Reset", 40, 15, 0, NULL, 0), + SND_SOC_DAPM_ADC("ADC", "Capture", MC13783_AUDIO_CODEC, 11, 0), + SND_SOC_DAPM_SUPPLY("ADC_Reset", MC13783_AUDIO_CODEC, 15, 0, NULL, 0), /* Output */ - SND_SOC_DAPM_SUPPLY("DAC_E", 41, 11, 0, NULL, 0), - SND_SOC_DAPM_SUPPLY("DAC_Reset", 41, 15, 0, NULL, 0), + SND_SOC_DAPM_SUPPLY("DAC_E", MC13783_AUDIO_DAC, 11, 0, NULL, 0), + SND_SOC_DAPM_SUPPLY("DAC_Reset", MC13783_AUDIO_DAC, 15, 0, NULL, 0), SND_SOC_DAPM_OUTPUT("RXOUTL"), SND_SOC_DAPM_OUTPUT("RXOUTR"), SND_SOC_DAPM_OUTPUT("HSL"), @@ -516,14 +516,18 @@ static const struct snd_soc_dapm_widget mc13783_dapm_widgets[] = { SND_SOC_DAPM_OUTPUT("LSP"), SND_SOC_DAPM_OUTPUT("SP"), - SND_SOC_DAPM_SWITCH("Speaker Amp", 36, 3, 0, &samp_ctl), + SND_SOC_DAPM_SWITCH("Speaker Amp", MC13783_AUDIO_RX0, 3, 0, &samp_ctl), SND_SOC_DAPM_SWITCH("Loudspeaker Amp", SND_SOC_NOPM, 0, 0, &lamp_ctl), - SND_SOC_DAPM_SWITCH("Headset Amp Left", 36, 10, 0, &hlamp_ctl), - SND_SOC_DAPM_SWITCH("Headset Amp Right", 36, 9, 0, &hramp_ctl), - SND_SOC_DAPM_SWITCH("Line out Amp Left", 36, 16, 0, &llamp_ctl), - SND_SOC_DAPM_SWITCH("Line out Amp Right", 36, 15, 0, &lramp_ctl), - SND_SOC_DAPM_DAC("DAC", "Playback", 36, 22, 0), - SND_SOC_DAPM_PGA("DAC PGA", 37, 5, 0, NULL, 0), + SND_SOC_DAPM_SWITCH("Headset Amp Left", MC13783_AUDIO_RX0, 10, 0, + &hlamp_ctl), + SND_SOC_DAPM_SWITCH("Headset Amp Right", MC13783_AUDIO_RX0, 9, 0, + &hramp_ctl), + SND_SOC_DAPM_SWITCH("Line out Amp Left", MC13783_AUDIO_RX0, 16, 0, + &llamp_ctl), + SND_SOC_DAPM_SWITCH("Line out Amp Right", MC13783_AUDIO_RX0, 15, 0, + &lramp_ctl), + SND_SOC_DAPM_DAC("DAC", "Playback", MC13783_AUDIO_RX0, 22, 0), + SND_SOC_DAPM_PGA("DAC PGA", MC13783_AUDIO_RX1, 5, 0, NULL, 0), }; static struct snd_soc_dapm_route mc13783_routes[] = { -- 1.7.7.4