Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab49df73 authored by Alistair Buxton's avatar Alistair Buxton
Browse files

OMAP7XX: IO: Remove duplicate omap850 code 



This patch is part of a series which unifies all duplicated code between
omap730 and omap850. All cpu checks are converted to cpu_is_omap7xx() and
CONFIG_ARCH_OMAP850 is added to all CONFIG_ARCH_OMAP730 checks.

Signed-off-by: default avatarAlistair Buxton <a.j.buxton@gmail.com>
Reviewed-by: default avatarZebediah C. McClure <zmc@lurian.net>
parent b718aa81

arch/arm/mach-omap1/io.c

+3 −26
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static struct map_desc omap_io_desc[] __initdata = { 
	}

};



#ifdef CONFIG_ARCH_OMAP730

#if defined (CONFIG_ARCH_OMAP730) || defined (CONFIG_ARCH_OMAP850)

static struct map_desc omap730_io_desc[] __initdata = {

	{

		.virtual	= OMAP730_DSP_BASE,
@@ -52,22 +52,6 @@ static struct map_desc omap730_io_desc[] __initdata = { 
};

#endif



#ifdef CONFIG_ARCH_OMAP850

static struct map_desc omap850_io_desc[] __initdata = {

	{

		.virtual	= OMAP850_DSP_BASE,

		.pfn		= __phys_to_pfn(OMAP850_DSP_START),

		.length		= OMAP850_DSP_SIZE,

		.type		= MT_DEVICE

	}, {

		.virtual	= OMAP850_DSPREG_BASE,

		.pfn		= __phys_to_pfn(OMAP850_DSPREG_START),

		.length		= OMAP850_DSPREG_SIZE,

		.type		= MT_DEVICE

	}

};

#endif



#ifdef CONFIG_ARCH_OMAP15XX

static struct map_desc omap1510_io_desc[] __initdata = {

	{
@@ -120,18 +104,11 @@ void __init omap1_map_common_io(void) 
	 */

	omap_check_revision();



#ifdef CONFIG_ARCH_OMAP730

	if (cpu_is_omap730()) {

#if defined (CONFIG_ARCH_OMAP730) || defined (CONFIG_ARCH_OMAP850)

	if (cpu_is_omap7xx()) {

		iotable_init(omap730_io_desc, ARRAY_SIZE(omap730_io_desc));

	}

#endif



#ifdef CONFIG_ARCH_OMAP850

	if (cpu_is_omap850()) {

		iotable_init(omap850_io_desc, ARRAY_SIZE(omap850_io_desc));

	}

#endif



#ifdef CONFIG_ARCH_OMAP15XX

	if (cpu_is_omap15xx()) {

		iotable_init(omap1510_io_desc, ARRAY_SIZE(omap1510_io_desc));

arch/arm/plat-omap/io.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ void __iomem *omap_ioremap(unsigned long p, size_t size, unsigned int type) 
		if (BETWEEN(p, OMAP1_IO_PHYS, OMAP1_IO_SIZE))

			return XLATE(p, OMAP1_IO_PHYS, OMAP1_IO_VIRT);

	}

	if (cpu_is_omap730()) {

	if (cpu_is_omap7xx()) {

		if (BETWEEN(p, OMAP730_DSP_BASE, OMAP730_DSP_SIZE))

			return XLATE(p, OMAP730_DSP_BASE, OMAP730_DSP_START);