rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Raspberry Pi: drop the flip of which MMC controller drives the SD card slot to ease upgrades

This commit is contained in:
Peter Robinson 2017-05-17 09:34:29 +01:00
parent 390fcddee7
commit d6f69e3658
1 changed files with 0 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
bcm283x-mmc-bcm2835.patch
View File

@ -1786,111 +1786,6 @@ index 7c48028..519a55c 100644
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_GPIO=y
From patchwork Wed Mar 8 09:19:10 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [v4,6/7] arm: dts: bcm283x: switch from &sdhci to &sdhost
From: Gerd Hoffmann <kraxel@redhat.com>
X-Patchwork-Id: 9610687
Message-Id: <1488964751-22763-11-git-send-email-kraxel@redhat.com>
To: linux-rpi-kernel@lists.infradead.org
Cc: mark.rutland@arm.com, stefan.wahren@i2se.com, ulf.hansson@linaro.org,
f.fainelli@gmail.com, sbranden@broadcom.com, devicetree@vger.kernel.org,
rjui@broadcom.com, lee@kernel.org, will.deacon@arm.com,
linux@armlinux.org.uk,
linux-kernel@vger.kernel.org, eric@anholt.net, robh+dt@kernel.org,
bcm-kernel-feedback-list@broadcom.com, Gerd Hoffmann <kraxel@redhat.com>,
catalin.marinas@arm.com, linux-mmc@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Date: Wed, 8 Mar 2017 10:19:10 +0100
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>;
};
From patchwork Wed Mar 8 09:19:11 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [v4,7/7] arm64: dts: bcm2837: add &sdhci and &sdhost
From: Gerd Hoffmann <kraxel@redhat.com>
X-Patchwork-Id: 9610637
Message-Id: <1488964751-22763-12-git-send-email-kraxel@redhat.com>
To: linux-rpi-kernel@lists.infradead.org
Cc: mark.rutland@arm.com, stefan.wahren@i2se.com, ulf.hansson@linaro.org,
f.fainelli@gmail.com, sbranden@broadcom.com, devicetree@vger.kernel.org,
rjui@broadcom.com, lee@kernel.org, will.deacon@arm.com,
linux@armlinux.org.uk,
linux-kernel@vger.kernel.org, eric@anholt.net, robh+dt@kernel.org,
bcm-kernel-feedback-list@broadcom.com, Gerd Hoffmann <kraxel@redhat.com>,
catalin.marinas@arm.com, linux-mmc@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Date: Wed, 8 Mar 2017 10:19:11 +0100
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>;
+};
From patchwork Sat Mar 25 13:17:00 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0