From patchwork Sun Apr 24 21:08:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivaylo Dimitrov X-Patchwork-Id: 34025 X-Patchwork-Delegate: laurent.pinchart@ideasonboard.com Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1auRIi-0007CA-QD; Sun, 24 Apr 2016 21:10:44 +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.76/mailfrontend-7) with esmtp id 1auRIg-0000Ec-2l; Sun, 24 Apr 2016 23:10:44 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753345AbcDXVKh (ORCPT + 1 other); Sun, 24 Apr 2016 17:10:37 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35740 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753268AbcDXVKb (ORCPT ); Sun, 24 Apr 2016 17:10:31 -0400 Received: by mail-wm0-f67.google.com with SMTP id e201so17587634wme.2 for ; Sun, 24 Apr 2016 14:10:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EbLl4bWMmy+3Ma5gfEfVH9+MFhKtTedzgQ0/i43ZCZ4=; b=hl4dGdDcmDRC3r9vPx7+t76i4j7QFPVuRaDggU+mkFr6WKLO2TEx6UofpjnAd2t+qI gZO+jFsWlm4TjtBVW3DHHQQUSLtK/u7Hrwp6izxuBnbfbKAzWyaCZ665Kz3frIaPW0kS 5kTZNsJ2+15Tk26dtrWpaFERhyvHPUIY8dIJJJWcm9Z0wuj5A5vDhgSzN0c8xgZLK5g9 huSXM8OM/4cLD2ZjIwi5zbT83FbOAP1XLLJTnECUUHeLzyvuGGAlU7spEhQnYh7btqzE g/NHCI60RuRBBnzDrlfMfMkRpesG3UWxp/NOkO7RwVD0gvzSLQ573CDSgCSf+ds2g3hu 6z3A== 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; bh=EbLl4bWMmy+3Ma5gfEfVH9+MFhKtTedzgQ0/i43ZCZ4=; b=BmRn/Yw5Gh6HZF5H8M2LuvWyxVfXGqfr+c8YBng8Z46LT8GGoLqlIR964yhLHLwRCj MfSZsMf/wVTZVl4gmGiquwrHG1iuS2Z+W+GkOyBWpF+c7fJbzt8LqoKhg9Sjgza662mL OpIGWepdaajNtiBubqiAKohfeh/X2F7zXj7VfvYA3hLDFPx6Ml0pkj95cJAJ5CPnmp7t KN3k319IM1HRrXyvwubAGHso+A+iY6Q8qqxFgqw1loVMYWJJ0Z4Uls/saFbzs7uqoh+C bz1P2kVUYmpPJPre4BjjHZGTGbyTyJt708jkx5ZFYZroH/+AIMwptiaY66EphALX6DUu 72rQ== X-Gm-Message-State: AOPr4FXCKQ0Qgi1aIEOcXIJMv6hYGPignMQV1otWQlP57/4eV6bTa0ne9gjzyUAmrLCKfA== X-Received: by 10.28.133.129 with SMTP id h123mr8394363wmd.33.1461532229823; Sun, 24 Apr 2016 14:10:29 -0700 (PDT) Received: from localhost.localdomain ([46.249.74.23]) by smtp.gmail.com with ESMTPSA id b2sm15440182wmb.9.2016.04.24.14.10.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 24 Apr 2016 14:10:29 -0700 (PDT) From: Ivaylo Dimitrov To: sakari.ailus@iki.fi Cc: sre@kernel.org, pali.rohar@gmail.com, pavel@ucw.cz, linux-media@vger.kernel.org Subject: [RFC PATCH 17/24] smiapp: add CCP2 support Date: Mon, 25 Apr 2016 00:08:17 +0300 Message-Id: <1461532104-24032-18-git-send-email-ivo.g.dimitrov.75@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461532104-24032-1-git-send-email-ivo.g.dimitrov.75@gmail.com> References: <20160420081427.GZ32125@valkosipuli.retiisi.org.uk> <1461532104-24032-1-git-send-email-ivo.g.dimitrov.75@gmail.com> 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.4.24.210315 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1800_1899 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 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, __DATE_TZ_RU 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 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, __PHISH_SPEAR_STRUCTURE_1 0, __REFERENCES 0, __SANE_MSGID 0, __SINGLE_URI_TEXT 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS , __URI_WITH_PATH 0, __YOUTUBE_RCVD 0' From: Sebastian Reichel Add support for CCP2 connected SMIA sensors as found on the Nokia N900. Signed-off-by: Sebastian Reichel Acked-by: Sakari Ailus --- drivers/media/i2c/smiapp/smiapp-core.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c index c6a897b..ec19532 100644 --- a/drivers/media/i2c/smiapp/smiapp-core.c +++ b/drivers/media/i2c/smiapp/smiapp-core.c @@ -3016,13 +3016,19 @@ static struct smiapp_platform_data *smiapp_get_pdata(struct device *dev) switch (bus_cfg->bus_type) { case V4L2_MBUS_CSI2: pdata->csi_signalling_mode = SMIAPP_CSI_SIGNALLING_MODE_CSI2; + pdata->lanes = bus_cfg->bus.mipi_csi2.num_data_lanes; + break; + case V4L2_MBUS_CCP2: + pdata->csi_signalling_mode = (bus_cfg->bus.mipi_csi1.strobe) ? + SMIAPP_CSI_SIGNALLING_MODE_CCP2_DATA_STROBE : + SMIAPP_CSI_SIGNALLING_MODE_CCP2_DATA_CLOCK; + pdata->lanes = 1; break; - /* FIXME: add CCP2 support. */ default: + dev_err(dev, "unknown bus protocol\n"); goto out_err; } - pdata->lanes = bus_cfg->bus.mipi_csi2.num_data_lanes; dev_dbg(dev, "lanes %u\n", pdata->lanes); /* xshutdown GPIO is optional */ @@ -3039,7 +3045,7 @@ static struct smiapp_platform_data *smiapp_get_pdata(struct device *dev) goto out_err; } - dev_dbg(dev, "reset %d, nvm %d, clk %d, csi %d\n", pdata->xshutdown, + dev_dbg(dev, "reset %d, nvm %d, clk %d, mode %d\n", pdata->xshutdown, pdata->nvm_size, pdata->ext_clk, pdata->csi_signalling_mode); if (!bus_cfg->nr_of_link_frequencies) {