From mboxrd@z Thu Jan 1 00:00:00 1970 From: moinejf@free.fr (Jean-Francois Moine) Date: Thu, 9 Jan 2014 12:05:13 +0100 Subject: [PATCH v2 17/28] drm/i2c: tda998x: set the repeat PLL value in range 0..3 Message-ID: <20140109120513.0965ddad@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 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index f60aef9..8a7d8a2 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -220,7 +220,7 @@ struct tda998x_priv { # define PLL_SERIAL_1_SRL_IZ(x) (((x) & 3) << 1) # define PLL_SERIAL_1_SRL_MAN_IZ (1 << 6) #define REG_PLL_SERIAL_2 REG(0x02, 0x01) /* read/write */ -# define PLL_SERIAL_2_SRL_NOSC(x) (((x) & 3) << 0) +# define PLL_SERIAL_2_SRL_NOSC(x) ((x) << 0) # define PLL_SERIAL_2_SRL_PR(x) (((x) & 0xf) << 4) #define REG_PLL_SERIAL_3 REG(0x02, 0x02) /* read/write */ # define PLL_SERIAL_3_SRL_CCIR (1 << 0) @@ -972,6 +972,11 @@ tda998x_encoder_mode_set(struct drm_encoder *encoder, } div = 148500 / mode->clock; + if (div != 0) { + div--; + if (div > 3) + div = 3; + } /* mute the audio FIFO: */ reg_set(priv, REG_AIP_CNTRL_0, AIP_CNTRL_0_RST_FIFO); -- 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 17/28] drm/i2c: tda998x: set the repeat PLL value in range 0..3 Date: Thu, 9 Jan 2014 12:05:13 +0100 Message-ID: <20140109120513.0965ddad@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 7D6A8FBD2A for ; Thu, 9 Jan 2014 03:11:43 -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 CiBkcml2ZXJzL2dwdS9kcm0vaTJjL3RkYTk5OHhfZHJ2LmMgfCA3ICsrKysrKy0KIDEgZmlsZSBj aGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTJjL3RkYTk5OHhfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTJjL3RkYTk5 OHhfZHJ2LmMKaW5kZXggZjYwYWVmOS4uOGE3ZDhhMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2kyYy90ZGE5OTh4X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pMmMvdGRhOTk4eF9k cnYuYwpAQCAtMjIwLDcgKzIyMCw3IEBAIHN0cnVjdCB0ZGE5OTh4X3ByaXYgewogIyBkZWZpbmUg UExMX1NFUklBTF8xX1NSTF9JWih4KSAgICgoKHgpICYgMykgPDwgMSkKICMgZGVmaW5lIFBMTF9T RVJJQUxfMV9TUkxfTUFOX0laICAoMSA8PCA2KQogI2RlZmluZSBSRUdfUExMX1NFUklBTF8yICAg ICAgICAgIFJFRygweDAyLCAweDAxKSAgICAgLyogcmVhZC93cml0ZSAqLwotIyBkZWZpbmUgUExM X1NFUklBTF8yX1NSTF9OT1NDKHgpICgoKHgpICYgMykgPDwgMCkKKyMgZGVmaW5lIFBMTF9TRVJJ QUxfMl9TUkxfTk9TQyh4KSAoKHgpIDw8IDApCiAjIGRlZmluZSBQTExfU0VSSUFMXzJfU1JMX1BS KHgpICAgKCgoeCkgJiAweGYpIDw8IDQpCiAjZGVmaW5lIFJFR19QTExfU0VSSUFMXzMgICAgICAg ICAgUkVHKDB4MDIsIDB4MDIpICAgICAvKiByZWFkL3dyaXRlICovCiAjIGRlZmluZSBQTExfU0VS SUFMXzNfU1JMX0NDSVIgICAgKDEgPDwgMCkKQEAgLTk3Miw2ICs5NzIsMTEgQEAgdGRhOTk4eF9l bmNvZGVyX21vZGVfc2V0KHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlciwKIAl9CiAKIAlkaXYg PSAxNDg1MDAgLyBtb2RlLT5jbG9jazsKKwlpZiAoZGl2ICE9IDApIHsKKwkJZGl2LS07CisJCWlm IChkaXYgPiAzKQorCQkJZGl2ID0gMzsKKwl9CiAKIAkvKiBtdXRlIHRoZSBhdWRpbyBGSUZPOiAq LwogCXJlZ19zZXQocHJpdiwgUkVHX0FJUF9DTlRSTF8wLCBBSVBfQ05UUkxfMF9SU1RfRklGTyk7 Ci0tIApLZW4gYXIgYydoZW50YcOxCXwJICAgICAgKiogQnJlaXpoIGhhIExpbnV4IGF0YXYhICoq CkplZgkJfAkJaHR0cDovL21vaW5lamYuZnJlZS5mci8KX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752728AbaAILL4 (ORCPT ); Thu, 9 Jan 2014 06:11:56 -0500 Received: from smtp1-g21.free.fr ([212.27.42.1]:37755 "EHLO smtp1-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755808AbaAILLp convert rfc822-to-8bit (ORCPT ); Thu, 9 Jan 2014 06:11:45 -0500 Date: Thu, 9 Jan 2014 12:05:13 +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 17/28] drm/i2c: tda998x: set the repeat PLL value in range 0..3 Message-ID: <20140109120513.0965ddad@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 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index f60aef9..8a7d8a2 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -220,7 +220,7 @@ struct tda998x_priv { # define PLL_SERIAL_1_SRL_IZ(x) (((x) & 3) << 1) # define PLL_SERIAL_1_SRL_MAN_IZ (1 << 6) #define REG_PLL_SERIAL_2 REG(0x02, 0x01) /* read/write */ -# define PLL_SERIAL_2_SRL_NOSC(x) (((x) & 3) << 0) +# define PLL_SERIAL_2_SRL_NOSC(x) ((x) << 0) # define PLL_SERIAL_2_SRL_PR(x) (((x) & 0xf) << 4) #define REG_PLL_SERIAL_3 REG(0x02, 0x02) /* read/write */ # define PLL_SERIAL_3_SRL_CCIR (1 << 0) @@ -972,6 +972,11 @@ tda998x_encoder_mode_set(struct drm_encoder *encoder, } div = 148500 / mode->clock; + if (div != 0) { + div--; + if (div > 3) + div = 3; + } /* mute the audio FIFO: */ reg_set(priv, REG_AIP_CNTRL_0, AIP_CNTRL_0_RST_FIFO); -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/