From mboxrd@z Thu Jan 1 00:00:00 1970 From: moinejf@free.fr (Jean-Francois Moine) Date: Thu, 9 Jan 2014 12:06:18 +0100 Subject: [PATCH v2 21/28] drm/i2c: tda998x: use global constants Message-ID: <20140109120618.4955853c@armhf> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Signed-off-by: Jean-Francois Moine --- drivers/gpu/drm/i2c/tda998x_drv.c | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 864b9f5..efd29d1 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -132,6 +132,8 @@ struct tda998x_priv { # define VIP_CNTRL_5_CKCASE (1 << 0) # define VIP_CNTRL_5_SP_CNT(x) (((x) & 3) << 1) #define REG_MUX_AP REG(0x00, 0x26) /* read/write */ +# define MUX_AP_SELECT_I2S 0x64 +# define MUX_AP_SELECT_SPDIF 0x40 #define REG_MUX_VP_VIP_OUT REG(0x00, 0x27) /* read/write */ #define REG_MAT_CONTRL REG(0x00, 0x80) /* write */ # define MAT_CONTRL_MAT_SC(x) (((x) & 3) << 0) @@ -212,7 +214,12 @@ struct tda998x_priv { # define AIP_CLKSEL_FS(x) (((x) & 3) << 0) # define AIP_CLKSEL_CLK_POL(x) (((x) & 1) << 2) # define AIP_CLKSEL_AIP(x) (((x) & 7) << 3) - +#define SEL_AIP_SPDIF 0 +#define SEL_AIP_I2S 1 +#define CLKPOLDSD_ACLK 0 /* same pol as ACLK */ +#define CLKPOLDSD_NACLK 1 /* inverted */ +#define CTSREF_ACLK 0 /* I2S */ +#define CTSREF_FS64SPDIF 2 /* spdif */ /* Page 02h: PLL settings */ #define REG_PLL_SERIAL_1 REG(0x02, 0x00) /* read/write */ @@ -721,19 +728,17 @@ tda998x_configure_audio(struct tda998x_priv *priv, /* Set audio input source */ switch (priv->audio_type) { case AFMT_SPDIF: - reg_write(priv, REG_MUX_AP, 0x40); - clksel_aip = AIP_CLKSEL_AIP(0); - /* FS64SPDIF */ - clksel_fs = AIP_CLKSEL_FS(2); + reg_write(priv, REG_MUX_AP, MUX_AP_SELECT_SPDIF); + clksel_aip = AIP_CLKSEL_AIP(SEL_AIP_SPDIF); + clksel_fs = AIP_CLKSEL_FS(CTSREF_FS64SPDIF); cts_n = CTS_N_M(3) | CTS_N_K(3); ca_i2s = 0; break; case AFMT_I2S: - reg_write(priv, REG_MUX_AP, 0x64); - clksel_aip = AIP_CLKSEL_AIP(1); - /* ACLK */ - clksel_fs = AIP_CLKSEL_FS(0); + reg_write(priv, REG_MUX_AP, MUX_AP_SELECT_I2S); + clksel_aip = AIP_CLKSEL_AIP(SEL_AIP_I2S); + clksel_fs = AIP_CLKSEL_FS(CTSREF_ACLK); cts_n = CTS_N_M(3) | CTS_N_K(3); ca_i2s = CA_I2S_CA_I2S(0); break; -- Ken ar c'henta? | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/ From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jean-Francois Moine Subject: [PATCH v2 21/28] drm/i2c: tda998x: use global constants Date: Thu, 9 Jan 2014 12:06:18 +0100 Message-ID: <20140109120618.4955853c@armhf> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from smtp1-g21.free.fr (smtp1-g21.free.fr [212.27.42.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ACAF1FBE9A for ; Thu, 9 Jan 2014 03:12:22 -0800 (PST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org List-Id: dri-devel@lists.freedesktop.org ClNpZ25lZC1vZmYtYnk6IEplYW4tRnJhbmNvaXMgTW9pbmUgPG1vaW5lamZAZnJlZS5mcj4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTJjL3RkYTk5OHhfZHJ2LmMgICB8IDIzICsrKysrKysrKysrKyst LS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pMmMvdGRhOTk4eF9kcnYuYyBiL2RyaXZl cnMvZ3B1L2RybS9pMmMvdGRhOTk4eF9kcnYuYwppbmRleCA4NjRiOWY1Li5lZmQyOWQxIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTJjL3RkYTk5OHhfZHJ2LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2kyYy90ZGE5OTh4X2Rydi5jCkBAIC0xMzIsNiArMTMyLDggQEAgc3RydWN0IHRkYTk5 OHhfcHJpdiB7CiAjIGRlZmluZSBWSVBfQ05UUkxfNV9DS0NBU0UgICAgICAgKDEgPDwgMCkKICMg ZGVmaW5lIFZJUF9DTlRSTF81X1NQX0NOVCh4KSAgICAoKCh4KSAmIDMpIDw8IDEpCiAjZGVmaW5l IFJFR19NVVhfQVAgICAgICAgICAgICAgICAgUkVHKDB4MDAsIDB4MjYpICAgICAvKiByZWFkL3dy aXRlICovCisjIGRlZmluZSBNVVhfQVBfU0VMRUNUX0kyUwkgIDB4NjQKKyMgZGVmaW5lIE1VWF9B UF9TRUxFQ1RfU1BESUYJICAweDQwCiAjZGVmaW5lIFJFR19NVVhfVlBfVklQX09VVCAgICAgICAg UkVHKDB4MDAsIDB4MjcpICAgICAvKiByZWFkL3dyaXRlICovCiAjZGVmaW5lIFJFR19NQVRfQ09O VFJMICAgICAgICAgICAgUkVHKDB4MDAsIDB4ODApICAgICAvKiB3cml0ZSAqLwogIyBkZWZpbmUg TUFUX0NPTlRSTF9NQVRfU0MoeCkgICAgICgoKHgpICYgMykgPDwgMCkKQEAgLTIxMiw3ICsyMTQs MTIgQEAgc3RydWN0IHRkYTk5OHhfcHJpdiB7CiAjIGRlZmluZSBBSVBfQ0xLU0VMX0ZTKHgpICAg ICAgICAgKCgoeCkgJiAzKSA8PCAwKQogIyBkZWZpbmUgQUlQX0NMS1NFTF9DTEtfUE9MKHgpICAg ICgoKHgpICYgMSkgPDwgMikKICMgZGVmaW5lIEFJUF9DTEtTRUxfQUlQKHgpICAgICAgICAoKCh4 KSAmIDcpIDw8IDMpCi0KKyNkZWZpbmUgIFNFTF9BSVBfU1BESUYJCSAgMAorI2RlZmluZSAgU0VM X0FJUF9JMlMJCSAgMQorI2RlZmluZSAgQ0xLUE9MRFNEX0FDTEsJCSAgMAkJCS8qIHNhbWUgcG9s IGFzIEFDTEsgKi8KKyNkZWZpbmUgIENMS1BPTERTRF9OQUNMSwkgIDEJCQkvKiBpbnZlcnRlZCAq LworI2RlZmluZSAgQ1RTUkVGX0FDTEsJCSAgMAkJCS8qIEkyUyAqLworI2RlZmluZSAgQ1RTUkVG X0ZTNjRTUERJRgkgIDIJCQkvKiBzcGRpZiAqLwogCiAvKiBQYWdlIDAyaDogUExMIHNldHRpbmdz ICovCiAjZGVmaW5lIFJFR19QTExfU0VSSUFMXzEgICAgICAgICAgUkVHKDB4MDIsIDB4MDApICAg ICAvKiByZWFkL3dyaXRlICovCkBAIC03MjEsMTkgKzcyOCwxNyBAQCB0ZGE5OTh4X2NvbmZpZ3Vy ZV9hdWRpbyhzdHJ1Y3QgdGRhOTk4eF9wcml2ICpwcml2LAogCS8qIFNldCBhdWRpbyBpbnB1dCBz b3VyY2UgKi8KIAlzd2l0Y2ggKHByaXYtPmF1ZGlvX3R5cGUpIHsKIAljYXNlIEFGTVRfU1BESUY6 Ci0JCXJlZ193cml0ZShwcml2LCBSRUdfTVVYX0FQLCAweDQwKTsKLQkJY2xrc2VsX2FpcCA9IEFJ UF9DTEtTRUxfQUlQKDApOwotCQkvKiBGUzY0U1BESUYgKi8KLQkJY2xrc2VsX2ZzID0gQUlQX0NM S1NFTF9GUygyKTsKKwkJcmVnX3dyaXRlKHByaXYsIFJFR19NVVhfQVAsIE1VWF9BUF9TRUxFQ1Rf U1BESUYpOworCQljbGtzZWxfYWlwID0gQUlQX0NMS1NFTF9BSVAoU0VMX0FJUF9TUERJRik7CisJ CWNsa3NlbF9mcyA9IEFJUF9DTEtTRUxfRlMoQ1RTUkVGX0ZTNjRTUERJRik7CiAJCWN0c19uID0g Q1RTX05fTSgzKSB8IENUU19OX0soMyk7CiAJCWNhX2kycyA9IDA7CiAJCWJyZWFrOwogCiAJY2Fz ZSBBRk1UX0kyUzoKLQkJcmVnX3dyaXRlKHByaXYsIFJFR19NVVhfQVAsIDB4NjQpOwotCQljbGtz ZWxfYWlwID0gQUlQX0NMS1NFTF9BSVAoMSk7Ci0JCS8qIEFDTEsgKi8KLQkJY2xrc2VsX2ZzID0g QUlQX0NMS1NFTF9GUygwKTsKKwkJcmVnX3dyaXRlKHByaXYsIFJFR19NVVhfQVAsIE1VWF9BUF9T RUxFQ1RfSTJTKTsKKwkJY2xrc2VsX2FpcCA9IEFJUF9DTEtTRUxfQUlQKFNFTF9BSVBfSTJTKTsK KwkJY2xrc2VsX2ZzID0gQUlQX0NMS1NFTF9GUyhDVFNSRUZfQUNMSyk7CiAJCWN0c19uID0gQ1RT X05fTSgzKSB8IENUU19OX0soMyk7CiAJCWNhX2kycyA9IENBX0kyU19DQV9JMlMoMCk7CiAJCWJy ZWFrOwotLSAKS2VuIGFyIGMnaGVudGHDsQl8CSAgICAgICoqIEJyZWl6aCBoYSBMaW51eCBhdGF2 ISAqKgpKZWYJCXwJCWh0dHA6Ly9tb2luZWpmLmZyZWUuZnIvCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRl dmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756187AbaAILOe (ORCPT ); Thu, 9 Jan 2014 06:14:34 -0500 Received: from smtp1-g21.free.fr ([212.27.42.1]:40303 "EHLO smtp1-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754454AbaAILMX convert rfc822-to-8bit (ORCPT ); Thu, 9 Jan 2014 06:12:23 -0500 Date: Thu, 9 Jan 2014 12:06:18 +0100 From: Jean-Francois Moine To: dri-devel@lists.freedesktop.org Cc: Dave Airlie , Rob Clark , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 21/28] drm/i2c: tda998x: use global constants Message-ID: <20140109120618.4955853c@armhf> X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.22; arm-unknown-linux-gnueabihf) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Jean-Francois Moine --- drivers/gpu/drm/i2c/tda998x_drv.c | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 864b9f5..efd29d1 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -132,6 +132,8 @@ struct tda998x_priv { # define VIP_CNTRL_5_CKCASE (1 << 0) # define VIP_CNTRL_5_SP_CNT(x) (((x) & 3) << 1) #define REG_MUX_AP REG(0x00, 0x26) /* read/write */ +# define MUX_AP_SELECT_I2S 0x64 +# define MUX_AP_SELECT_SPDIF 0x40 #define REG_MUX_VP_VIP_OUT REG(0x00, 0x27) /* read/write */ #define REG_MAT_CONTRL REG(0x00, 0x80) /* write */ # define MAT_CONTRL_MAT_SC(x) (((x) & 3) << 0) @@ -212,7 +214,12 @@ struct tda998x_priv { # define AIP_CLKSEL_FS(x) (((x) & 3) << 0) # define AIP_CLKSEL_CLK_POL(x) (((x) & 1) << 2) # define AIP_CLKSEL_AIP(x) (((x) & 7) << 3) - +#define SEL_AIP_SPDIF 0 +#define SEL_AIP_I2S 1 +#define CLKPOLDSD_ACLK 0 /* same pol as ACLK */ +#define CLKPOLDSD_NACLK 1 /* inverted */ +#define CTSREF_ACLK 0 /* I2S */ +#define CTSREF_FS64SPDIF 2 /* spdif */ /* Page 02h: PLL settings */ #define REG_PLL_SERIAL_1 REG(0x02, 0x00) /* read/write */ @@ -721,19 +728,17 @@ tda998x_configure_audio(struct tda998x_priv *priv, /* Set audio input source */ switch (priv->audio_type) { case AFMT_SPDIF: - reg_write(priv, REG_MUX_AP, 0x40); - clksel_aip = AIP_CLKSEL_AIP(0); - /* FS64SPDIF */ - clksel_fs = AIP_CLKSEL_FS(2); + reg_write(priv, REG_MUX_AP, MUX_AP_SELECT_SPDIF); + clksel_aip = AIP_CLKSEL_AIP(SEL_AIP_SPDIF); + clksel_fs = AIP_CLKSEL_FS(CTSREF_FS64SPDIF); cts_n = CTS_N_M(3) | CTS_N_K(3); ca_i2s = 0; break; case AFMT_I2S: - reg_write(priv, REG_MUX_AP, 0x64); - clksel_aip = AIP_CLKSEL_AIP(1); - /* ACLK */ - clksel_fs = AIP_CLKSEL_FS(0); + reg_write(priv, REG_MUX_AP, MUX_AP_SELECT_I2S); + clksel_aip = AIP_CLKSEL_AIP(SEL_AIP_I2S); + clksel_fs = AIP_CLKSEL_FS(CTSREF_ACLK); cts_n = CTS_N_M(3) | CTS_N_K(3); ca_i2s = CA_I2S_CA_I2S(0); break; -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/