target/linux/brcm2708/patches-4.1/0200-BCM270X_DT-Make-mmc-overlay-compatible-with-current-.patch

   1 From 579b03bae367004dd060c67dcb9cf33c0c733847 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.org>
   3 Date: Fri, 9 Oct 2015 10:49:00 +0100
   4 Subject: [PATCH 200/222] BCM270X_DT: Make mmc overlay compatible with current
   5  firmware
   6
   7 The original DT overlay logic followed a merge-then-patch procedure,
   8 i.e. parameters are applied to the loaded overlay before the overlay
   9 is merged into the base DTB. This sequence has been changed to
  10 patch-then-merge, in order to support parameterised node names, and
  11 to protect against bad overlays. As a result, overrides (parameters)
  12 must only target labels in the overlay, but the overlay can obviously target nodes in the base DTB.
  13
  14 mmc-overlay.dts (that switches back to the original mmc sdcard
  15 driver) is the only overlay violating that rule, and this patch
  16 fixes it.
  17 ---
  18  arch/arm/boot/dts/overlays/mmc-overlay.dts | 6 +++---
  19  1 file changed, 3 insertions(+), 3 deletions(-)
  20
  21 --- a/arch/arm/boot/dts/overlays/mmc-overlay.dts
  22 +++ b/arch/arm/boot/dts/overlays/mmc-overlay.dts
  23 @@ -7,13 +7,13 @@
  24         fragment@0 {
  25                 target = <&mmc>;
  26
  27 -               __overlay__ {
  28 +               frag0: __overlay__ {
  29                         brcm,overclock-50 = <0>;
  30                 };
  31         };
  32
  33         __overrides__ {
  34 -               overclock_50     = <&mmc>,"brcm,overclock-50:0";
  35 -               force_pio        = <&mmc>,"brcm,force-pio?";
  36 +               overclock_50     = <&frag0>,"brcm,overclock-50:0";
  37 +               force_pio        = <&frag0>,"brcm,force-pio?";
  38         };
  39  };