From patchwork Wed Sep 8 14:17:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 1525909 X-Patchwork-Delegate: narmstrong@baylibre.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=e5p19LPR; 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) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4H4PNs0K54z9sXk for ; Thu, 9 Sep 2021 00:17:48 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 26A25833B5; Wed, 8 Sep 2021 16:17:41 +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.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="e5p19LPR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 38AFC832CC; Wed, 8 Sep 2021 16:17:38 +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-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) (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 C6962832CC for ; Wed, 8 Sep 2021 16:17:34 +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-x42b.google.com with SMTP id q26so3535322wrc.7 for ; Wed, 08 Sep 2021 07:17:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4yxiGi92Gef9QvxgoWqHRzJn0ukWDWVBdqleEHaPfwU=; b=e5p19LPRv84ph2FmahUwn6PgQgl2UijPgB2aX9GO8UqL6dWKZL8/V6JgV2mKnNyysY as5iULSl4Ns+NhLklS9ioRn5Vky47JuYoXHq0nbM5suugMtvPbieeujxmE65CCNqcY5u ym+ECQtvSrp3dKgSkjJ1BrmWFocNt8+o8G4lWKH2w+Su3w86e7epHOb6mLtNEXFHBIUe ubyXU09mT7aNj4Q187YakZ4FglbjJzDZWxcATJi3YD9tLa+oq6Gi/QAK8Kg3JM+CzxRc bAvFzn0jMhaHYE3HWT9Y2z9u2YJJAjynCwxykMVBUIxmOBvPRusUspkmu8o8HdOHEVXM ++xA== 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=8NwbREzgsYtZHLkHcY2JuvxrV2cZVuNZdueqdLNGu1+TKWNG5pVIjVVccg+CUm4z/i gO5Gd3A8LSFfWW1yuivWD8XcCk5sim9Y2/8lym7wCwG90v4ijUeomvkYVVQBweUxmdDl ROqKb6v+RzPXjVeNz/y/M1P1HKObXYb+DzcCPt8rHFRUtdugCkX6yquw7OOSBQXWnkwJ lU4jRPs5dc9I97gD34OKqtNW2cCigjfz/WO1djpYpCZFaz3X+m7y90cbnukbJASBTesq Xdwt6uKTNbFqrRQFKR/sOyiSIDQyMgKQzXa5YhdaNsoiXgN3er+zmRUk6cA0Q55FykAs fSdQ== X-Gm-Message-State: AOAM532pxQEwl8Q6+gMQ6j1YilyRIcmqWA+BvllRz6bEQBAv1D3XtI0X BGk5p0iYaktT7rhmDc5vjt5EsDtIitd3c9C9 X-Google-Smtp-Source: ABdhPJxAEuArVkW50BaGemB9P4fCgQT4+Nsoq5mkk9SrTvIKLLgbq4WX7ESDQgmskdV0YEniznd6+g== X-Received: by 2002:a05:6000:160d:: with SMTP id u13mr4546258wrb.17.1631110653336; Wed, 08 Sep 2021 07:17:33 -0700 (PDT) Received: from localhost.localdomain ([2001:861:44c0:66c0:19d:2e13:ec0a:9d59]) by smtp.gmail.com with ESMTPSA id q13sm2339897wrv.79.2021.09.08.07.17.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Sep 2021 07:17:32 -0700 (PDT) From: Neil Armstrong To: u-boot@lists.denx.de Cc: u-boot-amlogic@groups.io, Neil Armstrong Subject: [PATCH v2 2/9] ARM: meson: keep HW order for MMC devices Date: Wed, 8 Sep 2021 16:17:21 +0200 Message-Id: <20210908141728.585797-2-narmstrong@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210908141728.585797-1-narmstrong@baylibre.com> References: <20210908141728.585797-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; };