From patchwork Wed Nov 25 17:38:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 32017 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1a1e1n-0001ub-Ed; Wed, 25 Nov 2015 18:38:47 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.76/mailfrontend-5) with esmtp id 1a1e1l-0004h7-7s; Wed, 25 Nov 2015 18:38:47 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751904AbbKYRil (ORCPT + 1 other); Wed, 25 Nov 2015 12:38:41 -0500 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:39752 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751317AbbKYRie (ORCPT ); Wed, 25 Nov 2015 12:38:34 -0500 Received: from dude.hi.4.pengutronix.de ([10.1.0.7] helo=dude.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1a1e1Y-0002yF-Pt; Wed, 25 Nov 2015 18:38:32 +0100 From: Lucas Stach To: Mauro Carvalho Chehab , linux-media@vger.kernel.org Cc: kernel@pengutronix.de, patchwork-lst@pengutronix.de Subject: [PATCH v2 7/9] [media] tvp5150: remove pin configuration from initialization tables Date: Wed, 25 Nov 2015 18:38:34 +0100 Message-Id: <1448473116-24735-7-git-send-email-l.stach@pengutronix.de> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1448473116-24735-1-git-send-email-l.stach@pengutronix.de> References: <1448473116-24735-1-git-send-email-l.stach@pengutronix.de> X-SA-Exim-Connect-IP: 10.1.0.7 X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2015.11.25.172717 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, NO_URI_HTTPS 0, REFERENCES 0, SINGLE_URI_IN_BODY 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __REFERENCES 0, __SANE_MSGID 0, __SINGLE_URI_TEXT 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS ' From: Philipp Zabel To allow optional interrupt support, we want to configure the pin settings dynamically. Move those register accesses out of the static initialization tables. Signed-off-by: Philipp Zabel --- drivers/media/i2c/tvp5150.c | 19 +++++++------------ drivers/media/i2c/tvp5150_reg.h | 1 + 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c index f107a17650c6..ceda29aa23f9 100644 --- a/drivers/media/i2c/tvp5150.c +++ b/drivers/media/i2c/tvp5150.c @@ -323,9 +323,6 @@ static const struct i2c_reg_value tvp5150_init_default[] = { { /* 0x0e */ TVP5150_LUMA_PROC_CTL_3,0x00 }, - { /* 0x0f */ - TVP5150_CONF_SHARED_PIN,0x08 - }, { /* 0x11 */ TVP5150_ACT_VD_CROP_ST_MSB,0x00 }, @@ -362,9 +359,6 @@ static const struct i2c_reg_value tvp5150_init_default[] = { { /* 0x1d */ TVP5150_INT_ENABLE_REG_B,0x00 }, - { /* 0x1e */ - TVP5150_INTT_CONFIG_REG_B,0x00 - }, { /* 0x28 */ TVP5150_VIDEO_STD,0x00 }, @@ -383,9 +377,6 @@ static const struct i2c_reg_value tvp5150_init_default[] = { { /* 0xc1 */ TVP5150_INT_ENABLE_REG_A,0x00 }, - { /* 0xc2 */ - TVP5150_INT_CONF,0x04 - }, { /* 0xc8 */ TVP5150_FIFO_INT_THRESHOLD,0x80 }, @@ -420,9 +411,7 @@ static const struct i2c_reg_value tvp5150_init_default[] = { /* Default values as sugested at TVP5150AM1 datasheet */ static const struct i2c_reg_value tvp5150_init_enable[] = { - { - TVP5150_CONF_SHARED_PIN, 2 - },{ /* Automatic offset and AGC enabled */ + { /* Automatic offset and AGC enabled */ TVP5150_ANAL_CHL_CTL, 0x15 },{ /* Activate YCrCb output 0x9 or 0xd ? */ TVP5150_MISC_CTL, 0x6f @@ -772,6 +761,12 @@ static int tvp5150_reset(struct v4l2_subdev *sd, u32 val) /* Initializes TVP5150 to its default values */ tvp5150_write_inittab(sd, tvp5150_init_default); + /* Configure pins: FID, VSYNC, GPCL/VBLK, SCLK */ + regmap_write(map, TVP5150_CONF_SHARED_PIN, 0x2); + /* Keep interrupt polarity active low */ + regmap_write(map, TVP5150_INT_CONF, TVP5150_VDPOE); + regmap_write(map, TVP5150_INTT_CONFIG_REG_B, 0x0); + /* Initializes VDP registers */ tvp5150_vdp_init(sd, vbi_ram_default); diff --git a/drivers/media/i2c/tvp5150_reg.h b/drivers/media/i2c/tvp5150_reg.h index 25a994944918..fc3bcb26413a 100644 --- a/drivers/media/i2c/tvp5150_reg.h +++ b/drivers/media/i2c/tvp5150_reg.h @@ -117,6 +117,7 @@ #define TVP5150_INT_STATUS_REG_A 0xc0 /* Interrupt status register A */ #define TVP5150_INT_ENABLE_REG_A 0xc1 /* Interrupt enable register A */ #define TVP5150_INT_CONF 0xc2 /* Interrupt configuration */ +#define TVP5150_VDPOE BIT(2) #define TVP5150_VDP_CONF_RAM_DATA 0xc3 /* VDP configuration RAM data */ #define TVP5150_CONF_RAM_ADDR_LOW 0xc4 /* Configuration RAM address low byte */ #define TVP5150_CONF_RAM_ADDR_HIGH 0xc5 /* Configuration RAM address high byte */