From patchwork Mon Dec 23 20:28:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentine Barshak X-Patchwork-Id: 3398101 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E74589F169 for ; Mon, 23 Dec 2013 20:28:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EFCB320784 for ; Mon, 23 Dec 2013 20:28:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DA42D20148 for ; Mon, 23 Dec 2013 20:28:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757897Ab3LWU2M (ORCPT ); Mon, 23 Dec 2013 15:28:12 -0500 Received: from mail-la0-f44.google.com ([209.85.215.44]:45897 "EHLO mail-la0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757715Ab3LWU2L (ORCPT ); Mon, 23 Dec 2013 15:28:11 -0500 Received: by mail-la0-f44.google.com with SMTP id ep20so2490897lab.17 for ; Mon, 23 Dec 2013 12:28:10 -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=FjSz9JoxX0JfqqgN+QyRQpdwWsIe6mMLoOLsGgQCBbM=; b=BnFGgYOPsvRH+wHpXmvCBCbQgecNpRHb1wtntNNHC1/Pkl2AVpPqUyybkphQVg9S1f 661rit62wfk4YfHFZAcIFcs16AJNpWzNgmrzc9OFfIlec8P0v1dfBxto9eMeojvrUZVo Xofu5T7kgdb3olGZ0sXhlUgBs5M3jmW/znppM8HgjQ2UiEF69mKwug6hvZrhWJZlgaOQ LXrNbnqebK+j9NnNI7PxgcML6Mlil5fYw1Sp9gTLHE4xQ5yNGynJG35WpRKAzXwLh2f0 cT7JCmzr1jINU/1Ot3MSplEkLaqbqxUNSYK6VQ1KAVho+WNeKvezG9eVpiY/xG3q4dZA 318g== X-Gm-Message-State: ALoCoQkyy5wtI/SwbmtjQpI33T6v7ATN3bXOldRO3Vx8PyCsemkg1mYEO/9NmfcGsYQtkx9UUAFO X-Received: by 10.153.7.106 with SMTP id db10mr11794932lad.9.1387830490162; Mon, 23 Dec 2013 12:28:10 -0800 (PST) Received: from black.localnet ([93.100.122.208]) by mx.google.com with ESMTPSA id rb4sm12368799lbb.1.2013.12.23.12.28.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Dec 2013 12:28:09 -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] media: soc_camera: rcar_vin: Add preliminary R-Car M2 support Date: Tue, 24 Dec 2013 00:28:06 +0400 Message-Id: <1387830486-10650-1-git-send-email-valentine.barshak@cogentembedded.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This adds R-Car M2 (R8A7791) VIN support. Signed-off-by: Valentine Barshak --- drivers/media/platform/soc_camera/rcar_vin.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c index 6866bb4..8b79727 100644 --- a/drivers/media/platform/soc_camera/rcar_vin.c +++ b/drivers/media/platform/soc_camera/rcar_vin.c @@ -106,6 +106,7 @@ #define VIN_MAX_HEIGHT 2048 enum chip_id { + RCAR_M2, RCAR_H2, RCAR_H1, RCAR_M1, @@ -302,8 +303,8 @@ 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 || - priv->chip == RCAR_E1) { + if (priv->chip == RCAR_M2 || priv->chip == RCAR_H2 || + priv->chip == RCAR_H1 || priv->chip == RCAR_E1) { dmr = VNDMR_EXRGB; break; } @@ -1384,6 +1385,7 @@ static struct soc_camera_host_ops rcar_vin_host_ops = { }; static struct platform_device_id rcar_vin_id_table[] = { + { "r8a7791-vin", RCAR_M2 }, { "r8a7790-vin", RCAR_H2 }, { "r8a7779-vin", RCAR_H1 }, { "r8a7778-vin", RCAR_M1 },