From patchwork Sat Dec 22 20:16:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 10741453 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0238013A4 for ; Sat, 22 Dec 2018 20:17:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA86028A4E for ; Sat, 22 Dec 2018 20:17:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C894828A51; Sat, 22 Dec 2018 20:17:05 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 550AE28A4E for ; Sat, 22 Dec 2018 20:17:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389348AbeLVURC (ORCPT ); Sat, 22 Dec 2018 15:17:02 -0500 Received: from mail-io1-f66.google.com ([209.85.166.66]:35079 "EHLO mail-io1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733249AbeLVURB (ORCPT ); Sat, 22 Dec 2018 15:17:01 -0500 Received: by mail-io1-f66.google.com with SMTP id o13so5056038ioh.2 for ; Sat, 22 Dec 2018 12:17:01 -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; bh=UVvZd+9RaVk6WMBavPCboqafZ5RG+SKL27q64YSA2j4=; b=mzM8wCu83HdwRjVovFybYjgOfdt1Jn2QAUCzaVrUI6V5zIyqoBWz7aFyjzrWuR1Eq+ OCCK2LMtvQKl82oTu4IQRUdlOqzA35Kq7wcpjZlrjVGqWnbpnl8kEpQ2alYXH4biVQvG vJ3RK5URjx+WoS73btyYqDkli6YvWdG0Kg223ZfXJfMKwbcKV+qKzZW4/ohoVGVqCw75 9J5FPQGq7k9FnFQlpwttj9eoyslTd9ITXF0/WubK2RtwO+2oUffftTSF94uCvf2bdmkA sMclwNDkgeilCGUnpVdiaWh6sji4XRzIpILhzPSmO0DZOU5HdqH1httsnBmBjLnsE4Ar 4u1Q== 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; bh=UVvZd+9RaVk6WMBavPCboqafZ5RG+SKL27q64YSA2j4=; b=kUIZJk9nUHPxOzrqG1Y3dwBck8jQzDZlslGpXhhb/TPmxXb6A393GaROj6jNR5imQz NFgsA+lwvZm8jpl9Gv0hCRWTpZptcK2uxxaQMB0IXwZXjWViBmx9vAX+gDUs4iZswf5r ar5MC3zWlWkQ5rmKt3OklcZgURsnI4RjHlYMjra64seDOloDJr07qKLrjfe2nTyz03IA zjuz2abeW5HaOJhL4aMLLNJClq4zeT/JiT46/QfeFr0byPqPu2YhnSsFvJnpPAqNTWZE 1mXMn0roaCGsR4iHPEvBXasyKEp/tOMwDamFy5/qKnBJ7C1F7aRMYNiL88LVKbYmQL+s 5C5w== X-Gm-Message-State: AJcUukfYLTlHKNFR+kkgCivXjFq8w2sTNKBVeZvHWHUCjbu1cQtZbW+/ 1apT9Jwvin68XmwEkaATokttgrVvKBM= X-Google-Smtp-Source: ALg8bN59UNfLBxzkvkPiBlyL4L6VrzyVa8gM3AOCAfYYM2zELs4ZrSbD0CP3Bf47SFlSbeebpDjjnA== X-Received: by 2002:a5e:8b46:: with SMTP id z6mr4965063iom.7.1545509820200; Sat, 22 Dec 2018 12:17:00 -0800 (PST) Received: from localhost.localdomain (c-73-37-219-234.hsd1.mn.comcast.net. [73.37.219.234]) by smtp.gmail.com with ESMTPSA id w24sm385555ioc.11.2018.12.22.12.16.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Dec 2018 12:16:58 -0800 (PST) From: Adam Ford To: linux-omap@vger.kernel.org Cc: tony@atomide.com, adam.ford@logicpd.com, Adam Ford Subject: [PATCH] ARM: OMAP: pdata-quirks: Remove pbias reference from Torpedo Date: Sat, 22 Dec 2018 14:16:48 -0600 Message-Id: <20181222201648.23449-1-aford173@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This fixes an issue where the MMC errors our during boot which requires the user to eject and re-insert the MMC. The bootloader has been updated for a while to correct set the pbias for the GPIO pins. Kernels 4.20-RC1+ are getting hung up on intializing the MMC. Removing the duplicative PBIAS setting appears to eliminate the issue. Signed-off-by: Adam Ford diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c index 9fec5f84bf77..05cd546bf61c 100644 --- a/arch/arm/mach-omap2/pdata-quirks.c +++ b/arch/arm/mach-omap2/pdata-quirks.c @@ -57,26 +57,6 @@ static void __init omap2420_n8x0_legacy_init(void) #endif #ifdef CONFIG_ARCH_OMAP3 -/* - * Configures GPIOs 126, 127 and 129 to 1.8V mode instead of 3.0V - * mode for MMC1 in case bootloader did not configure things. - * Note that if the pins are used for MMC1, pbias-regulator - * manages the IO voltage. - */ -static void __init omap3_gpio126_127_129(void) -{ - u32 reg; - - reg = omap_ctrl_readl(OMAP343X_CONTROL_PBIAS_LITE); - reg &= ~OMAP343X_PBIASLITEVMODE1; - reg |= OMAP343X_PBIASLITEPWRDNZ1; - omap_ctrl_writel(reg, OMAP343X_CONTROL_PBIAS_LITE); - if (cpu_is_omap3630()) { - reg = omap_ctrl_readl(OMAP34XX_CONTROL_WKUP_CTRL); - reg |= OMAP36XX_GPIO_IO_PWRDNZ; - omap_ctrl_writel(reg, OMAP34XX_CONTROL_WKUP_CTRL); - } -} static void __init hsmmc2_internal_input_clk(void) { @@ -300,7 +280,6 @@ static void __init omap3_tao3530_legacy_init(void) static void __init omap3_logicpd_torpedo_init(void) { - omap3_gpio126_127_129(); platform_device_register(&wl128x_device); platform_device_register(&btwilink_device); }