From patchwork Tue Jan 17 19:34:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 9521801 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 C5EC56020B for ; Tue, 17 Jan 2017 19:34:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC046285AD for ; Tue, 17 Jan 2017 19:34:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A0BA6285B3; Tue, 17 Jan 2017 19:34:49 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 96712285AD for ; Tue, 17 Jan 2017 19:34:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751025AbdAQTeV (ORCPT ); Tue, 17 Jan 2017 14:34:21 -0500 Received: from mail-it0-f66.google.com ([209.85.214.66]:34157 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750991AbdAQTeT (ORCPT ); Tue, 17 Jan 2017 14:34:19 -0500 Received: by mail-it0-f66.google.com with SMTP id o185so16691848itb.1; Tue, 17 Jan 2017 11:34:13 -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=FOi4FcDWJoVatm7tz4kSjz8qIgvAKsmZ6S4JQg5ri9Y=; b=AtmL0D/RneurPjSj38awgDjkDdCPcSLyB4prtHhjjuLJzM8tvkS5VAirS5udfNIvip U3b+h4jBSHJWXDOzvue93VRqxCVa30wq69dXyPkvhvUIARGZKAYK1XoLG6wny7R4swp9 683DnpFcMOR89mcBrnpingWy61t1U4U+q/OGceAQ6VkvbAn6G8MvO1umE2qMpSOohBXq af4F3F/FnlrcduABDQuiqrNqnE+tjOl5KN/t18uYr91wdagoleGEb/QWveNCxpLuOnfS 49yjAjBe9PmyxcRZ2CntYG7Ee2tm4mlUD1DWMJH1OxeMr0yejmbHYGVg1uM6LV8RR/pk S61w== 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=FOi4FcDWJoVatm7tz4kSjz8qIgvAKsmZ6S4JQg5ri9Y=; b=jG1RGedO8IDNXRyJqIY0vcawZrmwivsHJXlKNQOLk/xolkNaa6p6Ncli8DF61SLRff tpn2qRQHxx2vnXY+KZizGYyZsQ39fxokAx0qBmGgOWuf0eIdKBQDYWseTF08aPr3QQG/ Rsa1915dELgWfx3UIjtjIlN7227nFkeMS4T3hBDFxCg/UM9GPOwUxI1idWKz9d0h38w1 Hvd1wGffD7l5QmC+LkKX+1U58vzeDPT0fwTjV2gr7ceN6c1JKdsRGGCBt//eGphrYQVB 994hPYoaRMc5f3kzvY2mYvYBAWAnmZ8UsU42Ylj+bpi8Paa4WYh7SDjmFH7Erac+CS7B MkhQ== X-Gm-Message-State: AIkVDXKfpwq/tZn3A1o2t9SVr3pJSZK9n5Wcxzi8gzU3w49b+KiucKATLvz9JGGX6oPAFw== X-Received: by 10.36.60.7 with SMTP id m7mr21038398ita.7.1484681652877; Tue, 17 Jan 2017 11:34:12 -0800 (PST) Received: from localhost.localdomain (c-73-228-150-94.hsd1.mn.comcast.net. [73.228.150.94]) by smtp.gmail.com with ESMTPSA id g130sm7793439ita.10.2017.01.17.11.34.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Jan 2017 11:34:11 -0800 (PST) From: Adam Ford To: linux-omap@vger.kernel.org, stable@vger.kernel.org Cc: tony@atomide.com, adam.ford@logicpd.com, Adam Ford Subject: [PATCH] ARM:DTS:OMAP3:Fix Card Detect and Write Protect on Logic PD SOM-LV Date: Tue, 17 Jan 2017 13:34:06 -0600 Message-Id: <1484681646-16124-1-git-send-email-aford173@gmail.com> X-Mailer: git-send-email 2.7.4 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 commit ab8dd3aed011 ("ARM: DTS: Add minimal Support for Logic PD DM3730 SOM-LV") where the Card Detect and Write Protect pins were improperly configured. Signed-off-by: Adam Ford diff --git a/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts b/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts index da85984..38faa90 100644 --- a/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts +++ b/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts @@ -158,7 +158,7 @@ &mmc1 { interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>; pinctrl-names = "default"; - pinctrl-0 = <&mmc1_pins &mmc1_cd>; + pinctrl-0 = <&mmc1_pins>; wp-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>; /* gpio_126 */ cd-gpios = <&gpio4 14 IRQ_TYPE_LEVEL_LOW>; /* gpio_110 */ vmmc-supply = <&vmmc1>; @@ -193,7 +193,8 @@ OMAP3_CORE1_IOPAD(0x214a, PIN_INPUT | MUX_MODE0) /* sdmmc1_dat1.sdmmc1_dat1 */ OMAP3_CORE1_IOPAD(0x214c, PIN_INPUT | MUX_MODE0) /* sdmmc1_dat2.sdmmc1_dat2 */ OMAP3_CORE1_IOPAD(0x214e, PIN_INPUT | MUX_MODE0) /* sdmmc1_dat3.sdmmc1_dat3 */ - OMAP3_CORE1_IOPAD(0x2132, PIN_INPUT_PULLUP | MUX_MODE4) /* cam_strobe.gpio_126 sdmmc1_wp*/ + OMAP3_CORE1_IOPAD(0x2132, PIN_INPUT_PULLUP | MUX_MODE4) /* cam_strobe.gpio_126 */ + OMAP3_CORE1_IOPAD(0x212c, PIN_INPUT_PULLUP | MUX_MODE4) /* cam_d11.gpio_110 */ >; }; @@ -242,12 +243,6 @@ OMAP3_WKUP_IOPAD(0x2a16, PIN_OUTPUT | PIN_OFF_OUTPUT_LOW | MUX_MODE4) /* sys_boot6.gpio_8 */ >; }; - - mmc1_cd: pinmux_mmc1_cd { - pinctrl-single,pins = < - OMAP3_WKUP_IOPAD(0x212c, PIN_INPUT_PULLUP | MUX_MODE4) /* cam_d11.gpio_110 */ - >; - }; };