aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.1/0200-BCM270X_DT-Make-mmc-overlay-compatible-with-current-.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-10-26 09:01:05 +0000
committerJohn Crispin <john@openwrt.org>2015-10-26 09:01:05 +0000
commitbf28fb50bf705fdd12f749c57abce1796b8c1024 (patch)
treeea7c899e5461e9a403c8f17543cbe66f89ba2925 /target/linux/brcm2708/patches-4.1/0200-BCM270X_DT-Make-mmc-overlay-compatible-with-current-.patch
parent63a50eeba30cb773e7abbd71c5e0727171ea740a (diff)
downloadupstream-bf28fb50bf705fdd12f749c57abce1796b8c1024.tar.gz
upstream-bf28fb50bf705fdd12f749c57abce1796b8c1024.tar.bz2
upstream-bf28fb50bf705fdd12f749c57abce1796b8c1024.zip
brcm2708: update 4.1 patches
As usual, this patches were taken (and rebased) from https://github.com/raspberrypi/linux/commits/rpi-4.1.y Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> SVN-Revision: 47258
Diffstat (limited to 'target/linux/brcm2708/patches-4.1/0200-BCM270X_DT-Make-mmc-overlay-compatible-with-current-.patch')
-rw-r--r--target/linux/brcm2708/patches-4.1/0200-BCM270X_DT-Make-mmc-overlay-compatible-with-current-.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.1/0200-BCM270X_DT-Make-mmc-overlay-compatible-with-current-.patch b/target/linux/brcm2708/patches-4.1/0200-BCM270X_DT-Make-mmc-overlay-compatible-with-current-.patch
new file mode 100644
index 0000000000..da0a9bc2a4
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.1/0200-BCM270X_DT-Make-mmc-overlay-compatible-with-current-.patch
@@ -0,0 +1,39 @@
+From f6c213fbd75a2efeb2e8ef0034be7376a306f7fd Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.org>
+Date: Fri, 9 Oct 2015 10:49:00 +0100
+Subject: [PATCH 200/203] BCM270X_DT: Make mmc overlay compatible with current
+ firmware
+
+The original DT overlay logic followed a merge-then-patch procedure,
+i.e. parameters are applied to the loaded overlay before the overlay
+is merged into the base DTB. This sequence has been changed to
+patch-then-merge, in order to support parameterised node names, and
+to protect against bad overlays. As a result, overrides (parameters)
+must only target labels in the overlay, but the overlay can obviously target nodes in the base DTB.
+
+mmc-overlay.dts (that switches back to the original mmc sdcard
+driver) is the only overlay violating that rule, and this patch
+fixes it.
+---
+ arch/arm/boot/dts/overlays/mmc-overlay.dts | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/arch/arm/boot/dts/overlays/mmc-overlay.dts
++++ b/arch/arm/boot/dts/overlays/mmc-overlay.dts
+@@ -7,13 +7,13 @@
+ fragment@0 {
+ target = <&mmc>;
+
+- __overlay__ {
++ frag0: __overlay__ {
+ brcm,overclock-50 = <0>;
+ };
+ };
+
+ __overrides__ {
+- overclock_50 = <&mmc>,"brcm,overclock-50:0";
+- force_pio = <&mmc>,"brcm,force-pio?";
++ overclock_50 = <&frag0>,"brcm,overclock-50:0";
++ force_pio = <&frag0>,"brcm,force-pio?";
+ };
+ };