From patchwork Tue Apr 17 10:44:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 7895 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 46A0523E00 for ; Tue, 17 Apr 2012 10:44:58 +0000 (UTC) Received: from mail-gy0-f180.google.com (mail-gy0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 0A0E1A1841B for ; Tue, 17 Apr 2012 10:44:57 +0000 (UTC) Received: by ghbz12 with SMTP id z12so3601288ghb.11 for ; Tue, 17 Apr 2012 03:44:57 -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=dv0VL+TrEsAWm0bHv8xZ1ONRhkd2OMiE86YBHSqZRbx3qniWUhWO6JTbOp2TmCDeFh xUgcq+t7Vry95CKT1rJOHtVT+bLNGD3xXJvQzdazo3ANrVEmZwggWwb+I8dliDsMIkLy VqNpNvgjd61hofOlioX7zKNPk0KaGPv0DMCfjFSveXlHJsfiPKIepg10/VQQPUyuvsCx od3htgVTk1zfVekPUZe2xVtYX688SLjcHDfkZzbjglM4sUghYO9n/HW1izoHzDiwPvs/ dA4d7l9o7Zx4p5deOJvQdVUGd+6Qm6atImpO5d+T233B1h9e2xTy2yeDARprW1ryfUyu SyNQ== Received: by 10.50.185.233 with SMTP id ff9mr8793304igc.55.1334659497380; Tue, 17 Apr 2012 03:44:57 -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 x6csp138702ibt; Tue, 17 Apr 2012 03:44:56 -0700 (PDT) Received: by 10.180.102.129 with SMTP id fo1mr27200476wib.6.1334659496314; Tue, 17 Apr 2012 03:44:56 -0700 (PDT) Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by mx.google.com with ESMTPS id l32si21429998weq.106.2012.04.17.03.44.55 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Apr 2012 03:44:56 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.172; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wi0-f172.google.com with SMTP id hj6so301545wib.13 for ; Tue, 17 Apr 2012 03:44:55 -0700 (PDT) Received: by 10.180.101.8 with SMTP id fc8mr13511623wib.12.1334659495839; Tue, 17 Apr 2012 03:44:55 -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 fn2sm42069492wib.0.2012.04.17.03.44.51 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Apr 2012 03:44:55 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, grant.likely@secretlab.ca, cjb@laptop.org, linux@arm.linux.org.uk, Lee Jones Subject: [PATCH 08/16] drivers/mmc: MMCI: Use correct GPIO binding for IRQ requests Date: Tue, 17 Apr 2012 11:44:00 +0100 Message-Id: <1334659448-11521-9-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1334659448-11521-1-git-send-email-lee.jones@linaro.org> References: <1334659448-11521-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmvuKc+s8Q2RNnmAlKuR7ukJEDqGMyDOd6fAac6ZKCV6J6XeZnMF/ub0fk0Dn8XW7XBQmqB 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;