From:   John Keeping <john@metanate.com>
To:     linux-mmc@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org,
        Jaehoon Chung <jh80.chung@samsung.com>,
        Ulf Hansson <ulf.hansson@linaro.org>,
        John Keeping <john@metanate.com>
Subject: [PATCH 2/2] mmc: dw_mmc: use standard "mmc" alias stem
Date:   Tue, 16 Nov 2021 19:02:44 +0000
Message-Id: <20211116190244.1417591-3-john@metanate.com>
In-Reply-To: <20211116190244.1417591-1-john@metanate.com>
References: <20211116190244.1417591-1-john@metanate.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

The standard stem for MMC aliases is "mmc" and this is used by the MMC
core to set the slot index.

Use this in preference to the non-standard "mshc" stem when setting the
controller ID to avoid needing two aliases for each MMC device in order
to cover both the core and dw_mmc-specific functionality.

The old "mshc" lookup is kept for backwards compatibility.

Signed-off-by: John Keeping <john@metanate.com>
---
 drivers/mmc/host/dw_mmc.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 37af1245304b..6ffaa354410a 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -112,7 +112,11 @@ int dw_mci_of_alias_get_id(struct dw_mci *host)
 	if (WARN_ON(!host->dev->of_node))
 		return 0;
 
-	ctrl_id = of_alias_get_id(host->dev->of_node, "mshc");
+	ctrl_id = of_alias_get_id(host->dev->of_node, "mmc");
+
+	/* Compatibility fallback for old device trees. */
+	if (ctrl_id < 0)
+		ctrl_id = of_alias_get_id(host->dev->of_node, "mshc");
 
 	if (ctrl_id < 0)
 		ctrl_id = 0;
-- 
2.34.0