From patchwork Thu Apr 19 20:36:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 7961 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 5E23423E20 for ; Thu, 19 Apr 2012 20:37:15 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 17DBAA180E6 for ; Thu, 19 Apr 2012 20:37:14 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so16953504iag.11 for ; Thu, 19 Apr 2012 13:37:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=HgpaS9P7x5qEOGYCy+a99WGMDgg9bWX2AkYjLmOU4ks=; b=USAcspH77FpiwBPFT4tj3MO9CzLloCZFnzzPr9M4d9WqlGnL6+Ub7DWHQlT+zVCuR6 LgqHxgAadWJuM4FSndfcQ945mktnGU5PS72tDAoA9D1lfcJJ9073hZmwNnZ/83Pqfk0+ UPSBd/5zm7jELeAqdaWhdYFstR9ASBcdcZXuOnhDnAp1llItdLvTc/TnjFVLC58zPDAv rHrw+4u8GSmuSQdFttxFZRd0W7yL+F3ZHP87jy/h+s80gy+jGaLHrPAOi1smGr8rolHk 9c2ffhnA5IRjjRAgu+bUAGDzYFhzHOkX3g0g3fpmliARxzjOSMMz0CTgt6nwD0mIZEHV mddA== Received: by 10.50.154.167 with SMTP id vp7mr3837850igb.55.1334867834874; Thu, 19 Apr 2012 13:37:14 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.137.198 with SMTP id x6csp317243ibt; Thu, 19 Apr 2012 13:37:14 -0700 (PDT) Received: by 10.180.88.199 with SMTP id bi7mr8592414wib.12.1334867833770; Thu, 19 Apr 2012 13:37:13 -0700 (PDT) Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by mx.google.com with ESMTPS id i6si111191wia.22.2012.04.19.13.37.13 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Apr 2012 13:37:13 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by wibhq7 with SMTP id hq7so6280wib.13 for ; Thu, 19 Apr 2012 13:37:13 -0700 (PDT) Received: by 10.180.92.130 with SMTP id cm2mr8662421wib.4.1334867833210; Thu, 19 Apr 2012 13:37:13 -0700 (PDT) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id h8sm345540wix.4.2012.04.19.13.37.11 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Apr 2012 13:37:12 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, arnd@arndb.de, linus.walleij@stericsson.com, grant.likely@secretlab.ca, cjb@laptop.org, linux@arm.linux.org.uk Cc: Lee Jones Subject: [PATCH 08/15] drivers/mmc: MMCI: Use correct GPIO binding for IRQ requests Date: Thu, 19 Apr 2012 21:36:37 +0100 Message-Id: <1334867804-31942-9-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1334867804-31942-1-git-send-email-lee.jones@linaro.org> References: <1334867804-31942-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlGpHtvGzJqxj7dHJIBpr3jLk2qC32xWCRPeljVy79ynpGL0OQ4rsLRe3abJLgjyWz1UruG Now there are irqdomains in place for Snowball, we can request GPIO IRQs directly by their binding. This replaces the previous method of hard-coding the hwirq using u32 values in the DT. Signed-off-by: Lee Jones --- drivers/mmc/host/mmci.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 5a7da17..2303a16 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -1203,11 +1204,11 @@ static void mmci_dt_populate_generic_pdata(struct device_node *np, { int bus_width = 0; - of_property_read_u32(np, "wp-gpios", &pdata->gpio_wp); + pdata->gpio_wp = of_get_named_gpio(np, "wp-gpios", 0); if (!pdata->gpio_wp) pdata->gpio_wp = -1; - of_property_read_u32(np, "cd-gpios", &pdata->gpio_cd); + pdata->gpio_cd = of_get_named_gpio(np, "cd-gpios", 0); if (!pdata->gpio_cd) pdata->gpio_cd = -1;