From patchwork Thu Dec 26 15:31:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentine Barshak X-Patchwork-Id: 21305 X-Patchwork-Delegate: g.liakhovetski@gmx.de Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1VwCuk-0002mf-Uk; Thu, 26 Dec 2013 16:31:58 +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.72/mailfrontend-8) with esmtp id 1VwCui-0002ME-m8; Thu, 26 Dec 2013 16:31:58 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753390Ab3LZPby (ORCPT + 1 other); Thu, 26 Dec 2013 10:31:54 -0500 Received: from mail-la0-f50.google.com ([209.85.215.50]:65382 "EHLO mail-la0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753285Ab3LZPbx (ORCPT ); Thu, 26 Dec 2013 10:31:53 -0500 Received: by mail-la0-f50.google.com with SMTP id el20so3813980lab.9 for ; Thu, 26 Dec 2013 07:31:52 -0800 (PST) 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; bh=klcDgXLFuf90sFEOaba6OIy30lQsxJOEYg/o1RPsYxE=; b=TcBC1lyX4LdWZKzlo00wcL9+xHdoD23aAMyRXAJyFbqH6D4ibSKdj9uA0Gop3vjgVW /exzQBVkjExqUcfsY+3l5U+V4hMO71kaW4bWm2a856611NjG/WcmVkfV5vbVtZ4PBFmM fb7Y8+5ylM10Br4QS0/QasxkKD7Wj1MPpa8tPohSLVD9RvWoUBYytMhHWiP1+E18MGxm VLjrzTw2JkGVxIRrMWTqmwqLJfBofQJYEsaG56t8QDSeGWQZqnnd8BJyYmB3Wg64YNx6 T6IWQEWtnupZicDUfFLNpJJolNsOjvjaMteMdN7/GeVds53fMFRMEd1SsW8hcCdC8LZ2 8lyg== X-Gm-Message-State: ALoCoQmtx+N1tUlJjtrimR3cb7wwjW+sXea1DDm3Dlay56hwg4aInpcmBkndHEDPLOT/q8wLhCzb X-Received: by 10.152.6.201 with SMTP id d9mr6526807laa.25.1388071912176; Thu, 26 Dec 2013 07:31:52 -0800 (PST) Received: from black.localnet ([93.100.122.208]) by mx.google.com with ESMTPSA id a8sm24266596lae.5.2013.12.26.07.31.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Dec 2013 07:31:51 -0800 (PST) From: Valentine Barshak To: linux-sh@vger.kernel.org, linux-media@vger.kernel.org Cc: Simon Horman , Magnus Damm , Kuninori Morimoto , Laurent Pinchart , Mauro Carvalho Chehab , Hans Verkuil , Guennadi Liakhovetski Subject: [PATCH V2] media: soc_camera: rcar_vin: Add preliminary R-Car M2 support Date: Thu, 26 Dec 2013 19:31:49 +0400 Message-Id: <1388071909-12207-1-git-send-email-valentine.barshak@cogentembedded.com> X-Mailer: git-send-email 1.8.3.1 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: 2013.12.26.152116 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_1600_1699 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __DATE_TZ_RU 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' This adds R-Car M2 (R8A7791) VIN support. Both H2 and M2 variants look the same from the driver's point of view, so use GEN2 id for both. Changes in V2: * Used the same (RCAR_GEN2) id for both H2 and M2 variants since they are no different from the driver's point of view. Signed-off-by: Valentine Barshak Acked-by: Laurent Pinchart --- drivers/media/platform/soc_camera/rcar_vin.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c index 6866bb4..3b1c05a 100644 --- a/drivers/media/platform/soc_camera/rcar_vin.c +++ b/drivers/media/platform/soc_camera/rcar_vin.c @@ -106,7 +106,7 @@ #define VIN_MAX_HEIGHT 2048 enum chip_id { - RCAR_H2, + RCAR_GEN2, RCAR_H1, RCAR_M1, RCAR_E1, @@ -302,7 +302,7 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv) dmr = 0; break; case V4L2_PIX_FMT_RGB32: - if (priv->chip == RCAR_H2 || priv->chip == RCAR_H1 || + if (priv->chip == RCAR_GEN2 || priv->chip == RCAR_H1 || priv->chip == RCAR_E1) { dmr = VNDMR_EXRGB; break; @@ -1384,7 +1384,8 @@ static struct soc_camera_host_ops rcar_vin_host_ops = { }; static struct platform_device_id rcar_vin_id_table[] = { - { "r8a7790-vin", RCAR_H2 }, + { "r8a7791-vin", RCAR_GEN2 }, + { "r8a7790-vin", RCAR_GEN2 }, { "r8a7779-vin", RCAR_H1 }, { "r8a7778-vin", RCAR_M1 }, { "uPD35004-vin", RCAR_E1 },