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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 C73B9FC6196 for ; Fri, 8 Nov 2019 12:14:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 936F72085B for ; Fri, 8 Nov 2019 12:14:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573215287; bh=CqirFA+y3Yz1r/QLQgaj2aGsvThhGc28+10qfsOM2X8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=X7pxr/8CGEWjVTj744hLqbgnKKY0r3iCgGTnXNpb8Bny2ZdAzHiC1JZfZJ9BTosr/ baqBBL1H4Le/fY/fVtchpyCS+CpEWCXv8yVGRYrclG1TJxATJod0PiDzUiAC66JlGD 65JjVk2JcM/qH2bPZ9S74KFCsC/RdMYTNd6oE6F0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732161AbfKHLiE (ORCPT ); Fri, 8 Nov 2019 06:38:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:50840 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732127AbfKHLiD (ORCPT ); Fri, 8 Nov 2019 06:38:03 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5043D222C4; Fri, 8 Nov 2019 11:38:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573213082; bh=CqirFA+y3Yz1r/QLQgaj2aGsvThhGc28+10qfsOM2X8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZZPQAQizyCqZDDib7yXUxOK3htTllDpTUIHaQoj8cpkJLYyC1EXItvai/2EgbZXvm 8jHgsXBwP7mK/y2YT1jLVdZkZa2D6WpPltG8s9vBEr7q0WEDAuv+zGbrcrlkGOdy9C V1FaHDhVI77OvvKiik/sqyzldG0SqE4apT10fZbw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Samuel Holland , Andre Przywara , Maxime Ripard , Chen-Yu Tsai , Sasha Levin , devicetree@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 008/205] arm64: dts: allwinner: a64: Orange Pi Win: Fix SD card node Date: Fri, 8 Nov 2019 06:34:35 -0500 Message-Id: <20191108113752.12502-8-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191108113752.12502-1-sashal@kernel.org> References: <20191108113752.12502-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@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