From patchwork Mon Dec 26 12:56:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 708790 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tnJzF1mjGz9srZ for ; Tue, 27 Dec 2016 00:01:29 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Sh7BfBDM"; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cLUpz-0002B4-Nv; Mon, 26 Dec 2016 12:57:11 +0000 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cLUpg-000235-Hd for linux-arm-kernel@lists.infradead.org; Mon, 26 Dec 2016 12:56:53 +0000 Received: by mail-qt0-x243.google.com with SMTP id 41so12639464qtn.0 for ; Mon, 26 Dec 2016 04:56:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Mh3OeolvXEIZNBVX3t4lcrIxKDIIChmDoWO4cME90MM=; b=Sh7BfBDMmN4uX8MrLkj+vcXMHKVnqvqrG1GGSupNHP69wsU/jI7O+tuJ0kayKgTFPt EQoCG/YGRsDvsmHrUJFRVNwQmemgMPhjwE4S1+BSqLFaliwr7YfxuOWI8nbQMMIrZ2G9 j3+iGwQ36YmP7rmyQXegzLXdNBubSw2AW+gkKjqYSroO59yWWkIBcVblIFGqZ07nqbmP bK+Z5Q24wD3nFCoEESoWmtqbeTbIqmeUI2WwRKGYX5FfqQXX6HZufCGXqC+81NtLlXZ1 3yhT/BkJDpxcWvkzM5ujLFtrr8mc14RoYShEaV3/169PPiE/VBXb4ZH3WAASJshA6SMZ Nb3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Mh3OeolvXEIZNBVX3t4lcrIxKDIIChmDoWO4cME90MM=; b=Xy7LbU8UDMGDS5dtYCiKnbZdk/6i6/MCuGTjrc18Q8LB0pjcHlDzACRJrQn2E0wjpG OsKcK7R2LkEJZomsY+4eW5WWwDKOD+ArRkz6yObxHjM/NAFyQB7Xod6YsLhPyQvefIdr 7GQsHPkqTo32F6je0qkx5JWsn5cjZYqK8gH4uJkDI05qjYr0d9j2ZHWL73yBAN/E4eUJ ZTffBFoFtSQOFYM+Ah6PlXaRn1hn1Z72dxO2SlARkJXodosoaf2SB9ZpjMnEHV8PA5gq r8gLh9L6NMa/FGHC1V2dUx+y/OxA29QBPSZXkJwi4eo4FYuZ/T0TPCDs7WoEaSd/CDNG mcIg== X-Gm-Message-State: AIkVDXIsJTQJYunpsTrA4RLv03YaBBHmKzRgE1dMcTBfgNFulLoBccSgxGmePEt9TONYCg== X-Received: by 10.200.53.243 with SMTP id l48mr18327113qtb.193.1482756990159; Mon, 26 Dec 2016 04:56:30 -0800 (PST) Received: from localhost.localdomain ([187.180.187.205]) by smtp.gmail.com with ESMTPSA id k20sm19555015qkl.11.2016.12.26.04.56.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Dec 2016 04:56:29 -0800 (PST) From: Fabio Estevam To: shawnguo@kernel.org Subject: [PATCH 2/6] ARM: mx31moboard-marxbot: Remove camera support Date: Mon, 26 Dec 2016 10:56:23 -0200 Message-Id: <1482756987-12414-2-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482756987-12414-1-git-send-email-festevam@gmail.com> References: <1482756987-12414-1-git-send-email-festevam@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161226_045652_819363_8A2B239C X-CRM114-Status: GOOD ( 11.91 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2607:f8b0:400d:c0d:0:0:0:243 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (festevam[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -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 X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabio Estevam , lilja.magnus@gmail.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org From: Fabio Estevam Since commit c93cc61475ebbe6e66 ("[media] staging/media: remove deprecated mx3 driver") the mx3 camera driver has been removed, so remove the camera support from the board file as well. Signed-off-by: Fabio Estevam --- arch/arm/mach-imx/mx31moboard-marxbot.c | 81 --------------------------------- 1 file changed, 81 deletions(-) diff --git a/arch/arm/mach-imx/mx31moboard-marxbot.c b/arch/arm/mach-imx/mx31moboard-marxbot.c index 2e895a8..0281fd2 100644 --- a/arch/arm/mach-imx/mx31moboard-marxbot.c +++ b/arch/arm/mach-imx/mx31moboard-marxbot.c @@ -24,8 +24,6 @@ #include -#include - #include "common.h" #include "devices-imx31.h" #include "ehci.h" @@ -143,82 +141,6 @@ static struct spi_board_info marxbot_spi_board_info[] __initdata = { }, }; -#define TURRETCAM_POWER IOMUX_TO_GPIO(MX31_PIN_GPIO3_1) -#define BASECAM_POWER IOMUX_TO_GPIO(MX31_PIN_CSI_D5) -#define TURRETCAM_RST_B IOMUX_TO_GPIO(MX31_PIN_GPIO3_0) -#define BASECAM_RST_B IOMUX_TO_GPIO(MX31_PIN_CSI_D4) -#define CAM_CHOICE IOMUX_TO_GPIO(MX31_PIN_TXD2) - -static int marxbot_basecam_power(struct device *dev, int on) -{ - gpio_set_value(BASECAM_POWER, !on); - return 0; -} - -static int marxbot_basecam_reset(struct device *dev) -{ - gpio_set_value(BASECAM_RST_B, 0); - udelay(100); - gpio_set_value(BASECAM_RST_B, 1); - return 0; -} - -static struct i2c_board_info marxbot_i2c_devices[] = { - { - I2C_BOARD_INFO("mt9t031", 0x5d), - }, -}; - -static struct soc_camera_link base_iclink = { - .bus_id = 0, /* Must match with the camera ID */ - .power = marxbot_basecam_power, - .reset = marxbot_basecam_reset, - .board_info = &marxbot_i2c_devices[0], - .i2c_adapter_id = 0, -}; - -static struct platform_device marxbot_camera[] = { - { - .name = "soc-camera-pdrv", - .id = 0, - .dev = { - .platform_data = &base_iclink, - }, - }, -}; - -static struct platform_device *marxbot_cameras[] __initdata = { - &marxbot_camera[0], -}; - -static int __init marxbot_cam_init(void) -{ - int ret = gpio_request(CAM_CHOICE, "cam-choice"); - if (ret) - return ret; - gpio_direction_output(CAM_CHOICE, 0); - - ret = gpio_request(BASECAM_RST_B, "basecam-reset"); - if (ret) - return ret; - gpio_direction_output(BASECAM_RST_B, 1); - ret = gpio_request(BASECAM_POWER, "basecam-standby"); - if (ret) - return ret; - gpio_direction_output(BASECAM_POWER, 0); - - ret = gpio_request(TURRETCAM_RST_B, "turretcam-reset"); - if (ret) - return ret; - gpio_direction_output(TURRETCAM_RST_B, 1); - ret = gpio_request(TURRETCAM_POWER, "turretcam-standby"); - if (ret) - return ret; - gpio_direction_output(TURRETCAM_POWER, 0); - - return 0; -} - #define SEL0 IOMUX_TO_GPIO(MX31_PIN_DTR_DCE1) #define SEL1 IOMUX_TO_GPIO(MX31_PIN_DSR_DCE1) #define SEL2 IOMUX_TO_GPIO(MX31_PIN_RI_DCE1) @@ -356,9 +278,6 @@ void __init mx31moboard_marxbot_init(void) spi_register_board_info(marxbot_spi_board_info, ARRAY_SIZE(marxbot_spi_board_info)); - marxbot_cam_init(); - platform_add_devices(marxbot_cameras, ARRAY_SIZE(marxbot_cameras)); - /* battery present pin */ gpio_request(IOMUX_TO_GPIO(MX31_PIN_LCS0), "bat-present"); gpio_direction_input(IOMUX_TO_GPIO(MX31_PIN_LCS0));