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

Commit df1e9d1c authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap: Split omap_read/write functions for omap1 and omap2+ 



Otherwise multi-omap1 support for omap1 won't work as the cpu_class_is_omap1()
won't work until the SoC is detected.

Note that eventually these will go away, please use ioremap + read/write instead.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 67b738ef

arch/arm/mach-omap1/io.c

+39 −0
Original line number Diff line number Diff line
@@ -142,3 +142,42 @@ void __init omap1_init_common_hw(void) 
	omap1_mux_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);

arch/arm/mach-omap2/io.c

+40 −0
Original line number Diff line number Diff line
@@ -375,3 +375,43 @@ void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0, 


	omap_irq_base_init();

}



/*

 * NOTE: Please use ioremap + __raw_read/write where possible instead of these

 */



u8 omap_readb(u32 pa)

{

	return __raw_readb(OMAP2_L4_IO_ADDRESS(pa));

}

EXPORT_SYMBOL(omap_readb);



u16 omap_readw(u32 pa)

{

	return __raw_readw(OMAP2_L4_IO_ADDRESS(pa));

}

EXPORT_SYMBOL(omap_readw);



u32 omap_readl(u32 pa)

{

	return __raw_readl(OMAP2_L4_IO_ADDRESS(pa));

}

EXPORT_SYMBOL(omap_readl);



void omap_writeb(u8 v, u32 pa)

{

	__raw_writeb(v, OMAP2_L4_IO_ADDRESS(pa));

}

EXPORT_SYMBOL(omap_writeb);



void omap_writew(u16 v, u32 pa)

{

	__raw_writew(v, OMAP2_L4_IO_ADDRESS(pa));

}

EXPORT_SYMBOL(omap_writew);



void omap_writel(u32 v, u32 pa)

{

	__raw_writel(v, OMAP2_L4_IO_ADDRESS(pa));

}

EXPORT_SYMBOL(omap_writel);

arch/arm/plat-omap/io.c

+0 −58
Original line number Diff line number Diff line
@@ -136,61 +136,3 @@ void omap_iounmap(volatile void __iomem *addr) 
		__iounmap(addr);

}

EXPORT_SYMBOL(omap_iounmap);
 


/*

 * NOTE: Please use ioremap + __raw_read/write where possible instead of these

 */



u8 omap_readb(u32 pa)

{

	if (cpu_class_is_omap1())

		return __raw_readb(OMAP1_IO_ADDRESS(pa));

	else

		return __raw_readb(OMAP2_L4_IO_ADDRESS(pa));

}

EXPORT_SYMBOL(omap_readb);



u16 omap_readw(u32 pa)

{

	if (cpu_class_is_omap1())

		return __raw_readw(OMAP1_IO_ADDRESS(pa));

	else

		return __raw_readw(OMAP2_L4_IO_ADDRESS(pa));

}

EXPORT_SYMBOL(omap_readw);



u32 omap_readl(u32 pa)

{

	if (cpu_class_is_omap1())

		return __raw_readl(OMAP1_IO_ADDRESS(pa));

	else

		return __raw_readl(OMAP2_L4_IO_ADDRESS(pa));

}

EXPORT_SYMBOL(omap_readl);



void omap_writeb(u8 v, u32 pa)

{

	if (cpu_class_is_omap1())

		__raw_writeb(v, OMAP1_IO_ADDRESS(pa));

	else

		__raw_writeb(v, OMAP2_L4_IO_ADDRESS(pa));

}

EXPORT_SYMBOL(omap_writeb);



void omap_writew(u16 v, u32 pa)

{

	if (cpu_class_is_omap1())

		__raw_writew(v, OMAP1_IO_ADDRESS(pa));

	else

		__raw_writew(v, OMAP2_L4_IO_ADDRESS(pa));

}

EXPORT_SYMBOL(omap_writew);



void omap_writel(u32 v, u32 pa)

{

	if (cpu_class_is_omap1())

		__raw_writel(v, OMAP1_IO_ADDRESS(pa));

	else

		__raw_writel(v, OMAP2_L4_IO_ADDRESS(pa));

}

EXPORT_SYMBOL(omap_writel);