From patchwork Mon Nov 21 16:15:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Haslam X-Patchwork-Id: 9439745 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 30D9E600BA for ; Mon, 21 Nov 2016 16:18:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0144228B34 for ; Mon, 21 Nov 2016 16:18:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E940328B55; Mon, 21 Nov 2016 16:18:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B2C2028B46 for ; Mon, 21 Nov 2016 16:18:02 +0000 (UTC) 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 1c8rGf-0006fX-GQ; Mon, 21 Nov 2016 16:16:29 +0000 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c8rGK-0006Wd-0g for linux-arm-kernel@lists.infradead.org; Mon, 21 Nov 2016 16:16:09 +0000 Received: by mail-wm0-x236.google.com with SMTP id c184so22706681wmd.0 for ; Mon, 21 Nov 2016 08:15:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=C7t32woyyHMoo0jDde+Tre1b/629BaNW1DxozhDPPc8=; b=bWXIwbV/KfZl0o86c4r9oA7K5TNSg47LoYih9ZnhPXIZedWTShXvKJBp/wYB1dvLz9 yL7e4SLo1lxMVZI6t0G2oSd+3bzlmainj+iGJLQcBqst53Y02jq5Lpyf4p9fRaX7fvW6 NZMdZq5F2fHBTuBMbyDkQGT51NEPO0rDegadaA7VN2YKwZ4maIQ9WQEN1SbFYSAa+7Xm EOUmpvLAkACaAa7QUzSgNq+NU8wl72BrTK8qEwNgtyt9el9zpPk5VRIureGvkl5DZFyx rbl+keCiPrlbDlJ/sMOunM7OKv6MOoIQ3SEu2AINDexVv9qCadD+k96lQ9PZE15kzqJQ 1A+w== 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=C7t32woyyHMoo0jDde+Tre1b/629BaNW1DxozhDPPc8=; b=YthdqKAtn0LGeciCnp+urcqVdYQKUjxwvafgaF+poR0N4uavhUA2yL5I8/ve+8vHln nVP152TJqRsFqfXnw+tcRL5WKmqPx28HGjYVScJG2aCYKkLkJM2/Z3cE9W4uDENk3Ia/ LWEB3bKLMI0524EUr5JBYPaEAFCB0eNEQSSjab/5HZE3bs6498/hDquPbx/0JSlb906i 7dD0XTQbSlp0tupa0SMZuMnEh748meGpcvnXegJQAWNjCuc7Ha35bsjnJGmBvVxi+ahS OyWNTmWGnctCSyF2JeMshNDWzkAePbvIniP6z+93ZZGUHFwTaRbfI3lMOLGgGeRJ/x8o 98Yg== X-Gm-Message-State: AKaTC02JBk7vd1Gm4uyXnaXIjxmuK91d9HrnFupF9mqcfhUuJgvaZ2Gik4P80eb7b859KVTF X-Received: by 10.28.45.142 with SMTP id t136mr17143557wmt.110.1479744947793; Mon, 21 Nov 2016 08:15:47 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id l187sm20365294wml.6.2016.11.21.08.15.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Nov 2016 08:15:47 -0800 (PST) From: Axel Haslam To: nsekhar@ti.com, khilman@kernel.org Subject: [PATCH 2/3] ARM: davinci: hawk: remove mmc ro pin Date: Mon, 21 Nov 2016 17:15:40 +0100 Message-Id: <20161121161541.27048-3-ahaslam@baylibre.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161121161541.27048-1-ahaslam@baylibre.com> References: <20161121161541.27048-1-ahaslam@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161121_081608_276213_76A32404 X-CRM114-Status: GOOD ( 12.19 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Axel Haslam , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The hawk board does not have a write protect pin to read the card write protect status. So remove un-needed platform data declaration for this gpio. Signed-off-by: Axel Haslam --- arch/arm/mach-davinci/board-omapl138-hawk.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index c0c24ba9..ddc312d 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -26,7 +26,6 @@ #define HAWKBOARD_PHY_ID "davinci_mdio-0:07" #define DA850_HAWK_MMCSD_CD_PIN GPIO_TO_PIN(4, 0) -#define DA850_HAWK_MMCSD_WP_PIN GPIO_TO_PIN(3, 13) #define DA850_USB1_VBUS_PIN GPIO_TO_PIN(2, 4) #define DA850_USB1_OC_PIN GPIO_TO_PIN(6, 13) @@ -119,22 +118,16 @@ static struct edma_rsv_info *da850_edma_rsv[2] = { static const short hawk_mmcsd0_pins[] = { DA850_MMCSD0_DAT_0, DA850_MMCSD0_DAT_1, DA850_MMCSD0_DAT_2, DA850_MMCSD0_DAT_3, DA850_MMCSD0_CLK, DA850_MMCSD0_CMD, - DA850_GPIO4_0, DA850_GPIO3_13, + DA850_GPIO4_0, -1 }; -static int da850_hawk_mmc_get_ro(int index) -{ - return gpio_get_value(DA850_HAWK_MMCSD_WP_PIN); -} - static int da850_hawk_mmc_get_cd(int index) { return !gpio_get_value(DA850_HAWK_MMCSD_CD_PIN); } static struct davinci_mmc_config da850_mmc_config = { - .get_ro = da850_hawk_mmc_get_ro, .get_cd = da850_hawk_mmc_get_cd, .wires = 4, .max_freq = 50000000, @@ -159,14 +152,6 @@ static __init void omapl138_hawk_mmc_init(void) return; } - ret = gpio_request_one(DA850_HAWK_MMCSD_WP_PIN, - GPIOF_DIR_IN, "MMC WP"); - if (ret < 0) { - pr_warn("%s: can not open GPIO %d\n", - __func__, DA850_HAWK_MMCSD_WP_PIN); - goto mmc_setup_wp_fail; - } - ret = da8xx_register_mmcsd0(&da850_mmc_config); if (ret) { pr_warn("%s: MMC/SD0 registration failed: %d\n", __func__, ret); @@ -176,8 +161,6 @@ static __init void omapl138_hawk_mmc_init(void) return; mmc_setup_mmcsd_fail: - gpio_free(DA850_HAWK_MMCSD_WP_PIN); -mmc_setup_wp_fail: gpio_free(DA850_HAWK_MMCSD_CD_PIN); }