84 lines
2.2 KiB
Diff
84 lines
2.2 KiB
Diff
|
From e199a012a0fb0be11ccd26b4a502ae830eb10db0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
||
|
|
Date: Tue, 21 Jun 2016 11:47:56 +0200
|
||
|
|
Subject: arm64: dts: bcm2837: add &sdhci and &sdhost
|
||
|
|
|
||
|
|
For the raspberry pi 3 we'll need both sdhci (handles sdio wifi) and
|
||
|
|
sdhost (handles sdcard).
|
||
|
|
|
||
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
||
|
|
Acked-by: Eric Anholt <eric@anholt.net>
|
||
|
|
---
|
||
|
|
arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts | 17 +++++++++++++++++
|
||
|
|
1 file changed, 17 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
|
||
|
|
index c309633..972f14d 100644
|
||
|
|
--- a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
|
||
|
|
+++ b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
|
||
|
|
@@ -22,3 +22,20 @@
|
||
|
|
&uart1 {
|
||
|
|
status = "okay";
|
||
|
|
};
|
||
|
|
+
|
||
|
|
+/* SDHCI is used to control the SDIO for wireless */
|
||
|
|
+&sdhci {
|
||
|
|
+ pinctrl-names = "default";
|
||
|
|
+ pinctrl-0 = <&emmc_gpio34>;
|
||
|
|
+ status = "okay";
|
||
|
|
+ bus-width = <4>;
|
||
|
|
+ non-removable;
|
||
|
|
+};
|
||
|
|
+
|
||
|
|
+/* SDHOST is used to drive the SD card */
|
||
|
|
+&sdhost {
|
||
|
|
+ pinctrl-names = "default";
|
||
|
|
+ pinctrl-0 = <&sdhost_gpio48>;
|
||
|
|
+ status = "okay";
|
||
|
|
+ bus-width = <4>;
|
||
|
|
+};
|
||
|
|
--
|
||
|
|
cgit v0.12
|
||
|
|
|
||
|
|
From 0c1759bc4fc8884d790d4ab99b5276132559b5a1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
||
|
|
Date: Tue, 21 Jun 2016 10:00:58 +0200
|
||
|
|
Subject: arm: dts: bcm283x: switch from &sdhci to &sdhost
|
||
|
|
|
||
|
|
sdcard access with the sdhost controller is faster.
|
||
|
|
|
||
|
|
Read access (dd with 64k blocks on rpi2):
|
||
|
|
CONFIG_MMC_SDHCI_IPROC: 11-12 MB/s
|
||
|
|
CONFIG_MMC_BCM2835: 19-20 MB/s
|
||
|
|
|
||
|
|
Differences on write access are pretty much in the noise.
|
||
|
|
|
||
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
||
|
|
Acked-by: Eric Anholt <eric@anholt.net>
|
||
|
|
---
|
||
|
|
arch/arm/boot/dts/bcm2835-rpi.dtsi | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
||
|
|
index 8b95832..e36c392 100644
|
||
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
||
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
||
|
|
@@ -65,13 +65,13 @@
|
||
|
|
&sdhci {
|
||
|
|
pinctrl-names = "default";
|
||
|
|
pinctrl-0 = <&emmc_gpio48>;
|
||
|
|
- status = "okay";
|
||
|
|
bus-width = <4>;
|
||
|
|
};
|
||
|
|
|
||
|
|
&sdhost {
|
||
|
|
pinctrl-names = "default";
|
||
|
|
pinctrl-0 = <&sdhost_gpio48>;
|
||
|
|
+ status = "okay";
|
||
|
|
bus-width = <4>;
|
||
|
|
};
|
||
|
|
|
||
|
|
--
|
||
|
|
cgit v0.12
|
||
|
|
|