From 7b8c093062598df773858f956b1145a8df84434f Mon Sep 17 00:00:00 2001 From: Mykyta Dorokhin Date: Fri, 5 Feb 2021 19:20:29 +0200 Subject: [PATCH] linux-5.4: fix-atmel-mci-reg-overloading --- drivers/mmc/host/atmel-mci.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index a750b0c..284057a 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -617,8 +617,12 @@ static void atmci_init_debugfs(struct atmel_mci_slot *slot) return ERR_PTR(-ENOMEM); for_each_child_of_node(np, cnp) { - if (of_property_read_u32(cnp, "reg", &slot_id)) { - dev_warn(&pdev->dev, "reg property is missing for %pOF\n", + /* Multi-Tech patch here. The original driver went through each child + device, and interprets 'reg' as slot ID. All other devices treat 'reg' + as function. We correct the driver here to take a 'slot-id' parameter + from OF for slot. MN */ + if (of_property_read_u32(cnp, "slot-id", &slot_id)) { + dev_warn(&pdev->dev, "slot-id property is missing for %s\n", cnp); continue; } -- 1.9.1