From patchwork Tue Sep 18 03:50:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Ball X-Patchwork-Id: 11491 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 ECDEF23E42 for ; Tue, 18 Sep 2012 03:50:58 +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 7C173A18F54 for ; Tue, 18 Sep 2012 03:50:58 +0000 (UTC) Received: by iafj25 with SMTP id j25so5618090iaf.11 for ; Mon, 17 Sep 2012 20:50: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:references:date:in-reply-to:message-id:user-agent :mime-version:content-type:x-gm-message-state; bh=qTgc1er3Hg6qscYSF4XkZ92gt+HUHB67vog5rTUfY0M=; b=GyptWBEuyzkL39mrkypGunPvSdyOfKWxKIQvOqtx1Wa46g6WzbIfdCf8ki+VKJWnBw Pd4CSbWsqCvcF5GuD7cR6oI89fWUy1Gsp/0KvbuzreS0195fW5B4ijA0hQWw3hRLdLsS snuNiewSArNyvKOaou7ROki2lsdbzIRXPtxQYaYu91iT8rtIh1ZEjwD6HGg+wgkCEjsw fLbFu3q/xohfk8cm+s38PuivVG9ltk3wvs34FLBZvy3gBc2Ckn3KUoQtZLVEWzTkJn2U WW9pOSusP1DIjr+m7sGz0uWTnd7JpsurBD0DP+1FhByA4VHATDB1ijIqZZHH8Ie+Wd6e shTQ== Received: by 10.42.60.139 with SMTP id q11mr10616757ich.53.1347940257374; Mon, 17 Sep 2012 20:50: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.50.184.232 with SMTP id ex8csp351819igc; Mon, 17 Sep 2012 20:50:56 -0700 (PDT) Received: by 10.180.24.197 with SMTP id w5mr20211846wif.22.1347940255158; Mon, 17 Sep 2012 20:50:55 -0700 (PDT) Received: from void.printf.net (void.printf.net. [89.145.121.20]) by mx.google.com with ESMTPS id hq9si24458208wib.31.2012.09.17.20.50.54 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Sep 2012 20:50:55 -0700 (PDT) Received-SPF: neutral (google.com: 89.145.121.20 is neither permitted nor denied by best guess record for domain of cjb@laptop.org) client-ip=89.145.121.20; Authentication-Results: mx.google.com; spf=neutral (google.com: 89.145.121.20 is neither permitted nor denied by best guess record for domain of cjb@laptop.org) smtp.mail=cjb@laptop.org Received: from 173-166-109-250-newengland.hfc.comcastbusiness.net ([173.166.109.250] helo=pullcord.laptop.org) by void.printf.net with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1TDopY-0000xP-Bz; Tue, 18 Sep 2012 04:50:36 +0100 From: Chris Ball To: Thomas Abraham Cc: linux-mmc@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, grant.likely@secretlab.ca, rob.herring@calxeda.com, linux-samsung-soc@vger.kernel.org, kgene.kim@samsung.com, ben-linux@fluff.org, wmb@firmworks.com, patches@linaro.org, Jaehoon Chung Subject: Re: [PATCH v5] mmc: sdhci-s3c: Add device tree support References: <1345741809-18599-1-git-send-email-thomas.abraham@linaro.org> Date: Mon, 17 Sep 2012 23:50:54 -0400 In-Reply-To: (Thomas Abraham's message of "Tue, 18 Sep 2012 07:15:22 +0530") Message-ID: User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/23.1.90 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQnfQozAYv4XdWHYasB3PDNcxJ+0h62aTtxjeaJJfs9qHJz3RjMywYNfOVHSMh4sXjwCM5qY Hi, On Mon, Sep 17 2012, Thomas Abraham wrote: > On 23 August 2012 22:40, Thomas Abraham wrote: >> Add device tree based discovery support for Samsung's sdhci controller >> >> Cc: Ben Dooks >> Cc: Kukjin Kim >> Cc: Chris Ball >> Signed-off-by: Thomas Abraham >> --- >> Changes since v4: >> Adapted to new mmc core card detection bindings as specfied in the patch: >> [PATCH] mmc: dt: Add card-detection properties to core binding >> and extends it "samsung,cd-pinmux-gpio" property as suggested by >> Mitch Bradley >> >> Changes since v3: >> >> The patch series that adds device tree support for Samsung sdhci controller >> had six patches in total, of which, the first five patches have been accepted. >> The sixth patch in the series was dropped since it was using custom Samsung >> properties for descrbing the bus-width and card-detect gpio, but had otherwise >> addressed all the comments. >> >> This patch reworks the sixth patch in v3 of the sdhci device tree support >> patch series. The only change in this patch from the v3 version is the use of >> generic mmc bindings for descrbing the bus-width and card-detect gpio. >> >> .../devicetree/bindings/mmc/samsung-sdhci.txt | 53 +++++++ >> drivers/mmc/host/sdhci-s3c.c | 162 +++++++++++++++++++- >> 2 files changed, 209 insertions(+), 6 deletions(-) >> create mode 100644 Documentation/devicetree/bindings/mmc/samsung-sdhci.txt > > Hi Chris, > > This patch adds device tree support for sdhci-s3c driver. All the > comments for this patch has been addressed. Can this be queued for > v3.7? Yes, sounds good. Jaehoon, perhaps you could give your Reviewed-by for me to add to the patch? I've pushed this to mmc-next for 3.7 now, after adding Jaehoon's else-if suggestion that wasn't acted on: Thanks, - Chris. Reviewed-by: Jaehoon Chung diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index 3d91c7a..0c77b10 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c @@ -461,22 +461,18 @@ static int __devinit sdhci_s3c_parse_dt(struct device *dev, if (gpio_is_valid(gpio)) { pdata->cd_type = S3C_SDHCI_CD_GPIO; goto found_cd; - } else { - if (gpio != -ENOENT) { - dev_err(dev, "invalid card detect gpio specified\n"); - return -EINVAL; - } + } else if (gpio != -ENOENT) { + dev_err(dev, "invalid card detect gpio specified\n"); + return -EINVAL; } gpio = of_get_named_gpio(node, "samsung,cd-pinmux-gpio", 0); if (gpio_is_valid(gpio)) { pdata->cd_type = S3C_SDHCI_CD_INTERNAL; goto found_cd; - } else { - if (gpio != -ENOENT) { - dev_err(dev, "invalid card detect gpio specified\n"); - return -EINVAL; - } + } else if (gpio != -ENOENT) { + dev_err(dev, "invalid card detect gpio specified\n"); + return -EINVAL; } dev_info(dev, "assuming no card detect line available\n");