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: 105724 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp1264640qgd; Fri, 16 Jun 2017 04:57:11 -0700 (PDT) X-Received: by 10.84.208.236 with SMTP id c41mr12001338plj.95.1497614231017; Fri, 16 Jun 2017 04:57:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497614231; cv=none; d=google.com; s=arc-20160816; b=rVMVon0CavZ3+UkSKyfzUy3hkHm/QCBxtKNjMnaTPqxLM5galfFyuYiyvcCjZfHjKa 8QwPG712Zt6SddjWvdc9SLKz4foGf01xLT9aUCWd6S3VPdXF9OruKGUoUFK8PV2PfqXQ pYD6PYfSMV1UYR9YGUV2Pcu3j1lY8PXqqQmWlDDQ6Wn4zJQXoKqPWEfkkaFwlqKTn709 E+CYDd28z7zSzWZkecnxPzvIQS0QTWhEKgu+j8VrW4y0b8PHCtGaROn6+O/Q9h3znxnZ xewslbXEdigLGPV7Mpc+ZdhKgs7Xm8b3h9KWeZ6tQXbpr7zcPEdwXqfYsQLQKqFDFBWv 94qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=qHwyPGebY2xpZU7VO8sTGhE7JHbyW0SapmHBjLTfoCM=; b=PIUcuSbmHH7xYhACbGGlRRAivQuga9MBUz//+g03rc7g7cZhMffsFftNJIpJxWq+LP M3bzgN6rvSD6Lo41JHM/nnISMOTAaIBj4bXOpJd6uKb4Dl/NRI5A57IOMoMUKlq0x9kK /Yt55ktI6KKssgNTd7QMGwIDA5urEacTGhq6EWNrtclF+PRZimLlVQulmE3vCgo9rn/d 24tdTh3T9JD3V/DWi9upuM4vsYA3HkDbGWv8Ipb6zEn+emIunlx7rs4JCVWvHVU9+NO1 4oVcikXRpRLMVHfAJnaZrKs32XQbLH6LYQUBtN9zmYRhd8/ePTGICA3cJHKoYjHWcBuF qgmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.b=C6KuQsPl; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h128si1767714pgc.274.2017.06.16.04.57.10; Fri, 16 Jun 2017 04:57:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.b=C6KuQsPl; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753333AbdFPLzx (ORCPT + 25 others); Fri, 16 Jun 2017 07:55:53 -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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.11.0 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>;