From mboxrd@z Thu Jan 1 00:00:00 1970 From: Doug Anderson Subject: [PATCH v2 3/4] ARM: dts: Take the mmc slot node out of rk3288-evb Date: Thu, 31 Jul 2014 09:13:19 -0700 Message-ID: <1406823200-20911-4-git-send-email-dianders@chromium.org> References: <1406823200-20911-1-git-send-email-dianders@chromium.org> Return-path: In-Reply-To: <1406823200-20911-1-git-send-email-dianders@chromium.org> Sender: linux-mmc-owner@vger.kernel.org To: Heiko Stuebner , Seungwon Jeon , Jaehoon Chung , Chris Ball , Ulf Hansson Cc: Addy Ke , Kever Yang , Sonny Rao , linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org, Arnd Bergmann , Doug Anderson , robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, linux@arm.linux.org.uk, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: devicetree@vger.kernel.org In Jaehoon's (mmc: dw_mmc: Slot quirk "disable-wp" is deprecated) the slot node is no longer used. Remove it. Note that if Jaehoon's patch lands before my (ARM: dts: Enable emmc and sdmmc on the rk3288-evb boards) then this could be squashed into the later. Signed-off-by: Doug Anderson Acked-by: Arnd Bergmann --- Changes in v2: - Refer to the new title of Jaehoon's patch arch/arm/boot/dts/rk3288-evb.dtsi | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi index ec580fa..b69008f 100644 --- a/arch/arm/boot/dts/rk3288-evb.dtsi +++ b/arch/arm/boot/dts/rk3288-evb.dtsi @@ -41,17 +41,13 @@ broken-cd; bus-width = <8>; cap-mmc-highspeed; + disable-wp; mmc-ddr-1_8v; non-removable; num-slots = <1>; pinctrl-names = "default"; pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>; status = "okay"; - - slot@0 { - reg = <0>; - disable-wp; - }; }; &sdmmc { @@ -59,15 +55,11 @@ cap-mmc-highspeed; cap-sd-highspeed; card-detect-delay = <200>; + disable-wp; /* wp not hooked up */ num-slots = <1>; pinctrl-names = "default"; pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; status = "okay"; - - slot@0 { - reg = <0>; - disable-wp; /* wp not hooked up */ - }; }; &i2c0 { -- 2.0.0.526.g5318336