devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Rob Herring <robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
Cc: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>
Subject: [PATCH 4/7] mmc: sdhci-of: fix build on non-powerpc platforms
Date: Tue, 16 Nov 2010 14:33:52 -0600	[thread overview]
Message-ID: <1289939635-30742-5-git-send-email-robherring2@gmail.com> (raw)
In-Reply-To: <1289939635-30742-1-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

From: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>

Explicitly include err.h, of_address.h and of_irq.h.
Make use of machine_is() conditional on PPC.

Signed-off-by: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>
---
 drivers/mmc/host/sdhci-of-core.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/drivers/mmc/host/sdhci-of-core.c b/drivers/mmc/host/sdhci-of-core.c
index fa19d84..dd84124 100644
--- a/drivers/mmc/host/sdhci-of-core.c
+++ b/drivers/mmc/host/sdhci-of-core.c
@@ -13,6 +13,7 @@
  * your option) any later version.
  */
 
+#include <linux/err.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/io.h>
@@ -20,8 +21,12 @@
 #include <linux/delay.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/mmc/host.h>
+#ifdef CONFIG_PPC
 #include <asm/machdep.h>
+#endif
 #include "sdhci-of.h"
 #include "sdhci.h"
 
@@ -112,7 +117,11 @@ static bool __devinit sdhci_of_wp_inverted(struct device_node *np)
 		return true;
 
 	/* Old device trees don't have the wp-inverted property. */
+#ifdef CONFIG_PPC
 	return machine_is(mpc837x_rdb) || machine_is(mpc837x_mds);
+#else
+	return false;
+#endif
 }
 
 static int __devinit sdhci_of_probe(struct platform_device *ofdev,
-- 
1.7.1

  parent reply	other threads:[~2010-11-16 20:33 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-16 20:33 [PATCH 0/7] Various OF fixes for little-endian and ARM Rob Herring
     [not found] ` <1289939635-30742-1-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2010-11-16 20:33   ` [PATCH 1/7] OF: make drivers depend on CONFIG_OF instead of CONFIG_PPC_OF Rob Herring
     [not found]     ` <1289939635-30742-2-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2010-11-16 20:40       ` Grant Likely
     [not found]         ` <20101116204058.GA5016-MrY2KI0G/OVr83L8+7iqerDks+cytr/Z@public.gmane.org>
2010-11-16 20:44           ` Mitch Bradley
2010-11-16 23:59           ` Stephen Rothwell
     [not found]             ` <20101117105945.64b3b656.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2010-11-17  0:07               ` [PATCH 1/7] OF: make drivers depend on CONFIG_OF instead ofCONFIG_PPC_OF Stephen Neuendorffer
     [not found]                 ` <64244dc8-4564-42e1-802b-ae1a939ef3b6-RaUQJvECHis6W+Ha+8ZLibjjLBE8jN/0@public.gmane.org>
2010-11-17  0:19                   ` Grant Likely
2010-11-17  4:28               ` [PATCH 1/7] OF: make drivers depend on CONFIG_OF instead of CONFIG_PPC_OF Rob Herring
     [not found]                 ` <4CE359F1.5000209-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2010-11-17  4:43                   ` Tony Breeds
     [not found]                     ` <20101117044331.GC19615-mnsaURCQ41sdnm+yROfE0A@public.gmane.org>
2010-11-17  4:51                       ` Grant Likely
     [not found]                         ` <AANLkTikWRZ6mpuYor3Lmh+qKBCLU65Lni0DYjv8j+bVT-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2010-11-17  4:54                           ` Tony Breeds
2010-11-17  5:43       ` Grant Likely
     [not found]         ` <20101117054337.GG12813-MrY2KI0G/OVr83L8+7iqerDks+cytr/Z@public.gmane.org>
2010-11-17 14:53           ` Rob Herring
     [not found]             ` <4CE3EC7B.4020404-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2010-11-17 15:25               ` Grant Likely
2010-11-16 20:33   ` [PATCH 2/7] of: Fixes for OF probing on little endian systems Rob Herring
     [not found]     ` <1289939635-30742-3-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2010-11-17  5:23       ` Grant Likely
     [not found]         ` <20101117052331.GA12813-MrY2KI0G/OVr83L8+7iqerDks+cytr/Z@public.gmane.org>
2011-01-03 18:08           ` Rob Herring
     [not found]             ` <4D221094.5070703-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-01-03 19:24               ` Grant Likely
2010-11-16 20:33   ` [PATCH 3/7] ipmi: explicitly include of_address.h and of_irq.h Rob Herring
     [not found]     ` <1289939635-30742-4-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2010-11-17  5:23       ` Grant Likely
2010-11-16 20:33   ` Rob Herring [this message]
2010-11-16 21:44     ` [PATCH 4/7] mmc: sdhci-of: fix build on non-powerpc platforms Wolfram Sang
2010-11-16 22:34       ` Rob Herring
2010-11-17  5:32         ` Grant Likely
     [not found]     ` <1289939635-30742-5-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2010-11-17  5:32       ` Grant Likely
2010-11-16 20:33   ` [PATCH 5/7] mmc: sdhci-of: support generic OF controllers Rob Herring
2010-11-16 21:32     ` Wolfram Sang
     [not found]     ` <1289939635-30742-6-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2010-11-17  5:36       ` Grant Likely
2010-11-16 20:33   ` [PATCH 6/7] ARM: add dma_mask to pdev_archdata Rob Herring
2010-11-16 20:33   ` [PATCH 7/7] OF: set dma_mask for ARM Rob Herring
     [not found]     ` <1289939635-30742-8-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2010-11-17  5:24       ` Grant Likely
     [not found]         ` <20101117052448.GC12813-MrY2KI0G/OVr83L8+7iqerDks+cytr/Z@public.gmane.org>
2011-02-08  3:24           ` Rob Herring
2010-11-17  0:07   ` [PATCH 0/7] Various OF fixes for little-endian and ARM Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1289939635-30742-5-git-send-email-robherring2@gmail.com \
    --to=robherring2-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
    --cc=devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \
    --cc=rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).