Merge tag 'socfpga_update_for_v3.18' of git://git.rocketboards.org/linux-socfpga...

Pull "arm: dts: Add Altera SDRAM EDAC bindings & devicetree entries" From Dinh Nguyen:

5 of the 6 patches are DTS updates and the 1 patch is updating
the MAINTAINERS entry with my new email address.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'socfpga_update_for_v3.18' of git://git.rocketboards.org/linux-socfpga-next:
  arm: dts: Add Altera SDRAM EDAC bindings & devicetree entries.
  ARM: dts: socfpga: memreserve first 4KB for future system use
  ARM: dts: socfpga: Add SD card detect
  ARM: dts: socfpga: remove extra alias in the ArriaV devkit
  ARM: dts: socfpga: unuse the slot-node and deprecate the supports-highspeed for dw-mmc
  MAINTAINERS: update entries for ARM/SOCFPGA platform

diff --cc arch/arm/boot/dts/r8a7791-koelsch.dts
Simple merge

diff --cc arch/arm/boot/dts/rk3066a-bqcurie2.dts
index 665dd56f4f79cd0791a70ac0ecdf0563932c33bd,c9d912da61415b104d62f045b88de810924ac009..d5344510c6763f3dbd2b74c0c71593db213fdbdd
--- 1/arch/arm/boot/dts/rk3066a-bqcurie2.dts
--- 2/arch/arm/boot/dts/rk3066a-bqcurie2.dts
+++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
@@@ -149,9 -149,15 +149,11 @@@
  &mmc0 { /* sdmmc */
        num-slots = <1>;
        status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;
        vmmc-supply = <&vcc_sd0>;
 -
 -      slot@0 {
 -              reg = <0>;
 -              bus-width = <4>;
 -              disable-wp;
 -      };
 +      bus-width = <4>;
 +      disable-wp;
  };
  
  &mmc1 { /* wifi */

diff --cc arch/arm/boot/dts/rk3188-radxarock.dts
index ff35acfa8ae7ffe0689fa90adba8cda14a964436,5e4e3c238b2d1d79faca9c3ac803e4bf97c322fb..2c2313ff67c60ef9cfbb05ec72a05b0abeec1b2d
--- 1/arch/arm/boot/dts/rk3188-radxarock.dts
--- 2/arch/arm/boot/dts/rk3188-radxarock.dts
+++ b/arch/arm/boot/dts/rk3188-radxarock.dts
@@@ -190,10 -179,15 +190,12 @@@
  &mmc0 {
        num-slots = <1>;
        status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;
        vmmc-supply = <&vcc_sd0>;
  
 -      slot@0 {
 -              reg = <0>;
 -              bus-width = <4>;
 -              disable-wp;
 -      };
 +      bus-width = <4>;
 +      disable-wp;
  };
  
  &pinctrl {