summaryrefslogtreecommitdiffstats
path: root/drivers/mci
diff options
context:
space:
mode:
authorAhmad Fatoum <a.fatoum@pengutronix.de>2019-01-02 14:35:48 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2019-01-03 09:16:48 +0100
commitd5285342d87dcaf9aef7514e09558972099de64a (patch)
treee1effb965605fdc8cdcb79270edfb25347e014f6 /drivers/mci
parenta64b47afac79db8720a479ab0b5012ecd8496a61 (diff)
downloadbarebox-d5285342d87dcaf9aef7514e09558972099de64a.tar.gz
barebox-d5285342d87dcaf9aef7514e09558972099de64a.tar.xz
mci: skip of_partitions_register_fixup for boot partitions
The bootN-partitions binding is barebox-specific, so it shouldn't be fixed up into the kernel device tree. Suggested-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mci')
-rw-r--r--drivers/mci/mci-core.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c
index 2693100956..0bd68b15b8 100644
--- a/drivers/mci/mci-core.c
+++ b/drivers/mci/mci-core.c
@@ -1628,7 +1628,12 @@ static int mci_register_partition(struct mci_part *part)
if (np) {
of_parse_partitions(&part->blk.cdev, np);
- of_partitions_register_fixup(&part->blk.cdev);
+
+ /* bootN-partitions binding barebox-specific, so don't register
+ * for fixup into kernel device tree
+ */
+ if (part->area_type != MMC_BLK_DATA_AREA_BOOT)
+ of_partitions_register_fixup(&part->blk.cdev);
}
return 0;