From: Rob Herring <robherring2@gmail.com>
To: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org
Cc: Grant Likely <grant.likely@linaro.org>,
Paul Mackerras <paulus@samba.org>,
linuxppc-dev@lists.ozlabs.org,
Rob Herring <rob.herring@calxeda.com>
Subject: [PATCH 17/21] of: move of_translate_dma_address to of_address.h
Date: Thu, 26 Sep 2013 13:50:52 -0500 [thread overview]
Message-ID: <1380221456-11192-18-git-send-email-robherring2@gmail.com> (raw)
In-Reply-To: <1380221456-11192-1-git-send-email-robherring2@gmail.com>
From: Rob Herring <rob.herring@calxeda.com>
of_translate_dma_address is implemented in common code, so move the
declaration there too.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: linuxppc-dev@lists.ozlabs.org
---
arch/powerpc/include/asm/prom.h | 4 ----
include/linux/of_address.h | 4 ++++
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h
index 43fe002..b8774bd 100644
--- a/arch/powerpc/include/asm/prom.h
+++ b/arch/powerpc/include/asm/prom.h
@@ -24,10 +24,6 @@
* OF address retreival & translation
*/
-/* Translate a DMA address from device space to CPU space */
-extern u64 of_translate_dma_address(struct device_node *dev,
- const __be32 *in_addr);
-
/* Parse the ibm,dma-window property of an OF node into the busno, phys and
* size parameters.
*/
diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index e8a1797..5f6ed6b 100644
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -34,6 +34,10 @@ static inline void of_pci_range_to_resource(struct of_pci_range *range,
res->name = np->full_name;
}
+/* Translate a DMA address from device space to CPU space */
+extern u64 of_translate_dma_address(struct device_node *dev,
+ const __be32 *in_addr);
+
#ifdef CONFIG_OF_ADDRESS
extern u64 of_translate_address(struct device_node *np, const __be32 *addr);
extern bool of_can_translate_address(struct device_node *dev);
--
1.8.1.2
WARNING: multiple messages have this Message-ID (diff)
From: Rob Herring <robherring2@gmail.com>
To: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org
Cc: Grant Likely <grant.likely@linaro.org>,
Rob Herring <rob.herring@calxeda.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 17/21] of: move of_translate_dma_address to of_address.h
Date: Thu, 26 Sep 2013 13:50:52 -0500 [thread overview]
Message-ID: <1380221456-11192-18-git-send-email-robherring2@gmail.com> (raw)
In-Reply-To: <1380221456-11192-1-git-send-email-robherring2@gmail.com>
From: Rob Herring <rob.herring@calxeda.com>
of_translate_dma_address is implemented in common code, so move the
declaration there too.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: linuxppc-dev@lists.ozlabs.org
---
arch/powerpc/include/asm/prom.h | 4 ----
include/linux/of_address.h | 4 ++++
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h
index 43fe002..b8774bd 100644
--- a/arch/powerpc/include/asm/prom.h
+++ b/arch/powerpc/include/asm/prom.h
@@ -24,10 +24,6 @@
* OF address retreival & translation
*/
-/* Translate a DMA address from device space to CPU space */
-extern u64 of_translate_dma_address(struct device_node *dev,
- const __be32 *in_addr);
-
/* Parse the ibm,dma-window property of an OF node into the busno, phys and
* size parameters.
*/
diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index e8a1797..5f6ed6b 100644
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -34,6 +34,10 @@ static inline void of_pci_range_to_resource(struct of_pci_range *range,
res->name = np->full_name;
}
+/* Translate a DMA address from device space to CPU space */
+extern u64 of_translate_dma_address(struct device_node *dev,
+ const __be32 *in_addr);
+
#ifdef CONFIG_OF_ADDRESS
extern u64 of_translate_address(struct device_node *np, const __be32 *addr);
extern bool of_can_translate_address(struct device_node *dev);
--
1.8.1.2
next prev parent reply other threads:[~2013-09-26 18:51 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-26 18:50 [PATCH 00/21] of: prom.h clean-up and removal Rob Herring
2013-09-26 18:50 ` [PATCH 01/21] drivers: remove unnecessary prom.h includes Rob Herring
[not found] ` <1380221456-11192-2-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-09-30 7:54 ` Marc Kleine-Budde
2013-09-30 7:54 ` Marc Kleine-Budde
[not found] ` <52492E4F.2020701-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2013-09-30 13:19 ` Rob Herring
2013-09-30 13:19 ` Rob Herring
2013-09-30 13:23 ` Marc Kleine-Budde
2013-09-26 18:50 ` [PATCH 03/21] ARM: keystone: remove unnecessary prom.h include Rob Herring
2013-09-26 18:50 ` [PATCH 04/21] arm64: " Rob Herring
[not found] ` <1380221456-11192-5-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-09-27 14:37 ` Catalin Marinas
2013-09-27 14:37 ` Catalin Marinas
2013-09-26 18:50 ` [PATCH 05/21] openrisc: " Rob Herring
2013-09-26 18:50 ` Rob Herring
2013-09-26 18:50 ` [PATCH 06/21] arc: remove unnecessary prom.h includes Rob Herring
2013-09-27 4:37 ` Vineet Gupta
2013-09-27 4:37 ` Vineet Gupta
2013-09-26 18:50 ` [PATCH 07/21] hexagon: " Rob Herring
2013-09-30 20:21 ` rkuo
2013-09-26 18:50 ` [PATCH 08/21] metag: move setup_machine_fdt declaration from prom.h Rob Herring
2013-09-26 18:50 ` [PATCH 11/21] mips: add explicit includes of prom.h Rob Herring
2013-09-26 18:50 ` [PATCH 13/21] of: implement pci_address_to_pio as weak function Rob Herring
2013-09-26 18:50 ` [PATCH 14/21] of: implement of_node_to_nid as a " Rob Herring
2013-10-04 10:33 ` Grant Likely
2013-09-26 18:50 ` [PATCH 15/21] of: remove HAVE_ARCH_DEVTREE_FIXUPS Rob Herring
2013-09-27 4:58 ` Vineet Gupta
2013-09-27 4:58 ` Vineet Gupta
2013-09-26 18:50 ` [PATCH 16/21] of: move of_address_to_resource and of_iomap declarations from sparc Rob Herring
2013-09-26 18:50 ` Rob Herring
2013-09-26 18:50 ` Rob Herring [this message]
2013-09-26 18:50 ` [PATCH 17/21] of: move of_translate_dma_address to of_address.h Rob Herring
2013-09-26 18:50 ` [PATCH 18/21] powerpc: clean-up include ordering in prom.h Rob Herring
2013-09-26 18:50 ` [PATCH 19/21] powerpc: add explicit OF includes Rob Herring
2013-09-26 18:50 ` Rob Herring
[not found] ` <1380221456-11192-1-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-09-26 18:50 ` [PATCH 02/21] of: remove unnecessary prom.h includes Rob Herring
2013-09-26 18:50 ` Rob Herring
2013-09-26 18:50 ` [PATCH 09/21] microblaze: clean-up prom.h implicit includes Rob Herring
2013-09-26 18:50 ` Rob Herring
2013-09-26 18:50 ` [PATCH 10/21] drivers: " Rob Herring
2013-09-26 18:50 ` Rob Herring
2013-09-26 18:50 ` [PATCH 12/21] x86: add necessary includes for prom.h Rob Herring
2013-09-26 18:50 ` Rob Herring
2013-09-26 18:50 ` [PATCH 20/21] of: only include prom.h on sparc Rob Herring
2013-09-26 18:50 ` Rob Herring
2013-09-26 18:50 ` [PATCH 21/21] of: remove empty arch prom.h headers Rob Herring
2013-09-26 18:50 ` Rob Herring
2013-09-27 4:59 ` Vineet Gupta
2013-09-27 4:59 ` Vineet Gupta
[not found] ` <1380221456-11192-22-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-09-27 14:37 ` Catalin Marinas
2013-09-27 14:37 ` Catalin Marinas
2013-09-27 4:56 ` [PATCH 00/21] of: prom.h clean-up and removal Vineet Gupta
2013-10-03 9:33 ` Vineet Gupta
2013-10-03 9:33 ` Vineet Gupta
[not found] ` <C2D7FE5348E1B147BCA15975FBA2307514F2CE-uUKrqVzojAgF5QVroWrzJvufCSb+aD3WLzEdoUbNIic@public.gmane.org>
2013-10-03 18:08 ` Rob Herring
2013-10-03 18:08 ` Rob Herring
2013-10-04 10:36 ` Grant Likely
2013-10-04 10:36 ` Grant Likely
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=1380221456-11192-18-git-send-email-robherring2@gmail.com \
--to=robherring2@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=grant.likely@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulus@samba.org \
--cc=rob.herring@calxeda.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.