From patchwork Wed Aug 16 13:45:03 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: 110251 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp806123qge; Wed, 16 Aug 2017 06:46:31 -0700 (PDT) X-Received: by 10.98.206.194 with SMTP id y185mr1764178pfg.312.1502891191192; Wed, 16 Aug 2017 06:46:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502891191; cv=none; d=google.com; s=arc-20160816; b=JKe33PuMUGcdxQhd5acIN26vaRv0UmbfyTsDm2cEikLmXZKGKRzlA3ilHt6LN/dxuz QI2sVRDpZTdi34kzzhXNLGg6kiNKvF9Zv5Yn+uPM9VVsBHezfXuwMPcq/6kFfRmoQfLq PdraGVTu8CV+p7Lu4ClvLxPI3HLxY+aFqztKwcYNNtpVSFFM9/UqT7Nlc8pV3SRq3hLa rn1Bi9Mo8OvdKyws2TWFcJKneV5cELlNQXI1r5mX2dYgAdLBS7Kd5bSWIKAqbbqxIhDU gddiKpIBoCPXA6uMTo6xjbfHH/iPKwbhY6/B1YWSy+107cb+fLtvqwm5dXe77G/Gstqw nc6w== 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=KHRGhuK3XNPGFFykvUJa5dRbBgmphiAyK22lol57vqI=; b=zPr3BiVXcrXYb8YCocTyQWN5MV6Mq6vmGJlq1DVIndHMf/jxjhkiZVfrnbJF/jJMkl LYAI09O/fQAOLuKTvbuoBzJqlLpNMx7+9bo9mfnqUx89bdkRJ/P2RDRtcFSunPTQC4oQ qGsIOag6khp1hS6alditqXKQ5XKJag4cYE2T1E2zWBeDEs22QOoK2b+MoWsr7eHnF9Of LViBDMtjZAwxZiNa/DZeKZ7e6TXG41W/kktm2WwHGxt7oeL1CIhqbKpgAGAfPcWycnm6 rb2HVNYdaUMWnvk0LY9DuAPodB7N5DgYIRGCpT3QFD/UVsCLCO0loAjgSOFz/qIAasBf ZIuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=P6qVfg4N; 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 f3si591707plb.765.2017.08.16.06.46.30; Wed, 16 Aug 2017 06:46:31 -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.s=ti-com-17Q1 header.b=P6qVfg4N; 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 S1752431AbdHPNqP (ORCPT + 26 others); Wed, 16 Aug 2017 09:46:15 -0400 Received: from lelnx194.ext.ti.com ([198.47.27.80]:43985 "EHLO lelnx194.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752204AbdHPNqL (ORCPT ); Wed, 16 Aug 2017 09:46:11 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by lelnx194.ext.ti.com (8.15.1/8.15.1) with ESMTP id v7GDjTl4020099; Wed, 16 Aug 2017 08:45:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1502891129; bh=jtmDdqYYSqibRrPZhi+FlU3nx3ATrEIGdUe29ws+qkQ=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=P6qVfg4NiN85phX/jxieihLk4eN/AG91UMPdyp0i0A/N8gJsutzvpp85LDeR64/54 B8GwP64Hnz6HYES/BwMuyIU4jhaiF9uF+W9f9IU80yXU8Mju8M4lFZkYoK3QaU33+Z oyJYD+SXQib1KFvdcqUuXd/0Q1rG4XCrz6wSNPSA= Received: from DLEE102.ent.ti.com (dlee102.ent.ti.com [157.170.170.32]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id v7GDjTMN004729; Wed, 16 Aug 2017 08:45:29 -0500 Received: from DLEE113.ent.ti.com (157.170.170.24) by DLEE102.ent.ti.com (157.170.170.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.845.34; Wed, 16 Aug 2017 08:45:28 -0500 Received: from DLEE104.ent.ti.com (157.170.170.34) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.845.34; Wed, 16 Aug 2017 08:45:28 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE104.ent.ti.com (157.170.170.34) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.845.34 via Frontend Transport; Wed, 16 Aug 2017 08:45:28 -0500 Received: from a0393678ub.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id v7GDjCAX017583; Wed, 16 Aug 2017 08:45:26 -0500 From: Kishon Vijay Abraham I To: Tony Lindgren CC: , , , , , , Subject: [PATCH v2 05/10] ARM: dts: am57xx-idk: Move common MMC/SD properties to common file Date: Wed, 16 Aug 2017 19:15:03 +0530 Message-ID: <20170816134508.8887-6-kishon@ti.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170816134508.8887-1-kishon@ti.com> References: <20170816134508.8887-1-kishon@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sekhar Nori 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 0c0bb4e93f25..78c5c7462fcc 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 GPIO_ACTIVE_LOW>; /* 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 604d52554eda..5b22944fedad 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 GPIO_ACTIVE_LOW>; /* 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..97aa8e6a56da 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 GPIO_ACTIVE_LOW>; /* gpio 219 */ +}; + &mmc2 { status = "okay"; vmmc-supply = <&v3_3d>;