From patchwork Fri Jun 16 11:54:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kishon Vijay Abraham I X-Patchwork-Id: 9791233 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AFB496038E for ; Fri, 16 Jun 2017 11:57:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A02EF2860F for ; Fri, 16 Jun 2017 11:57:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9442D2847A; Fri, 16 Jun 2017 11:57:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C0D52847A for ; Fri, 16 Jun 2017 11:57:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753291AbdFPLzw (ORCPT ); Fri, 16 Jun 2017 07:55:52 -0400 Received: from lelnx193.ext.ti.com ([198.47.27.77]:58386 "EHLO lelnx193.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753166AbdFPLzu (ORCPT ); Fri, 16 Jun 2017 07:55:50 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by lelnx193.ext.ti.com (8.15.1/8.15.1) with ESMTP id v5GBt9BQ007704; Fri, 16 Jun 2017 06:55:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1497614109; bh=mz35QRV2Pr9EUYYJhTDxTLjwCq+cAFe4l4720ENqfuU=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=C6KuQsPlPIfR0vZA4yp05YGN1xaXP8mHJwSiAHjjvF8fecesII36BMvXvcf9bWSsI GnbLQz5keUavixnallNw58v3IecqBl2pKZOgFreSFlimIUIG83XawdM4h3KM9XejYC ec28ETj96Cj8PA7dczVcC2IicHWS6atTzaizc8Mk= Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id v5GBt97P016371; Fri, 16 Jun 2017 06:55:09 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.294.0; Fri, 16 Jun 2017 06:55:08 -0500 Received: from a0393678ub.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id v5GBsd1a016625; Fri, 16 Jun 2017 06:55:05 -0500 From: Kishon Vijay Abraham I To: Tony Lindgren , CC: Rob Herring , , , , , Ulf Hansson , , Russell King , Subject: [PATCH 07/12] ARM: dts: am57xx-idk: Move common MMC/SD properties to common file Date: Fri, 16 Jun 2017 17:24:34 +0530 Message-ID: <20170616115439.8508-8-kishon@ti.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170616115439.8508-1-kishon@ti.com> References: <20170616115439.8508-1-kishon@ti.com> MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP AM572x IDK and AM571x IDK boards have equivalent design of how SD card and eMMC are connected. The two EVMs mainly differ in IOdelay configuration needed (because of difference in SoC used). Move the common properties to am57xx-idk-common.dtsi file which is common for both EVMs. Signed-off-by: Sekhar Nori Signed-off-by: Kishon Vijay Abraham I --- arch/arm/boot/dts/am571x-idk.dts | 7 ------- arch/arm/boot/dts/am572x-idk.dts | 8 -------- arch/arm/boot/dts/am57xx-idk-common.dtsi | 8 ++++++++ 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/arch/arm/boot/dts/am571x-idk.dts b/arch/arm/boot/dts/am571x-idk.dts index ad68d1eb3bc3..e685c8e811b0 100644 --- a/arch/arm/boot/dts/am571x-idk.dts +++ b/arch/arm/boot/dts/am571x-idk.dts @@ -64,13 +64,6 @@ }; }; -&mmc1 { - status = "okay"; - vmmc-supply = <&ldo1_reg>; - bus-width = <4>; - cd-gpios = <&gpio6 27 0>; /* gpio 219 */ -}; - &omap_dwc3_2 { extcon = <&extcon_usb2>; }; diff --git a/arch/arm/boot/dts/am572x-idk.dts b/arch/arm/boot/dts/am572x-idk.dts index 8d538f5d9a5f..1c112eb25db4 100644 --- a/arch/arm/boot/dts/am572x-idk.dts +++ b/arch/arm/boot/dts/am572x-idk.dts @@ -76,14 +76,6 @@ vbus-gpio = <&gpio3 26 GPIO_ACTIVE_HIGH>; }; -&mmc1 { - status = "okay"; - vmmc-supply = <&v3_3d>; - vqmmc-supply = <&ldo1_reg>; - bus-width = <4>; - cd-gpios = <&gpio6 27 0>; /* gpio 219 */ -}; - &sn65hvs882 { load-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>; }; diff --git a/arch/arm/boot/dts/am57xx-idk-common.dtsi b/arch/arm/boot/dts/am57xx-idk-common.dtsi index c536b2f5389f..47b5b384809f 100644 --- a/arch/arm/boot/dts/am57xx-idk-common.dtsi +++ b/arch/arm/boot/dts/am57xx-idk-common.dtsi @@ -399,6 +399,14 @@ dr_mode = "peripheral"; }; +&mmc1 { + status = "okay"; + vmmc-supply = <&v3_3d>; + vqmmc-supply = <&ldo1_reg>; + bus-width = <4>; + cd-gpios = <&gpio6 27 0>; /* gpio 219 */ +}; + &mmc2 { status = "okay"; vmmc-supply = <&v3_3d>;