Skip to content

Commit

Permalink
BCM270X_DT: Make mmc overlay compatible with current firmware
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Phil Elwell authored and popcornmix committed Oct 25, 2015
1 parent c13e8e7 commit c5f7124
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/arm/boot/dts/overlays/mmc-overlay.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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?";
};
};

0 comments on commit c5f7124

Please sign in to comment.