* [PATCH] sparc32, leon: Make leom_dma_ops avaiable when !CONFIG_PCI
@ 2014-09-02 11:34 Andreas Larsson
2014-09-08 7:48 ` [PATCH v2] sparc32, leon: Make leon_dma_ops " Andreas Larsson
0 siblings, 1 reply; 3+ messages in thread
From: Andreas Larsson @ 2014-09-02 11:34 UTC (permalink / raw)
To: davem; +Cc: sparclinux, sam, linux-kernel, software
The leon_dma_ops struct is needed for leon regardless of PCI configuration.
Signed-off-by: Andreas Larsson <andreas@gaisler.com>
---
arch/sparc/include/asm/dma-mapping.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/sparc/include/asm/dma-mapping.h b/arch/sparc/include/asm/dma-mapping.h
index 1ee0271..5b1b52a 100644
--- a/arch/sparc/include/asm/dma-mapping.h
+++ b/arch/sparc/include/asm/dma-mapping.h
@@ -20,10 +20,12 @@ extern struct bus_type pci_bus_type;
static inline struct dma_map_ops *get_dma_ops(struct device *dev)
{
-#if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)
+#ifdef CONFIG_SPARC_LEON
if (sparc_cpu_model == sparc_leon)
return leon_dma_ops;
- else if (dev->bus == &pci_bus_type)
+#endif
+#if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)
+ if (dev->bus == &pci_bus_type)
return &pci32_dma_ops;
#endif
return dma_ops;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2] sparc32, leon: Make leon_dma_ops avaiable when !CONFIG_PCI
2014-09-02 11:34 [PATCH] sparc32, leon: Make leom_dma_ops avaiable when !CONFIG_PCI Andreas Larsson
@ 2014-09-08 7:48 ` Andreas Larsson
2014-09-09 23:42 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Andreas Larsson @ 2014-09-08 7:48 UTC (permalink / raw)
To: davem; +Cc: sparclinux, sam, linux-kernel, software
The leon_dma_ops struct is needed for leon regardless of PCI configuration.
Signed-off-by: Andreas Larsson <andreas@gaisler.com>
---
Changes from v1: Fixed typo in commit message
arch/sparc/include/asm/dma-mapping.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/sparc/include/asm/dma-mapping.h b/arch/sparc/include/asm/dma-mapping.h
index 1ee0271..5b1b52a 100644
--- a/arch/sparc/include/asm/dma-mapping.h
+++ b/arch/sparc/include/asm/dma-mapping.h
@@ -20,10 +20,12 @@ extern struct bus_type pci_bus_type;
static inline struct dma_map_ops *get_dma_ops(struct device *dev)
{
-#if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)
+#ifdef CONFIG_SPARC_LEON
if (sparc_cpu_model == sparc_leon)
return leon_dma_ops;
- else if (dev->bus == &pci_bus_type)
+#endif
+#if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)
+ if (dev->bus == &pci_bus_type)
return &pci32_dma_ops;
#endif
return dma_ops;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] sparc32, leon: Make leon_dma_ops avaiable when !CONFIG_PCI
2014-09-08 7:48 ` [PATCH v2] sparc32, leon: Make leon_dma_ops " Andreas Larsson
@ 2014-09-09 23:42 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2014-09-09 23:42 UTC (permalink / raw)
To: andreas; +Cc: sparclinux, sam, linux-kernel, software
From: Andreas Larsson <andreas@gaisler.com>
Date: Mon, 8 Sep 2014 09:48:52 +0200
> The leon_dma_ops struct is needed for leon regardless of PCI configuration.
>
> Signed-off-by: Andreas Larsson <andreas@gaisler.com>
> ---
> Changes from v1: Fixed typo in commit message
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-09 23:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-02 11:34 [PATCH] sparc32, leon: Make leom_dma_ops avaiable when !CONFIG_PCI Andreas Larsson
2014-09-08 7:48 ` [PATCH v2] sparc32, leon: Make leon_dma_ops " Andreas Larsson
2014-09-09 23:42 ` David Miller
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).