From patchwork Wed Dec 7 18:30:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 38488 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cEgzG-0004TP-Jv; Wed, 07 Dec 2016 18:30:38 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-8) with esmtp id 1cEgzE-00009h-kK; Wed, 07 Dec 2016 19:30:38 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932547AbcLGSac (ORCPT + 1 other); Wed, 7 Dec 2016 13:30:32 -0500 Received: from mail-pg0-f44.google.com ([74.125.83.44]:35685 "EHLO mail-pg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932192AbcLGSaa (ORCPT ); Wed, 7 Dec 2016 13:30:30 -0500 Received: by mail-pg0-f44.google.com with SMTP id p66so164614557pga.2 for ; Wed, 07 Dec 2016 10:30:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=N4ekrdyVgDvn4SEiZBNsQZXXFOy8M5InZb/wYtD8/wo=; b=tPVlWyMMmAwASS+yCk1HJVc+r/+/2DrR/LN381LwNwNOB+GsPTuasif6V5xY4nBpGc xlEehCk1aK5ONn0mbsR1oaAuQ+hyya4u3rDRNWYOanHk5sF/3qT/vT+KU+nfQwQa8OKC BmRfRIJwmtlb1NtO9wemx/1mGtmAabcl98Gq+UaJ0Am6X31b3SOSa2apajUBb1RJ0ldh umUs6kmPSToXpqst9xJQ5UAZR7kWqBFbGe5O65PWTVdei+Tcf0jp5WDin2k8HtuXt+hQ jbQAHlHkaS8PZ5n/BQYrLsqCOnF92loH8QwzC96JMxymJKk6kWOmpw28uprucRTZEmQC uv9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=N4ekrdyVgDvn4SEiZBNsQZXXFOy8M5InZb/wYtD8/wo=; b=QVXQePdirGJzub2PjsQwG094vl8//pOwx3UmLSRtXoX5bUBSJeAp5P6gIB/IwQCTXH UOBWUigVbjWjYfLMYJ5HH/Zc2GiH9/kHk2bhrhysDAt9BpfIYzAVTMgYnIQm9H7ehRhM l0hTMtR5wgPBIUKgIbYScjiPmlBeE6f2ydGfy4V3vIpM8vZDlqaiflSQtxxl8P/96aDf F5AYJ634nmjxb4nQ/UBFp6W3mrqkasbAb8HoCwVA7upAmo17DiIXUPNJ6nsFVIeiHA8H lMGIpx/zVGKT4CG/UD5fXkHPTp7sAI+hY/s/RUK2pbdYKigOClRSlDtUA5zfisLSfILd c0Kw== X-Gm-Message-State: AKaTC01aUDeIhfkDjqxjSSAFH82PsTIRfNXtomOUFwmJjk0/SgwW/98gzCFrulw8062Kx2S2 X-Received: by 10.99.135.200 with SMTP id i191mr122933855pge.18.1481135429876; Wed, 07 Dec 2016 10:30:29 -0800 (PST) Received: from localhost (c-98-203-232-209.hsd1.wa.comcast.net. [98.203.232.209]) by smtp.gmail.com with ESMTPSA id 186sm44248923pfv.61.2016.12.07.10.30.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Dec 2016 10:30:29 -0800 (PST) From: Kevin Hilman To: Hans Verkuil , Laurent Pinchart , Sakari Ailus , linux-media@vger.kernel.org Cc: Sekhar Nori , Axel Haslam , =?UTF-8?q?Bartosz=20Go=C5=82aszewski?= , Alexandre Bailon , David Lechner , Patrick Titiano , linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 2/5] [media] davinci: vpif_capture: remove hard-coded I2C adapter id Date: Wed, 7 Dec 2016 10:30:22 -0800 Message-Id: <20161207183025.20684-3-khilman@baylibre.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161207183025.20684-1-khilman@baylibre.com> References: <20161207183025.20684-1-khilman@baylibre.com> MIME-Version: 1.0 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: 2016.12.7.182416 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1700_1799 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, DKIM_SIGNATURE 0, IN_REP_TO 0, LEGITIMATE_NEGATE 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, MULTIPLE_REAL_RCPTS 0, NO_URI_HTTPS 0, REFERENCES 0, SINGLE_URI_IN_BODY 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __CP_URI_IN_BODY 0, __CTE 0, __FROM_DOMAIN_IN_ANY_CC2 0, __FROM_DOMAIN_IN_RCPT 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __NO_HTML_TAG_RAW 0, __REFERENCES 0, __SANE_MSGID 0, __SINGLE_URI_TEXT 0, __TO_MALFORMED_2 0, __TO_NAME 0, __TO_NAME_DIFF_FROM_ACC 0, __TO_REAL_NAMES 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS , __URI_WITH_PATH 0, __YOUTUBE_RCVD 0' Remove hard-coded I2C adapter in favor of getting the ID from platform_data. Signed-off-by: Kevin Hilman Acked-by: Sakari Ailus --- drivers/media/platform/davinci/vpif_capture.c | 5 ++++- include/media/davinci/vpif_types.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c index 20c4344ed118..c24049acd40a 100644 --- a/drivers/media/platform/davinci/vpif_capture.c +++ b/drivers/media/platform/davinci/vpif_capture.c @@ -1486,7 +1486,10 @@ static __init int vpif_probe(struct platform_device *pdev) } if (!vpif_obj.config->asd_sizes) { - i2c_adap = i2c_get_adapter(1); + int i2c_id = vpif_obj.config->i2c_adapter_id; + + i2c_adap = i2c_get_adapter(i2c_id); + WARN_ON(!i2c_adap); for (i = 0; i < subdev_count; i++) { subdevdata = &vpif_obj.config->subdev_info[i]; vpif_obj.sd[i] = diff --git a/include/media/davinci/vpif_types.h b/include/media/davinci/vpif_types.h index 3cb1704a0650..4282a7db99d4 100644 --- a/include/media/davinci/vpif_types.h +++ b/include/media/davinci/vpif_types.h @@ -82,6 +82,7 @@ struct vpif_capture_config { struct vpif_capture_chan_config chan_config[VPIF_CAPTURE_MAX_CHANNELS]; struct vpif_subdev_info *subdev_info; int subdev_count; + int i2c_adapter_id; const char *card_name; struct v4l2_async_subdev **asd; /* Flat array, arranged in groups */ int *asd_sizes; /* 0-terminated array of asd group sizes */