target/linux/sunxi/patches-3.13/173-5-dt-sun5i-fixup-mmc.patch

   1 From 1fa41bc5a6659e453ca19086f195b02a23dc3bbe Mon Sep 17 00:00:00 2001
   2 From: Hans de Goede <hdegoede@redhat.com>
   3 Date: Mon, 17 Feb 2014 17:25:54 +0100
   4 Subject: [PATCH] ARM: sun5i: dt: Fixup mmc bindings
   5
   6 1) Now that we're no longer overriding the caps set by mmc_of_parse we need
   7 to set cd-inverted for our card detection to work.
   8
   9 2) Now that we no longer claim UHS modes support we will never use any DDR
  10 modes, so drive-strength 2 is enough for the mmc data pins.
  11
  12 3) mmc1 on the A13 is not routed to any pins, and thus unusable, remove it
  13 from the dtsi
  14
  15 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  16 ---
  17  arch/arm/boot/dts/sun5i-a10s.dtsi |  7 +++++--
  18  arch/arm/boot/dts/sun5i-a13.dtsi  | 14 +++-----------
  19  2 files changed, 8 insertions(+), 13 deletions(-)
  20
  21 diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
  22 index 3a7039e..15dfa9a 100644
  23 --- a/arch/arm/boot/dts/sun5i-a10s.dtsi
  24 +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
  25 @@ -306,6 +306,7 @@
  26                         clock-names = "ahb", "mod";
  27                         interrupts = <32>;
  28                         bus-width = <4>;
  29 +                       cd-inverted;
  30                         status = "disabled";
  31                 };
  32
  33 @@ -316,6 +317,7 @@
  34                         clock-names = "ahb", "mod";
  35                         interrupts = <33>;
  36                         bus-width = <4>;
  37 +                       cd-inverted;
  38                         status = "disabled";
  39                 };
  40
  41 @@ -326,6 +328,7 @@
  42                         clock-names = "ahb", "mod";
  43                         interrupts = <34>;
  44                         bus-width = <4>;
  45 +                       cd-inverted;
  46                         status = "disabled";
  47                 };
  48
  49 @@ -403,14 +406,14 @@
  50                         mmc0_pins_a: mmc0@0 {
  51                                 allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5";
  52                                 allwinner,function = "mmc0";
  53 -                               allwinner,drive = <3>;
  54 +                               allwinner,drive = <2>;
  55                                 allwinner,pull = <0>;
  56                         };
  57
  58                         mmc1_pins_a: mmc1@0 {
  59                                 allwinner,pins = "PG3","PG4","PG5","PG6","PG7","PG8";
  60                                 allwinner,function = "mmc1";
  61 -                               allwinner,drive = <3>;
  62 +                               allwinner,drive = <2>;
  63                                 allwinner,pull = <0>;
  64                         };
  65                 };
  66 diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
  67 index 63a35b8..14a99d0 100644
  68 --- a/arch/arm/boot/dts/sun5i-a13.dtsi
  69 +++ b/arch/arm/boot/dts/sun5i-a13.dtsi
  70 @@ -288,16 +288,7 @@
  71                         clock-names = "ahb", "mod";
  72                         interrupts = <32>;
  73                         bus-width = <4>;
  74 -                       status = "disabled";
  75 -               };
  76 -
  77 -               mmc1: mmc@01c10000 {
  78 -                       compatible = "allwinner,sun5i-a13-mmc";
  79 -                       reg = <0x01c10000 0x1000>;
  80 -                       clocks = <&ahb_gates 9>, <&mmc1_clk>;
  81 -                       clock-names = "ahb", "mod";
  82 -                       interrupts = <33>;
  83 -                       bus-width = <4>;
  84 +                       cd-inverted;
  85                         status = "disabled";
  86                 };
  87
  88 @@ -308,6 +299,7 @@
  89                         clock-names = "ahb", "mod";
  90                         interrupts = <34>;
  91                         bus-width = <4>;
  92 +                       cd-inverted;
  93                         status = "disabled";
  94                 };
  95
  96 @@ -367,7 +359,7 @@
  97                         mmc0_pins_a: mmc0@0 {
  98                                 allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5";
  99                                 allwinner,function = "mmc0";
 100 -                               allwinner,drive = <3>;
 101 +                               allwinner,drive = <2>;
 102                                 allwinner,pull = <0>;
 103                         };
 104                 };
 105 --
 106 1.8.5.5
 107