[PATCH] ARM: dts: bcm2835-rpi: re-enable booting from SD card

[Sascha Hauer]

On Wed, Dec 06, 2017 at 04:12:33PM +0100, Roland Hieber wrote:
> From: Roland Hieber <rohieb at rohieb.name>
> 
> Kernel commit a19adf8d86e822eba502486524127595372c85f6 [0] changed the
> RPi1 device tree from &sdhci to &sdhost, which was imported in barebox
> commit d14b844b08635c717fb52a294ed8d6872e260315. It seems that barebox
> does not have a driver for brcm,bcm2835-sdhost (yet), which resulted in
> barebox unable to boot from SD card. However, the driver for
> brcm,bcm2835-sdhci worked fine in the past.
> 
> Although the upstream change was made for good reasons, the simplest
> change for barebox for now is to revert to using &sdhci and disable
> &sdhost.
> 
> Thanks to Alexander Dahl for raising this issue on the DistroKit
> mailing list!
> 
> [0]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a19adf8d86e822eba502486524127595372c85f6
> 
> Cc: Alexander Dahl <post at lespocky.de>
> Signed-off-by: Roland Hieber <rohieb at rohieb.name>
> ---
>  arch/arm/dts/bcm2835-rpi.dts | 7 +++++++
>  1 file changed, 7 insertions(+)

Applied, thanks

Sascha

> 
> diff --git a/arch/arm/dts/bcm2835-rpi.dts b/arch/arm/dts/bcm2835-rpi.dts
> index 0095f58a3c..ab2d6dff64 100644
> --- a/arch/arm/dts/bcm2835-rpi.dts
> +++ b/arch/arm/dts/bcm2835-rpi.dts
> @@ -9,3 +9,10 @@
>  		reg = <0x0 0x0>;
>  	};
>  };
> +&sdhci {
> +	status = "okay";
> +};
> +
> +&sdhost {
> +	status = "disabled";
> +};
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox at 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 |