mirror of
https://github.com/torvalds/linux.git
synced 2024-12-30 14:52:05 +00:00
45c3eb7d3a
Based on earlier discussions[1] we attempted to find a suitable
location for the omap DMA header in commit 2b6c4e73
(ARM: OMAP:
DMA: Move plat/dma.h to plat-omap/dma-omap.h) until the conversion
to dmaengine is complete.
Unfortunately that was before I was able to try to test compile
of the ARM multiplatform builds for omap2+, and the end result
was not very good.
So I'm creating yet another all over the place patch to cut the
last dependency for building omap2+ for ARM multiplatform. After
this, we have finally removed the driver dependencies to the
arch/arm code, except for few drivers that are being worked on.
The other option was to make the <plat-omap/dma-omap.h> path
to work, but we'd have to add some new header directory to for
multiplatform builds.
Or we would have to manually include arch/arm/plat-omap/include
again from arch/arm/Makefile for omap2+.
Neither of these alternatives sound appealing as they will
likely lead addition of various other headers exposed to the
drivers, which we want to avoid for the multiplatform kernels.
Since we already have a minimal include/linux/omap-dma.h,
let's just use that instead and add a note to it to not
use the custom omap DMA functions any longer where possible.
Note that converting omap DMA to dmaengine depends on
dmaengine supporting automatically incrementing the FIFO
address at the device end, and converting all the remaining
legacy drivers. So it's going to be few more merge windows.
[1] https://patchwork.kernel.org/patch/1519591/#
cc: Russell King <linux@arm.linux.org.uk>
cc: Kevin Hilman <khilman@ti.com>
cc: "Benoît Cousson" <b-cousson@ti.com>
cc: Herbert Xu <herbert@gondor.apana.org.au>
cc: "David S. Miller" <davem@davemloft.net>
cc: Vinod Koul <vinod.koul@intel.com>
cc: Dan Williams <djbw@fb.com>
cc: Mauro Carvalho Chehab <mchehab@infradead.org>
cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
cc: David Woodhouse <dwmw2@infradead.org>
cc: Kyungmin Park <kyungmin.park@samsung.com>
cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
cc: Hans Verkuil <hans.verkuil@cisco.com>
cc: Vaibhav Hiremath <hvaibhav@ti.com>
cc: Lokesh Vutla <lokeshvutla@ti.com>
cc: Rusty Russell <rusty@rustcorp.com.au>
cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
cc: Afzal Mohammed <afzal@ti.com>
cc: linux-crypto@vger.kernel.org
cc: linux-media@vger.kernel.org
cc: linux-mtd@lists.infradead.org
cc: linux-usb@vger.kernel.org
cc: linux-fbdev@vger.kernel.org
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
183 lines
3.8 KiB
C
183 lines
3.8 KiB
C
/*
|
|
* linux/arch/arm/mach-omap1/io.c
|
|
*
|
|
* OMAP1 I/O mapping code
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/io.h>
|
|
|
|
#include <asm/tlb.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
#include <mach/mux.h>
|
|
#include <mach/tc.h>
|
|
#include <linux/omap-dma.h>
|
|
|
|
#include "iomap.h"
|
|
#include "common.h"
|
|
#include "clock.h"
|
|
|
|
/*
|
|
* The machine specific code may provide the extra mapping besides the
|
|
* default mapping provided here.
|
|
*/
|
|
static struct map_desc omap_io_desc[] __initdata = {
|
|
{
|
|
.virtual = OMAP1_IO_VIRT,
|
|
.pfn = __phys_to_pfn(OMAP1_IO_PHYS),
|
|
.length = OMAP1_IO_SIZE,
|
|
.type = MT_DEVICE
|
|
}
|
|
};
|
|
|
|
#if defined (CONFIG_ARCH_OMAP730) || defined (CONFIG_ARCH_OMAP850)
|
|
static struct map_desc omap7xx_io_desc[] __initdata = {
|
|
{
|
|
.virtual = OMAP7XX_DSP_BASE,
|
|
.pfn = __phys_to_pfn(OMAP7XX_DSP_START),
|
|
.length = OMAP7XX_DSP_SIZE,
|
|
.type = MT_DEVICE
|
|
}, {
|
|
.virtual = OMAP7XX_DSPREG_BASE,
|
|
.pfn = __phys_to_pfn(OMAP7XX_DSPREG_START),
|
|
.length = OMAP7XX_DSPREG_SIZE,
|
|
.type = MT_DEVICE
|
|
}
|
|
};
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARCH_OMAP15XX
|
|
static struct map_desc omap1510_io_desc[] __initdata = {
|
|
{
|
|
.virtual = OMAP1510_DSP_BASE,
|
|
.pfn = __phys_to_pfn(OMAP1510_DSP_START),
|
|
.length = OMAP1510_DSP_SIZE,
|
|
.type = MT_DEVICE
|
|
}, {
|
|
.virtual = OMAP1510_DSPREG_BASE,
|
|
.pfn = __phys_to_pfn(OMAP1510_DSPREG_START),
|
|
.length = OMAP1510_DSPREG_SIZE,
|
|
.type = MT_DEVICE
|
|
}
|
|
};
|
|
#endif
|
|
|
|
#if defined(CONFIG_ARCH_OMAP16XX)
|
|
static struct map_desc omap16xx_io_desc[] __initdata = {
|
|
{
|
|
.virtual = OMAP16XX_DSP_BASE,
|
|
.pfn = __phys_to_pfn(OMAP16XX_DSP_START),
|
|
.length = OMAP16XX_DSP_SIZE,
|
|
.type = MT_DEVICE
|
|
}, {
|
|
.virtual = OMAP16XX_DSPREG_BASE,
|
|
.pfn = __phys_to_pfn(OMAP16XX_DSPREG_START),
|
|
.length = OMAP16XX_DSPREG_SIZE,
|
|
.type = MT_DEVICE
|
|
}
|
|
};
|
|
#endif
|
|
|
|
/*
|
|
* Maps common IO regions for omap1
|
|
*/
|
|
static void __init omap1_map_common_io(void)
|
|
{
|
|
iotable_init(omap_io_desc, ARRAY_SIZE(omap_io_desc));
|
|
}
|
|
|
|
#if defined (CONFIG_ARCH_OMAP730) || defined (CONFIG_ARCH_OMAP850)
|
|
void __init omap7xx_map_io(void)
|
|
{
|
|
omap1_map_common_io();
|
|
iotable_init(omap7xx_io_desc, ARRAY_SIZE(omap7xx_io_desc));
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARCH_OMAP15XX
|
|
void __init omap15xx_map_io(void)
|
|
{
|
|
omap1_map_common_io();
|
|
iotable_init(omap1510_io_desc, ARRAY_SIZE(omap1510_io_desc));
|
|
}
|
|
#endif
|
|
|
|
#if defined(CONFIG_ARCH_OMAP16XX)
|
|
void __init omap16xx_map_io(void)
|
|
{
|
|
omap1_map_common_io();
|
|
iotable_init(omap16xx_io_desc, ARRAY_SIZE(omap16xx_io_desc));
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
* Common low-level hardware init for omap1.
|
|
*/
|
|
void __init omap1_init_early(void)
|
|
{
|
|
omap_check_revision();
|
|
|
|
/* REVISIT: Refer to OMAP5910 Errata, Advisory SYS_1: "Timeout Abort
|
|
* on a Posted Write in the TIPB Bridge".
|
|
*/
|
|
omap_writew(0x0, MPU_PUBLIC_TIPB_CNTL);
|
|
omap_writew(0x0, MPU_PRIVATE_TIPB_CNTL);
|
|
|
|
/* Must init clocks early to assure that timer interrupt works
|
|
*/
|
|
omap1_clk_init();
|
|
omap1_mux_init();
|
|
}
|
|
|
|
void __init omap1_init_late(void)
|
|
{
|
|
omap_serial_wakeup_init();
|
|
}
|
|
|
|
/*
|
|
* NOTE: Please use ioremap + __raw_read/write where possible instead of these
|
|
*/
|
|
|
|
u8 omap_readb(u32 pa)
|
|
{
|
|
return __raw_readb(OMAP1_IO_ADDRESS(pa));
|
|
}
|
|
EXPORT_SYMBOL(omap_readb);
|
|
|
|
u16 omap_readw(u32 pa)
|
|
{
|
|
return __raw_readw(OMAP1_IO_ADDRESS(pa));
|
|
}
|
|
EXPORT_SYMBOL(omap_readw);
|
|
|
|
u32 omap_readl(u32 pa)
|
|
{
|
|
return __raw_readl(OMAP1_IO_ADDRESS(pa));
|
|
}
|
|
EXPORT_SYMBOL(omap_readl);
|
|
|
|
void omap_writeb(u8 v, u32 pa)
|
|
{
|
|
__raw_writeb(v, OMAP1_IO_ADDRESS(pa));
|
|
}
|
|
EXPORT_SYMBOL(omap_writeb);
|
|
|
|
void omap_writew(u16 v, u32 pa)
|
|
{
|
|
__raw_writew(v, OMAP1_IO_ADDRESS(pa));
|
|
}
|
|
EXPORT_SYMBOL(omap_writew);
|
|
|
|
void omap_writel(u32 v, u32 pa)
|
|
{
|
|
__raw_writel(v, OMAP1_IO_ADDRESS(pa));
|
|
}
|
|
EXPORT_SYMBOL(omap_writel);
|