From d5285342d87dcaf9aef7514e09558972099de64a Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Wed, 2 Jan 2019 14:35:48 +0100 Subject: 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 Signed-off-by: Ahmad Fatoum Signed-off-by: Sascha Hauer --- drivers/mci/mci-core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'drivers/mci') 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; -- cgit v1.2.3