raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

BCM270X_DT: Make mmc overlay compatible with current firmware

Browse Source 
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.
This commit is contained in:
Phil Elwell
2015-10-09 10:49:00 +01:00
committed by popcornmix
parent 28f74264fa
commit 55e4e7e338
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/boot/dts/overlays/mmc-overlay.dts
View File

@@ -7,13 +7,13 @@
fragment@0 { fragment@0 {
target = <&mmc>; target = <&mmc>;
__overlay__ { frag0: __overlay__ {
brcm,overclock-50 = <0>; brcm,overclock-50 = <0>;
}; };
}; };
__overrides__ { __overrides__ {
overclock_50 = <&mmc>,"brcm,overclock-50:0"; overclock_50 = <&frag0>,"brcm,overclock-50:0";
force_pio = <&mmc>,"brcm,force-pio?"; force_pio = <&frag0>,"brcm,force-pio?";
}; };
}; };