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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 96EB5C432C3 for ; Tue, 19 Nov 2019 05:24:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 68380222A2 for ; Tue, 19 Nov 2019 05:24:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141094; bh=CqirFA+y3Yz1r/QLQgaj2aGsvThhGc28+10qfsOM2X8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ET/OJS7LGDyuAApcpayKYv0aeP2pkvI7rHF0D1px7yL8MRTPCkUWVJp/TcfsfLREn clSRm1HxVVdK+vDVMfCmCf2sLg5pDs10jQNxFB4qjgPjFxt/iVJCNjhrgPufCXPvaN Be39lOEn9H8l4DA882CwUlU2WknnUztWQ4K/8wvM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727597AbfKSFYx (ORCPT ); Tue, 19 Nov 2019 00:24:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:41258 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728275AbfKSFYt (ORCPT ); Tue, 19 Nov 2019 00:24:49 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 A408121823; Tue, 19 Nov 2019 05:24:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141089; bh=CqirFA+y3Yz1r/QLQgaj2aGsvThhGc28+10qfsOM2X8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JWH8H2XeLLx1ToF0IycgO3o8zUm7YycI1dkLPY++LNAU2ta7ed+ytkcNVUbgjiAEB odMA+AOETbNIRvvn555L3QUds8cVdDXT9Eu5lYFGmQmylXw1DbDOgqyESGpT/XNsVj ux98vdJ/GelqTrm7Oglf6t/RUS9vUFgn4ylivMpw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Samuel Holland , Andre Przywara , Maxime Ripard , Chen-Yu Tsai , Sasha Levin Subject: [PATCH 4.19 040/422] arm64: dts: allwinner: a64: Orange Pi Win: Fix SD card node Date: Tue, 19 Nov 2019 06:13:57 +0100 Message-Id: <20191119051402.547353516@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Samuel Holland [ Upstream commit 09b964afca14d0594b2b2f265df3d987e2f43867 ] The Orange Pi Win has a microSD card slot which is connected via all four SD data lines. As the DT was not mentioning this fact, we got the default single bit transfers, losing out on performance. Also, as microSD does not have a write protect switch, we disable this feature in the DT node. Signed-off-by: Samuel Holland Signed-off-by: Andre Przywara Acked-by: Maxime Ripard Signed-off-by: Chen-Yu Tsai Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts index 1221764f5719c..667016815cf32 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts @@ -67,7 +67,9 @@ pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_dcdc1>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; + cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ + disable-wp; + bus-width = <4>; status = "okay"; }; -- 2.20.1