From patchwork Fri Jun 26 11:53:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Verkuil X-Patchwork-Id: 11627395 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6F2081392 for ; Fri, 26 Jun 2020 12:22:00 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 11CC0207D8 for ; Fri, 26 Jun 2020 12:22:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="WaR3jr3J"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=xs4all.nl header.i=@xs4all.nl header.b="mx8WH328" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 11CC0207D8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xs4all.nl Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mZPLGj1NpCFCWwKPOiTt09587scrL3/VwxRuMshCJHo=; b=WaR3jr3JO1hUu3mxpFCuhhiXK FmenLCYVKkLAmWGkPgSl7HybWAHjz8P+nOD3exqGFs8/okujYWf2pwtzDTr5jPJcCaP2VYlH2J2jF UDZhpKvu3XgPdQge3AHtA72MPRX4wT083mLPt9nbM4K5RVXjuH0Pk57hmXD7oOrwibMiSIsyW7N29 djmYJa5C2Y1fEEwVXhT5k95Krg4lr0jhcZJZz/UiRnVGYGmoCRFFa0eexLUnZuq4bv0kv5P91YJ+A mv8Og/2SO607xEriunTovcE6t5rMojW/dv1IbazvDQ9gkNiQnnO+HNSAt66z/NtuKdCptmcQV3+/Y HqUy8aiPg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jonK7-0001ux-Ux; Fri, 26 Jun 2020 12:19:16 +0000 Received: from lb2-smtp-cloud8.xs4all.net ([194.109.24.25]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jomvS-00070W-HR for linux-arm-kernel@lists.infradead.org; Fri, 26 Jun 2020 11:54:02 +0000 Received: from cust-b5b5937f ([IPv6:fc0c:c16d:66b8:757f:c639:739b:9d66:799d]) by smtp-cloud8.xs4all.net with ESMTPA id omv4jNJEP0MRaomvLjN2nO; Fri, 26 Jun 2020 13:53:39 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xs4all.nl; s=s1; t=1593172419; bh=3NGkg9jtYaeqc5bKrG6IOVQP2LXCnDH/oz9GeKbjg6Q=; h=From:To:Subject:Date:Message-Id:MIME-Version:From:Subject; b=mx8WH3289YJxJ+rnCDSAXIV2kF5V8N3y7Q7eyw2s6be0xW5zc0nhvr3J5FaOVV7Za vGLDwzCBXLhGH1f5/3w5FKM4nbQMn2ikffIuKAJKT035i+VbCt3vijiHDIwDL5V7UL Xkj2qRrqcRNNKFqLw1tKkHMSjtje+0GZJAuWOyRZvx0xfu1M6XGGMuy8MKXPO+Qout TjMN7m5wIucduNlInCzbCPciZZVHkq18rMoRk5R9oO16XHAlFgtFmFBZXoYE03UCh4 BPZ2q7eYmKShsrS1VGXzvv70m5B+3s7Z1ZBUZMT3kPufeANfSxfCXSXIZ+GP007GnY USgLjd2S2vaIQ== From: Hans Verkuil To: linux-media@vger.kernel.org Subject: [PATCH 3/7] mach-imx: mach-imx27_visstrim_m10.c: remove soc_camera dependencies Date: Fri, 26 Jun 2020 13:53:17 +0200 Message-Id: <20200626115321.1898798-4-hverkuil-cisco@xs4all.nl> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200626115321.1898798-1-hverkuil-cisco@xs4all.nl> References: <20200626115321.1898798-1-hverkuil-cisco@xs4all.nl> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfIzDGmm54NkO8W3SCVbUUAstiCA20EKfCwZIT0izPaF5iBHWGwmtdzwhRo5LIoLW+5JOnha/vYGpqq8JTMDB3rHvgpWRBbDJEWi4TF3qqvKYMNoW7rsF TE5iKNNQzd6+6x/HnyCqVQ31GrfPEFHXhz+01I9VLifLttucc3VGMWTtDjZ362X1UrEIHQUfeLIfRHu/FmXjDEucAcwoFwgY3ucKAbNebMp6hHckEFNCVwZh qwkOwlEAbBekjo64OvW4SJfNLB4EIUFsG85Ou5HU0D78XTGZhBSECulHZT2Xl/M2k6SeEqJel3T90zAI0dJxTmM9UHHoI59Hnn83RH82xMI= X-Spam-Note: CRM114 invocation failed X-Spam-Score: -0.9 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [194.109.24.25 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [194.109.24.25 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hans Verkuil , linux-omap@vger.kernel.org, Arnd Bergmann , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The soc_camera.h header driver is about to be removed, so drop camera support from this board. Note that the soc_camera driver itself has long since been deprecated and can't be compiled anymore (it depends on BROKEN), so camera support on this board has been broken for a long time (at least since 4.6 when the mx2_camera.c was removed from soc_camera). Signed-off-by: Hans Verkuil Cc: Arnd Bergmann Acked-by: Arnd Bergmann --- arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 31 --------------------- 1 file changed, 31 deletions(-) diff --git a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c index c0350bc20941..3da4c0920198 100644 --- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c +++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -191,34 +190,6 @@ static const struct gpio visstrim_m10_gpios[] __initconst = { }; /* Camera */ -static int visstrim_camera_power(struct device *dev, int on) -{ - gpio_set_value(TVP5150_PWDN, on); - - return 0; -}; - -static int visstrim_camera_reset(struct device *dev) -{ - gpio_set_value(TVP5150_RSTN, 0); - ndelay(500); - gpio_set_value(TVP5150_RSTN, 1); - - return 0; -}; - -static struct i2c_board_info visstrim_i2c_camera = { - I2C_BOARD_INFO("tvp5150", 0x5d), -}; - -static struct soc_camera_link iclink_tvp5150 = { - .bus_id = 0, - .board_info = &visstrim_i2c_camera, - .i2c_adapter_id = 0, - .power = visstrim_camera_power, - .reset = visstrim_camera_reset, -}; - static struct mx2_camera_platform_data visstrim_camera = { .flags = MX2_CAMERA_CCIR | MX2_CAMERA_CCIR_INTERLACE | MX2_CAMERA_PCLK_SAMPLE_RISING, @@ -549,8 +520,6 @@ static void __init visstrim_m10_late_init(void) imx_add_platform_device("mx27vis", 0, NULL, 0, &snd_mx27vis_pdata, sizeof(snd_mx27vis_pdata)); - platform_device_register_resndata(NULL, "soc-camera-pdrv", 0, NULL, 0, - &iclink_tvp5150, sizeof(iclink_tvp5150)); gpio_led_register_device(0, &visstrim_m10_led_data);