| Message ID | 1423004615-16085-1-git-send-email-robh@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9064bf3c3cdf92f6b9ac6634ff570dedf0035992 |
| Headers | show |
On Tue, Feb 03, 2015 at 05:03:35PM -0600, Rob Herring wrote: > Move the include of mach/dma.h to the legacy PXA DMA code where it is used. > This enables building spi-pxa2xx on ARM64. If this enables the building of spi-pxa2xx on ARMv8 I'd expect to see a Kconfig change as well, we're not getting build failures at the minute?
On Wed, Feb 4, 2015 at 4:30 AM, Mark Brown <broonie@kernel.org> wrote: > On Tue, Feb 03, 2015 at 05:03:35PM -0600, Rob Herring wrote: > >> Move the include of mach/dma.h to the legacy PXA DMA code where it is used. >> This enables building spi-pxa2xx on ARM64. > > If this enables the building of spi-pxa2xx on ARMv8 I'd expect to see a > Kconfig change as well, we're not getting build failures at the minute? Sorry, I should have said it is in preparation to enable/add ARCH_MMP on ARM64 for PXA1928. Rob -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Feb 03, 2015 at 05:03:35PM -0600, Rob Herring wrote: > Move the include of mach/dma.h to the legacy PXA DMA code where it is used. > This enables building spi-pxa2xx on ARM64. Applied, thanks.
diff --git a/drivers/spi/spi-pxa2xx-pxadma.c b/drivers/spi/spi-pxa2xx-pxadma.c index e8a26f2..e866f2c 100644 --- a/drivers/spi/spi-pxa2xx-pxadma.c +++ b/drivers/spi/spi-pxa2xx-pxadma.c @@ -25,6 +25,7 @@ #include <linux/spi/spi.h> #include <linux/spi/pxa2xx_spi.h> +#include <mach/dma.h> #include "spi-pxa2xx.h" #define DMA_INT_MASK (DCSR_ENDINTR | DCSR_STARTINTR | DCSR_BUSERR) diff --git a/include/linux/spi/pxa2xx_spi.h b/include/linux/spi/pxa2xx_spi.h index d5a3165..46d8fa9 100644 --- a/include/linux/spi/pxa2xx_spi.h +++ b/include/linux/spi/pxa2xx_spi.h @@ -57,7 +57,6 @@ struct pxa2xx_spi_chip { #if defined(CONFIG_ARCH_PXA) || defined(CONFIG_ARCH_MMP) #include <linux/clk.h> -#include <mach/dma.h> extern void pxa2xx_set_spi_info(unsigned id, struct pxa2xx_spi_master *info);
Move the include of mach/dma.h to the legacy PXA DMA code where it is used. This enables building spi-pxa2xx on ARM64. Signed-off-by: Rob Herring <robh@kernel.org> Cc: Daniel Mack <daniel@zonque.org> Cc: Haojian Zhuang <haojian.zhuang@gmail.com> Cc: Robert Jarzmik <robert.jarzmik@free.fr> Cc: Mark Brown <broonie@kernel.org> Cc: linux-spi@vger.kernel.org --- drivers/spi/spi-pxa2xx-pxadma.c | 1 + include/linux/spi/pxa2xx_spi.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)