[PATCH] ARM: rpi: use sdhost for eMMC access on CM3.

[PATCH] ARM: rpi: use sdhost for eMMC access on CM3.

[Tomaz Solc]

This commit removes the fix for the upstream devicetree where eMMC was remapped
to the sdhci interface. This is no longer needed since sdhost driver is now
functional in barebox. A similar change was done to the R.Pi 3 devicetree in
9036d1db.

In fact, this remap prevented CM3 from booting if barebox was compiled with
CONFIG_MCI_BCM283X_SDHOST (in rpi_defconfig since b093468c). In that case both
sdhost and sdhci drivers were active and tried to set their corresponsing alt
functions for the same set of GPIOs at the same time.

Signed-off-by: Tomaz Solc <tomaz.solc@tablix.org>
---
 arch/arm/dts/bcm2837-rpi-cm3.dts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/arch/arm/dts/bcm2837-rpi-cm3.dts b/arch/arm/dts/bcm2837-rpi-cm3.dts
index cfbffe175..01c1f9a67 100644
--- a/arch/arm/dts/bcm2837-rpi-cm3.dts
+++ b/arch/arm/dts/bcm2837-rpi-cm3.dts
@@ -9,10 +9,3 @@
 		reg = <0x0 0x0>;
 	};
 };
-
-&sdhci {
-	pinctrl-0 = <&emmc_gpio48>;
-	no-sd;
-	non-removable;
-	status = "okay";
-};
-- 
2.11.0


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

Re: [PATCH] ARM: rpi: use sdhost for eMMC access on CM3.

[Sascha Hauer]

On Wed, Jun 26, 2019 at 10:46:49AM +0200, Tomaz Solc wrote:
> This commit removes the fix for the upstream devicetree where eMMC was remapped
> to the sdhci interface. This is no longer needed since sdhost driver is now
> functional in barebox. A similar change was done to the R.Pi 3 devicetree in
> 9036d1db.
> 
> In fact, this remap prevented CM3 from booting if barebox was compiled with
> CONFIG_MCI_BCM283X_SDHOST (in rpi_defconfig since b093468c). In that case both
> sdhost and sdhci drivers were active and tried to set their corresponsing alt
> functions for the same set of GPIOs at the same time.
> 
> Signed-off-by: Tomaz Solc <tomaz.solc@tablix.org>
> ---
>  arch/arm/dts/bcm2837-rpi-cm3.dts | 7 -------
>  1 file changed, 7 deletions(-)

Applied to master, thanks

Sascha


-- 
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