diff options
| author | Roland Hieber <rohieb@rohieb.name> | 2017-12-06 16:12:33 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-12-07 16:19:05 +0100 |
| commit | abc0447440d68af720127fcca3c17f04ee144fcc (patch) | |
| tree | 37cb73f13ad02f0da603be1fae757093161b800c | |
| parent | 21ec7b89cce2b080f45f56255831f7b5a03bb1e5 (diff) | |
| download | barebox-abc0447440d68af720127fcca3c17f04ee144fcc.tar.gz barebox-abc0447440d68af720127fcca3c17f04ee144fcc.tar.xz | |
ARM: dts: bcm2835-rpi: re-enable booting from SD card
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@lespocky.de>
Signed-off-by: Roland Hieber <rohieb@rohieb.name>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/dts/bcm2835-rpi.dts | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/dts/bcm2835-rpi.dts b/arch/arm/dts/bcm2835-rpi.dts index 0095f58a3c..c23e7c7c14 100644 --- a/arch/arm/dts/bcm2835-rpi.dts +++ b/arch/arm/dts/bcm2835-rpi.dts @@ -9,3 +9,11 @@ reg = <0x0 0x0>; }; }; + +&sdhci { + status = "okay"; +}; + +&sdhost { + status = "disabled"; +}; |