From: Kuninori Morimoto Date: Wed, 29 Oct 2014 14:09:38 +0000 (+0100) Subject: ARM: shmobile: r8a7779 dtsi: Remove unnecessary MMC options X-Git-Tag: v3.19-rc1~57^2~17^2~6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=92e044aed5aede573ffa1ba2c99212024356e851;p=karo-tx-linux.git ARM: shmobile: r8a7779 dtsi: Remove unnecessary MMC options As of commit 81bbbc7278fa109f ("mmc: sdhi: update sh_mobile_sdhi_of_data for r8a7779"), the driver takes care of r8a7779 specific MMC options. Hence they can be removed from the dtsi. Signed-off-by: Kuninori Morimoto [geert: Rebased, reworded, added reference] Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi index 7cfba9aa1b41..ad83e47ae199 100644 --- a/arch/arm/boot/dts/r8a7779.dtsi +++ b/arch/arm/boot/dts/r8a7779.dtsi @@ -314,8 +314,6 @@ reg = <0xffe4c000 0x100>; interrupts = <0 104 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A7779_CLK_SDHI0>; - cap-sd-highspeed; - cap-sdio-irq; status = "disabled"; }; @@ -324,8 +322,6 @@ reg = <0xffe4d000 0x100>; interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A7779_CLK_SDHI1>; - cap-sd-highspeed; - cap-sdio-irq; status = "disabled"; }; @@ -334,8 +330,6 @@ reg = <0xffe4e000 0x100>; interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A7779_CLK_SDHI2>; - cap-sd-highspeed; - cap-sdio-irq; status = "disabled"; }; @@ -344,8 +338,6 @@ reg = <0xffe4f000 0x100>; interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A7779_CLK_SDHI3>; - cap-sd-highspeed; - cap-sdio-irq; status = "disabled"; };