From patchwork Fri Jun 16 12:45:38 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: 105733 Delivered-To: patch@linaro.org Received: by 10.182.29.35 with SMTP id g3csp1257990obh; Fri, 16 Jun 2017 05:47:45 -0700 (PDT) X-Received: by 10.99.247.83 with SMTP id f19mr11378516pgk.190.1497617265385; Fri, 16 Jun 2017 05:47:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497617265; cv=none; d=google.com; s=arc-20160816; b=MbkU5gYkNfRQ8LJ1THJGSC6Ur7XjR4Mi6F8Ngdke4Tq/gnmzBON2B7TY3ryZCNSI0P wezpua++cFsSmMpfzCaKvL0IKYSQ44k8MUB3EwsY1al6vJKpm3OTVQPMhRSANNun0t9Y VslB8roPEux+ihObi2XyW25z8cifbz4nQTiPP+jvd7+JUOd3qpXAUkdg8j+yPNZBNdmI cXsiYRvn89Z+vp+8PbPFtFt/JVAFtlc+hCoFVIhViuxdIdHtDIiyqn7CB0vmgVJxaaJp v2iaAEfrb0VihXr/QDKSzF/2p7Lou73yN5RRFQ25PUwLHe0m/RrGgFu7N/JNBOsY+e5U yJGw== 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=omt+WY5S0mKX+x59yraqu9fYy7r9MoZT8ShDzyrIKTA=; b=DxO3sbcP+Zp5qp1y0lca+S/VQ452Eb0EcQ/eymnupT8ixK4AnefeK87j3WbdtFzHMX nBQ/ihoCK99TJnzmNxQ500XiKT53QNp9ucV/jUKTShCF2yCEfBZ1xxBrcKwrn/0I548X P54ng/1aa723KQLFkcgj1QDh3sDxOjwDIvv2i5HCOlQk9BEPs+H+NVdtZsadr7MT0OY7 wCHsJHT67IYSowFi/NUwXu9fW6jkzP3sMMXSfXs3gXxPttrjJDr46ii+X3mhqy0VbZul D8u0EPoyiNoUniAwfHvLF4K0AwUmSHgAReRe+blFiUmLMp1Rc8V0OnkfRaJbPjrzfsTN 2eUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.b=X6j8rWBB; 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 q5si2000392plk.170.2017.06.16.05.47.45; Fri, 16 Jun 2017 05:47:45 -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=X6j8rWBB; 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 S1753805AbdFPMrT (ORCPT + 25 others); Fri, 16 Jun 2017 08:47:19 -0400 Received: from lelnx193.ext.ti.com ([198.47.27.77]:60028 "EHLO lelnx193.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753777AbdFPMrQ (ORCPT ); Fri, 16 Jun 2017 08:47:16 -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 v5GCkYYB013748; Fri, 16 Jun 2017 07:46:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1497617194; bh=3fpsiiXv5WlAzPz9MrRMubTfRklSTlITyO/OvI44zA8=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=X6j8rWBBtQVP6oaMQfUfhvpoLWcIU6EVCgQWY4u3GR/YaVEx4+RidZl2x61cpaLne 5nXFarM7NWnYBqFJH8tqJJ+0pphNwE3VueupiCKNwM2/cHlBu1JORstCQXgIHHLYbN PhmQL/YnCdjWJfKt0ej++oMVQTzmjEUtdY3/46eg= Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id v5GCkYI1018341; Fri, 16 Jun 2017 07:46:34 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.294.0; Fri, 16 Jun 2017 07:46:33 -0500 Received: from a0393678ub.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id v5GCjjBm000652; Fri, 16 Jun 2017 07:46:30 -0500 From: Kishon Vijay Abraham I To: Ulf Hansson , Rob Herring , Tony Lindgren , CC: Russell King , Ravikumar Kattekola , , , , , , Subject: [PATCH 10/16] mmc: host: omap_hsmmc: Add new compatible string to support dra7 Date: Fri, 16 Jun 2017 18:15:38 +0530 Message-ID: <20170616124544.15046-11-kishon@ti.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170616124544.15046-1-kishon@ti.com> References: <20170616124544.15046-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 Add a new compatible string "ti,dra7-hsmmc" to support dra7 and dra72 controllers. Also create a new controller flag "OMAP_HSMMC_REQUIRE_IODELAY" to specify all controllers that use "ti,dra7-hsmmc" require iodealy configuration to be set. Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Sekhar Nori Acked-by: Rob Herring --- Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt | 1 + drivers/mmc/host/omap_hsmmc.c | 10 ++++++++++ include/linux/platform_data/hsmmc-omap.h | 1 + 3 files changed, 12 insertions(+) -- 2.11.0 diff --git a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt index 74166a0d460d..258e25af10f7 100644 --- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt +++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt @@ -12,6 +12,7 @@ Required properties: Should be "ti,omap3-hsmmc", for OMAP3 controllers Should be "ti,omap3-pre-es3-hsmmc" for OMAP3 controllers pre ES3.0 Should be "ti,omap4-hsmmc", for OMAP4 controllers + Should be "ti,dra7-hsmmc", for dra7 and dra72 controllers Should be "ti,am33xx-hsmmc", for AM335x controllers - ti,hwmods: Must be "mmc", n is controller instance starting 1 diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index d797224152ac..9d59fe611498 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -2302,6 +2302,12 @@ static const struct omap_mmc_of_data am33xx_mmc_of_data = { .controller_flags = OMAP_HSMMC_SWAKEUP_MISSING, }; +static const struct omap_mmc_of_data dra7_mmc_of_data = { + .reg_offset = 0x100, + .controller_flags = OMAP_HSMMC_SWAKEUP_MISSING | + OMAP_HSMMC_REQUIRE_IODELAY, +}; + static const struct of_device_id omap_mmc_of_match[] = { { .compatible = "ti,omap2-hsmmc", @@ -2321,6 +2327,10 @@ static const struct of_device_id omap_mmc_of_match[] = { .compatible = "ti,am33xx-hsmmc", .data = &am33xx_mmc_of_data, }, + { + .compatible = "ti,dra7-hsmmc", + .data = &dra7_mmc_of_data, + }, {}, }; MODULE_DEVICE_TABLE(of, omap_mmc_of_match); diff --git a/include/linux/platform_data/hsmmc-omap.h b/include/linux/platform_data/hsmmc-omap.h index 67bded22eae4..8e771851e07a 100644 --- a/include/linux/platform_data/hsmmc-omap.h +++ b/include/linux/platform_data/hsmmc-omap.h @@ -27,6 +27,7 @@ #define OMAP_HSMMC_SUPPORTS_DUAL_VOLT BIT(0) #define OMAP_HSMMC_BROKEN_MULTIBLOCK_READ BIT(1) #define OMAP_HSMMC_SWAKEUP_MISSING BIT(2) +#define OMAP_HSMMC_REQUIRE_IODELAY BIT(3) struct omap_hsmmc_dev_attr { u8 flags;