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 Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C28BDC433EF for ; Mon, 14 Feb 2022 10:36:27 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0733083BE7; Mon, 14 Feb 2022 11:36:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="h5eTHptD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A4C3A83BDD; Mon, 14 Feb 2022 11:35:36 +0100 (CET) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6E75583BDF for ; Mon, 14 Feb 2022 11:35:03 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pali@kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4E3C96135D; Mon, 14 Feb 2022 10:35:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 03A32C340EF; Mon, 14 Feb 2022 10:35:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1644834901; bh=lgp6NDl9VPS5H7ou40ZOxpBP/0JvmgNhnkFuqDx7L2I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h5eTHptDJjU9BYg2jcEUu0wabJrU2cpwONCPYw4T/ahivDPWSAPvXYLNnz0HTq/88 Mj1ljQjfjxhyaTM01kbuHW70SRYRSZha2qCQtmYZyWBpWvTw+3vRTkWmvje6FckJ3l C4LyGhsFhXwpj8iLtdzXN9ST+mHBB01i47KkxganjZhe86dP/fGs1NN0szAucafXW1 r5Xp76m4opOx+/gHUvGizjvA0V/Z5Gsk3Wg1FKx1IxgBaksH7Kzl6PXlS5WepFuD41 w+qup98BmQWTzAJEnpCG/snwdnaugOonSQtyRk/4E/sfhxrNyZRDFVtgNe3zE93/cA NYrywTxs78ziQ== Received: by pali.im (Postfix) id AF2B6CAA; Mon, 14 Feb 2022 11:35:00 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Stefan Roese , Konstantin Porotchkin , Marek Behun , Vladimir Vid , Luka Perkov , Luis Torres , Scott Roberts , Paul Arola Cc: u-boot@lists.denx.de Subject: [PATCH u-boot-marvell 6/9] arm: a37xx: Update sdhci pointers to official DT bindings Date: Mon, 14 Feb 2022 11:34:27 +0100 Message-Id: <20220214103430.24242-7-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220214103430.24242-1-pali@kernel.org> References: <20220214103430.24242-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean In Linux kernel version of armada-37xx.dtsi file sdhci1 pointer refers to sdhci@d0000 node and sdhci0 pointer to sdhci@d8000 node. Signed-off-by: Pali Rohár --- arch/arm/dts/armada-3720-db.dts | 4 ++-- arch/arm/dts/armada-3720-espressobin.dts | 4 ++-- arch/arm/dts/armada-3720-turris-mox.dts | 2 +- arch/arm/dts/armada-3720-uDPU-u-boot.dtsi | 2 +- arch/arm/dts/armada-3720-uDPU.dts | 2 +- arch/arm/dts/armada-37xx.dtsi | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/dts/armada-3720-db.dts b/arch/arm/dts/armada-3720-db.dts index 42e7ddd25c55..6272d83fc011 100644 --- a/arch/arm/dts/armada-3720-db.dts +++ b/arch/arm/dts/armada-3720-db.dts @@ -98,14 +98,14 @@ status = "okay"; }; -&sdhci0 { +&sdhci1 { bus-width = <4>; pinctrl-names = "default"; pinctrl-0 = <&sdio_pins>; status = "okay"; }; -&sdhci1 { +&sdhci0 { non-removable; bus-width = <8>; mmc-ddr-1_8v; diff --git a/arch/arm/dts/armada-3720-espressobin.dts b/arch/arm/dts/armada-3720-espressobin.dts index 360d521bbada..f59f82d91632 100644 --- a/arch/arm/dts/armada-3720-espressobin.dts +++ b/arch/arm/dts/armada-3720-espressobin.dts @@ -104,7 +104,7 @@ phys = <&comphy2 0>; }; -&sdhci0 { +&sdhci1 { pinctrl-names = "default"; pinctrl-0 = <&sdio_pins>; bus-width = <4>; @@ -114,7 +114,7 @@ }; /* U11 */ -&sdhci1 { +&sdhci0 { non-removable; bus-width = <8>; mmc-ddr-1_8v; diff --git a/arch/arm/dts/armada-3720-turris-mox.dts b/arch/arm/dts/armada-3720-turris-mox.dts index d01757062fa5..a5ccb558ccd6 100644 --- a/arch/arm/dts/armada-3720-turris-mox.dts +++ b/arch/arm/dts/armada-3720-turris-mox.dts @@ -120,7 +120,7 @@ }; }; -&sdhci1 { +&sdhci0 { wp-inverted; bus-width = <4>; cd-gpios = <&gpionb 10 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/dts/armada-3720-uDPU-u-boot.dtsi b/arch/arm/dts/armada-3720-uDPU-u-boot.dtsi index fdad90ad123f..cf8ae4412b97 100644 --- a/arch/arm/dts/armada-3720-uDPU-u-boot.dtsi +++ b/arch/arm/dts/armada-3720-uDPU-u-boot.dtsi @@ -28,6 +28,6 @@ }; }; -&sdhci1 { +&sdhci0 { u-boot,dm-pre-reloc; }; diff --git a/arch/arm/dts/armada-3720-uDPU.dts b/arch/arm/dts/armada-3720-uDPU.dts index 58557c680a4d..319fbe7348ad 100644 --- a/arch/arm/dts/armada-3720-uDPU.dts +++ b/arch/arm/dts/armada-3720-uDPU.dts @@ -151,7 +151,7 @@ }; }; -&sdhci1 { +&sdhci0 { non-removable; mmc-ddr-1_8v; mmc-hs200-1_8v; diff --git a/arch/arm/dts/armada-37xx.dtsi b/arch/arm/dts/armada-37xx.dtsi index 4c686c380cee..8ac481cb58f3 100644 --- a/arch/arm/dts/armada-37xx.dtsi +++ b/arch/arm/dts/armada-37xx.dtsi @@ -251,7 +251,7 @@ }; }; - sdhci0: sdhci@d0000 { + sdhci1: sdhci@d0000 { compatible = "marvell,armada-3700-sdhci", "marvell,sdhci-xenon"; reg = <0xd0000 0x300 @@ -259,7 +259,7 @@ status = "disabled"; }; - sdhci1: sdhci@d8000 { + sdhci0: sdhci@d8000 { compatible = "marvell,armada-3700-sdhci", "marvell,sdhci-xenon"; reg = <0xd8000 0x300 -- 2.20.1