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

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

ARM: OMAP2+: Limit omap_read/write usage to legacy USB drivers 



Drivers should no longer use omap_read/write functions
but instead use ioremap + read/write functions.

As some USB legacy code is still shared between omap1 and
omap2420, let's limit the omap_read/write to plat/usb.h.

Note that the long term fix is to update the drivers to
use ioremap and read/write functions. That can now be
done as a separate patch series that is limited to the
USB drivers.

Also make sure the legacy omap1-keypad.c driver builds
if selected for 2420 based systems.

Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 2c799cef

arch/arm/mach-omap2/common.h

+0 −10
Original line number Diff line number Diff line
@@ -242,15 +242,5 @@ struct omap_sdrc_params; 
extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,

				      struct omap_sdrc_params *sdrc_cs1);



/*

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

 */

extern u8 omap_readb(u32 pa);

extern u16 omap_readw(u32 pa);

extern u32 omap_readl(u32 pa);

extern void omap_writeb(u8 v, u32 pa);

extern void omap_writew(u16 v, u32 pa);

extern void omap_writel(u32 v, u32 pa);



#endif /* __ASSEMBLER__ */

#endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */

arch/arm/mach-omap2/io.c

+0 −40
Original line number Diff line number Diff line
@@ -487,43 +487,3 @@ void __init omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0, 
		_omap2_init_reprogram_sdrc();

	}

}
 


/*

 * 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/include/plat/keypad.h

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 


#ifndef CONFIG_ARCH_OMAP1

#warning Please update the board to use matrix-keypad driver

#define omap_readw(reg)		0

#define omap_writew(val, reg)	do {} while (0)

#endif

#include <linux/input/matrix_keypad.h>

arch/arm/plat-omap/include/plat/usb.h

+41 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#ifndef	__ASM_ARCH_OMAP_USB_H

#define	__ASM_ARCH_OMAP_USB_H



#include <linux/io.h>

#include <linux/usb/musb.h>

#include <plat/board.h>
@@ -105,6 +106,46 @@ extern int omap4430_phy_set_clk(struct device *dev, int on); 
extern int omap4430_phy_init(struct device *dev);

extern int omap4430_phy_exit(struct device *dev);

extern int omap4430_phy_suspend(struct device *dev, int suspend);



/*

 * NOTE: Please update omap USB drivers to use ioremap + read/write

 */



#define OMAP2_L4_IO_OFFSET	0xb2000000

#define IOMEM(x)		((void __force __iomem *)(x))

#define OMAP2_L4_IO_ADDRESS(pa)	IOMEM((pa) + OMAP2_L4_IO_OFFSET)



static inline u8 omap_readb(u32 pa)

{

	return __raw_readb(OMAP2_L4_IO_ADDRESS(pa));

}



static inline u16 omap_readw(u32 pa)

{

	return __raw_readw(OMAP2_L4_IO_ADDRESS(pa));

}



static inline u32 omap_readl(u32 pa)

{

	return __raw_readl(OMAP2_L4_IO_ADDRESS(pa));

}



static inline void omap_writeb(u8 v, u32 pa)

{

	__raw_writeb(v, OMAP2_L4_IO_ADDRESS(pa));

}





static inline void omap_writew(u16 v, u32 pa)

{

	__raw_writew(v, OMAP2_L4_IO_ADDRESS(pa));

}



static inline void omap_writel(u32 v, u32 pa)

{

	__raw_writel(v, OMAP2_L4_IO_ADDRESS(pa));

}



#endif



extern void am35x_musb_reset(void);