From patchwork Fri Sep 17 07:37:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 1529233 X-Patchwork-Delegate: narmstrong@baylibre.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20210112.gappssmtp.com header.i=@baylibre-com.20210112.gappssmtp.com header.a=rsa-sha256 header.s=20210112 header.b=F9fk1l6k; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4H9m5R6H7Lz9sf8 for ; Fri, 17 Sep 2021 17:38:03 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1E95283238; Fri, 17 Sep 2021 09:37:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com 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=baylibre-com.20210112.gappssmtp.com header.i=@baylibre-com.20210112.gappssmtp.com header.b="F9fk1l6k"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 753E281D6C; Fri, 17 Sep 2021 09:37:24 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 19551831E7 for ; Fri, 17 Sep 2021 09:37:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=narmstrong@baylibre.com Received: by mail-wr1-x435.google.com with SMTP id w17so5434403wrv.10 for ; Fri, 17 Sep 2021 00:37:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4yxiGi92Gef9QvxgoWqHRzJn0ukWDWVBdqleEHaPfwU=; b=F9fk1l6kUxs9tDclxXW3AiBdtSwEdFUuPMFBf+bXUnhAn/YSD+mW0bTFLl7idyoswW QMrMBEywsFqxWfYMWvZJxTUh3WWvEJ2dVUK2BfLI4kdGhvVO55t+q+FVdA507+PB7ITC 9djZV+YwJQuD04TJPWKOGdU1uoR0nCR+MxJS0lWue/1EeQxaj6Rjo5Aa0vpTHdL6QlQV EfBzUQsw7gUvA9h1L/NFR9E68sBfruo4twh7MHRMLuKRt/kQV4GLonom7QmZ8rsK3lKt BWI8Qe286wVWF+R7nAysvO+wOL2AqxjWDIbJDZW+Da1ERR0fe/GFyasj9Ubbp9uOz1FZ FbVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4yxiGi92Gef9QvxgoWqHRzJn0ukWDWVBdqleEHaPfwU=; b=JLlsOuFfjhP57Vryi6kMX7hVRh0yzAvrCcMxfxXvxGbHKwcL+kA+hyCKxxbdaRpHts 3BsijUuUBcYJIxrKRkTwp+rxEYp8/a0zYl1vPmn12Rkpqm430ld3sFOmUWh74FX5GRAf MnhAoAEGmfEzD0EeSMIoiwHywRQW1LSSe2SkK5EuSJ1okDFcgGmAA+kdVU1SP+NMAMZE YtoF7PXFp5dlmO7uNA95SdYIZfEb7kK4JWZtXYBIEinD24ozfWN81m0d3mqeOuMDQydJ Ew1NhkoJPGz42DMzZfwGKOlQ1eh6N7ec7wwUKS5bqsZUGLG2aAGFy8jCu8Rrp/l1WzB8 psfg== X-Gm-Message-State: AOAM533MLlnGqHDzi5XVoaRM8iArMYb/DJvhlV+xtD1/DWdM0yu1tUDL lxOrJSi40HAWuJPqNZH6nStYWTwItVsg29gr X-Google-Smtp-Source: ABdhPJzI+D3X+vaBdXcJgHLHXidMcKv/Zro9KkXhiXoPzSby7O/P61JPZisJf5FH66UQmVE4YeGiMA== X-Received: by 2002:adf:f904:: with SMTP id b4mr10376367wrr.403.1631864233249; Fri, 17 Sep 2021 00:37:13 -0700 (PDT) Received: from localhost.localdomain ([2001:861:44c0:66c0:7c8c:5a9b:1b6e:1623]) by smtp.gmail.com with ESMTPSA id w14sm5969763wro.8.2021.09.17.00.37.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Sep 2021 00:37:12 -0700 (PDT) From: Neil Armstrong To: u-boot@lists.denx.de Cc: u-boot-amlogic@groups.io, Neil Armstrong Subject: [PATCH v3 03/10] ARM: meson: keep HW order for MMC devices Date: Fri, 17 Sep 2021 09:37:02 +0200 Message-Id: <20210917073709.1052133-3-narmstrong@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210917073709.1052133-1-narmstrong@baylibre.com> References: <20210917073709.1052133-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean Since Linux commmit [1], the order is fixed with aliases, in order to keep the MMC device order, set it back to HW order in U-Boot dtsi files. [1] ab547c4fb39f ("arm64: dts: amlogic: Assign a fixed index to mmc devices") Signed-off-by: Neil Armstrong --- arch/arm/dts/meson-g12-common-u-boot.dtsi | 7 +++++++ arch/arm/dts/meson-gx-u-boot.dtsi | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/arch/arm/dts/meson-g12-common-u-boot.dtsi b/arch/arm/dts/meson-g12-common-u-boot.dtsi index 38fd3d3feb..b1f60b15c9 100644 --- a/arch/arm/dts/meson-g12-common-u-boot.dtsi +++ b/arch/arm/dts/meson-g12-common-u-boot.dtsi @@ -5,6 +5,13 @@ */ / { + /* Keep HW order from U-boot */ + aliases { + /delete-property/ mmc0; + /delete-property/ mmc1; + /delete-property/ mmc2; + }; + soc { u-boot,dm-pre-reloc; }; diff --git a/arch/arm/dts/meson-gx-u-boot.dtsi b/arch/arm/dts/meson-gx-u-boot.dtsi index 17d2cb95c1..fb6952f1d8 100644 --- a/arch/arm/dts/meson-gx-u-boot.dtsi +++ b/arch/arm/dts/meson-gx-u-boot.dtsi @@ -5,6 +5,13 @@ */ / { + /* Keep HW order from U-boot */ + aliases { + /delete-property/ mmc0; + /delete-property/ mmc1; + /delete-property/ mmc2; + }; + soc { u-boot,dm-pre-reloc; };