From: Arnd Bergmann Date: Tue, 9 Sep 2014 14:49:28 +0000 (+0200) Subject: Merge tag 'socfpga_update_for_v3.18' of git://git.rocketboards.org/linux-socfpga... X-Git-Tag: v3.18-rc1~119^2~32 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=87e9d8fd26c782623b79f2968431179f29b339f2;p=karo-tx-linux.git Merge tag 'socfpga_update_for_v3.18' of git://git.rocketboards.org/linux-socfpga-next into next/dt 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 * 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 --- 87e9d8fd26c782623b79f2968431179f29b339f2 diff --cc arch/arm/boot/dts/rk3066a-bqcurie2.dts index 665dd56f4f79,c9d912da6141..d5344510c676 --- a/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 ff35acfa8ae7,5e4e3c238b2d..2c2313ff67c6 --- a/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 {