From patchwork Mon Feb 17 11:36:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Mack X-Patchwork-Id: 3662821 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 068F6BF13A for ; Mon, 17 Feb 2014 11:36:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 41ADC201EF for ; Mon, 17 Feb 2014 11:36:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5EE10201E7 for ; Mon, 17 Feb 2014 11:36:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752046AbaBQLgu (ORCPT ); Mon, 17 Feb 2014 06:36:50 -0500 Received: from mail-ea0-f179.google.com ([209.85.215.179]:62991 "EHLO mail-ea0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751552AbaBQLgt (ORCPT ); Mon, 17 Feb 2014 06:36:49 -0500 Received: by mail-ea0-f179.google.com with SMTP id q10so6487846ead.24 for ; Mon, 17 Feb 2014 03:36:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=Yk3cP/CLatZfR9PtK6ZtOwprdQLrwmZGmJLtAL0Ud10=; b=kEDh4QnIij3Du9TsKyEMfymu/QA+MXe6Ux9prLyviaU0pPRihN/oXtEfLZIGICx+B3 dGFAU68dt61hLc8smQagvkXHVy6PMGwKnEB7sE8b2KhIWnsNYUdBFIGtKVAPD6Sx/oLk bO+g7Utz2KSLkfL0WfVIUZ46GAMAgD5BG548Ybg4/J9CPjvpokJawFHrekVgbGjPn04h 1oKHBuoe+iM0z3jgHZ0bFNg4ymTQVDZnkaScFuIoY6wkcTyEk9HQ5fmeHFy7dXN95YhS e78EqLrbpSmyBeeUZAzCdHxIb3qfIU433msgLcoh2GcSehUm+njrZJ5Wd4jIyDTL2XPm YDaA== X-Received: by 10.15.76.1 with SMTP id m1mr26818183eey.36.1392637008176; Mon, 17 Feb 2014 03:36:48 -0800 (PST) Received: from tamtam.fritz.box ([2001:4dd0:ff00:9394:224:d7ff:fec6:a0ec]) by mx.google.com with ESMTPSA id n41sm56426078eeg.16.2014.02.17.03.36.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Feb 2014 03:36:47 -0800 (PST) From: Daniel Mack To: balajitk@ti.com, chris@printf.net Cc: linux-mmc@vger.kernel.org, linux-omap@vger.kernel.org, Daniel Mack Subject: [PATCH] mmc: omap_hsmmc: support more DT properties Date: Mon, 17 Feb 2014 12:36:33 +0100 Message-Id: <1392636993-15864-1-git-send-email-zonque@gmail.com> X-Mailer: git-send-email 1.8.5.3 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This should probably be done implicitly through mmc_of_parse(), but that doesn't play well along with the multi-slot model the hsmmc driver features. Hence, for now, do it manually. The properties are already documented in Documentation/devicetree/bindings/mmc/mmc.txt. Signed-off-by: Daniel Mack Acked-by: Balaji T K --- drivers/mmc/host/omap_hsmmc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 2815de6..a5a38cc 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -1765,6 +1765,12 @@ static struct omap_mmc_platform_data *of_get_hsmmc_pdata(struct device *dev) if (of_find_property(np, "ti,needs-special-hs-handling", NULL)) pdata->slots[0].features |= HSMMC_HAS_HSPE_SUPPORT; + if (of_find_property(np, "keep-power-in-suspend", NULL)) + pdata->slots[0].pm_caps |= MMC_PM_KEEP_POWER; + + if (of_find_property(np, "enable-sdio-wakeup", NULL)) + pdata->slots[0].pm_caps |= MMC_PM_WAKE_SDIO_IRQ; + return pdata; } #else