[PATCH] mci: skip of_partitions_register_fixup for boot partitions

[PATCH] mci: skip of_partitions_register_fixup for boot partitions

[Ahmad Fatoum]

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>
---
 drivers/mci/mci-core.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c
index c8d1d5e16474..62378913c2e5 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;
-- 
2.19.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] mci: skip of_partitions_register_fixup for boot partitions

[Sascha Hauer]

On Wed, Jan 02, 2019 at 02:35:48PM +0100, Ahmad Fatoum wrote:
> 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>
> ---
>  drivers/mci/mci-core.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c
> index c8d1d5e16474..62378913c2e5 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;
> -- 
> 2.19.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox