From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C13B2C10F00 for ; Tue, 12 Mar 2019 18:06:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 88315205C9 for ; Tue, 12 Mar 2019 18:06:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552413989; bh=rDDaidtsB5XwLkohJYGh9k/L6n0B3eMDfMQPy0majLc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BI1PJ8w2BHJwwr43g5dvyTDj8HzpnQSNWUiD9QO0j5/x9WVN2jejC+4c9KseQ2lIk 1/qmAwRtKg7hhHZV7QjTAdzfJnkfJ7mYM65ow4tpbR3IiPn1WRFwmJX002G6ETE6CB 8f+oPD8kKKMECnlaCIE+bC9qEe9yoY4uDWTKoA0Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727514AbfCLRMb (ORCPT ); Tue, 12 Mar 2019 13:12:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:47824 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727507AbfCLRMa (ORCPT ); Tue, 12 Mar 2019 13:12:30 -0400 Received: from localhost (unknown [104.133.8.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 34CBA2171F; Tue, 12 Mar 2019 17:12:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552410750; bh=rDDaidtsB5XwLkohJYGh9k/L6n0B3eMDfMQPy0majLc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qB8F2Y2+PpOaj00yh+lYZlsu8SsE6K2MnG0kCQteUGnpsgPyeKqMEtK+smc6MDYGA xeO523ZJXuISDPKrJxY/G1/f/vi3CrZYfLgLCxycV21Wkz5b9JYzjGDEBfLqnXBtOS 8znQ03iNs9MAdsO1TV51SLoX+Pxt19FoWbaXdXo4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Martin Blumenstingl , Linus Walleij , Kevin Hilman , Sasha Levin Subject: [PATCH 4.20 077/171] ARM: dts: meson8m2: mxiii-plus: mark the SD card detection GPIO active-low Date: Tue, 12 Mar 2019 10:07:37 -0700 Message-Id: <20190312170354.720170892@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190312170347.868927101@linuxfoundation.org> References: <20190312170347.868927101@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 8615f5596335db0978cea593dcd0070dc5f8b116 ] After commit 89a5e15bcba87d ("gpio/mmc/of: Respect polarity in the device tree") SD cards are not detected anymore. The CD GPIO is "active low" on the MXIII-Plus. The MMC dt-bindings specify: "[...] using the "cd-inverted" property means, that the CD line is active high, i.e. it is high, when a card is inserted". Fix the description of the SD card by marking it as GPIO_ACTIVE_LOW and drop the "cd-inverted" property. This makes the definition consistent with the existing dt-bindings and fixes the check whether an SD card is inserted. Fixes: 35ee52bea66c74 ("ARM: dts: meson8m2: add support for the Tronsmart MXIII Plus") Signed-off-by: Martin Blumenstingl Reviewed-by: Linus Walleij Signed-off-by: Kevin Hilman Signed-off-by: Sasha Levin --- arch/arm/boot/dts/meson8m2-mxiii-plus.dts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/meson8m2-mxiii-plus.dts b/arch/arm/boot/dts/meson8m2-mxiii-plus.dts index f5853610b20b..6ac02beb5fa7 100644 --- a/arch/arm/boot/dts/meson8m2-mxiii-plus.dts +++ b/arch/arm/boot/dts/meson8m2-mxiii-plus.dts @@ -206,8 +206,7 @@ cap-sd-highspeed; disable-wp; - cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; - cd-inverted; + cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>; vmmc-supply = <&vcc_3v3>; }; -- 2.19.1