usb: musb: Change to use new IO access (1b40fc57) · Commits · e / devices / android_kernel_samsung_universal8895

drivers/usb/musb/am35x.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -408,7 +408,7 @@ static int am35x_musb_exit(struct musb *musb)
	}		}

	/* AM35x supports only 32bit read operation */		/* AM35x supports only 32bit read operation */
	void musb_read_fifo(struct musb_hw_ep hw_ep, u16 len, u8 dst)		static void am35x_read_fifo(struct musb_hw_ep hw_ep, u16 len, u8 dst)
	{		{
	void __iomem *fifo = hw_ep->fifo;		void __iomem *fifo = hw_ep->fifo;
	u32 val;		u32 val;
	@@ -441,6 +441,7 @@ static const struct musb_platform_ops am35x_ops = {
	.init = am35x_musb_init,		.init = am35x_musb_init,
	.exit = am35x_musb_exit,		.exit = am35x_musb_exit,

			.read_fifo = am35x_read_fifo,
	.enable = am35x_musb_enable,		.enable = am35x_musb_enable,
	.disable = am35x_musb_disable,		.disable = am35x_musb_disable,

drivers/usb/musb/blackfin.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -71,7 +71,7 @@ static void binf_writel(void __iomem *addr, unsigned offset, u32 data)
	/*		/*
	* Load an endpoint's FIFO		* Load an endpoint's FIFO
	*/		*/
	void musb_write_fifo(struct musb_hw_ep hw_ep, u16 len, const u8 src)		static void bfin_write_fifo(struct musb_hw_ep hw_ep, u16 len, const u8 src)
	{		{
	struct musb *musb = hw_ep->musb;		struct musb *musb = hw_ep->musb;
	void __iomem *fifo = hw_ep->fifo;		void __iomem *fifo = hw_ep->fifo;
	@@ -135,7 +135,7 @@ void musb_write_fifo(struct musb_hw_ep hw_ep, u16 len, const u8 src)
	/*		/*
	* Unload an endpoint's FIFO		* Unload an endpoint's FIFO
	*/		*/
	void musb_read_fifo(struct musb_hw_ep hw_ep, u16 len, u8 dst)		static void bfin_read_fifo(struct musb_hw_ep hw_ep, u16 len, u8 dst)
	{		{
	struct musb *musb = hw_ep->musb;		struct musb *musb = hw_ep->musb;
	void __iomem *fifo = hw_ep->fifo;		void __iomem *fifo = hw_ep->fifo;
	@@ -474,8 +474,8 @@ static const struct musb_platform_ops bfin_ops = {
	.writew = bfin_writew,		.writew = bfin_writew,
	.readl = bfin_readl,		.readl = bfin_readl,
	.writel = bfin_writel,		.writel = bfin_writel,
	.read_fifo = musb_read_fifo,		.read_fifo = bfin_read_fifo,
	.write_fifo = musb_write_fifo,		.write_fifo = bfin_write_fifo,
	.enable = bfin_musb_enable,		.enable = bfin_musb_enable,
	.disable = bfin_musb_disable,		.disable = bfin_musb_disable,

drivers/usb/musb/musb_core.c

+127 −16

Original line number	Original line	Diff line number	Diff line
	@@ -224,12 +224,46 @@ static struct usb_phy_io_ops musb_ulpi_access = {

	/-------------------------------------------------------------------------/		/-------------------------------------------------------------------------/

	#if !defined(CONFIG_USB_MUSB_TUSB6010) && !defined(CONFIG_USB_MUSB_BLACKFIN)		static u32 musb_default_fifo_offset(u8 epnum)
			{
			return 0x20 + (epnum * 4);
			}

			static u8 musb_default_readb(const void __iomem *addr, unsigned offset)
			{
			return __raw_readb(addr + offset);
			}

			static void musb_default_writeb(void __iomem *addr, unsigned offset, u8 data)
			{
			__raw_writeb(data, addr + offset);
			}

			static u16 musb_default_readw(const void __iomem *addr, unsigned offset)
			{
			return __raw_readw(addr + offset);
			}

			static void musb_default_writew(void __iomem *addr, unsigned offset, u16 data)
			{
			__raw_writew(data, addr + offset);
			}

			static u32 musb_default_readl(const void __iomem *addr, unsigned offset)
			{
			return __raw_readl(addr + offset);
			}

			static void musb_default_writel(void __iomem *addr, unsigned offset, u32 data)
			{
			__raw_writel(data, addr + offset);
			}

	/*		/*
	* Load an endpoint's FIFO		* Load an endpoint's FIFO
	*/		*/
	void musb_write_fifo(struct musb_hw_ep hw_ep, u16 len, const u8 src)		static void musb_default_write_fifo(struct musb_hw_ep *hw_ep, u16 len,
			const u8 *src)
	{		{
	struct musb *musb = hw_ep->musb;		struct musb *musb = hw_ep->musb;
	void __iomem *fifo = hw_ep->fifo;		void __iomem *fifo = hw_ep->fifo;
	@@ -270,11 +304,10 @@ void musb_write_fifo(struct musb_hw_ep hw_ep, u16 len, const u8 src)
	}		}
	}		}

	#if !defined(CONFIG_USB_MUSB_AM35X)
	/*		/*
	* Unload an endpoint's FIFO		* Unload an endpoint's FIFO
	*/		*/
	void musb_read_fifo(struct musb_hw_ep hw_ep, u16 len, u8 dst)		static void musb_default_read_fifo(struct musb_hw_ep hw_ep, u16 len, u8 dst)
	{		{
	struct musb *musb = hw_ep->musb;		struct musb *musb = hw_ep->musb;
	void __iomem *fifo = hw_ep->fifo;		void __iomem *fifo = hw_ep->fifo;
	@@ -312,10 +345,40 @@ void musb_read_fifo(struct musb_hw_ep hw_ep, u16 len, u8 dst)
	ioread8_rep(fifo, dst, len);		ioread8_rep(fifo, dst, len);
	}		}
	}		}
	#endif

	#endif /* normal PIO */		/*
			* Old style IO functions
			*/
			u8 (musb_readb)(const void __iomem addr, unsigned offset);
			EXPORT_SYMBOL_GPL(musb_readb);

			void (musb_writeb)(void __iomem addr, unsigned offset, u8 data);
			EXPORT_SYMBOL_GPL(musb_writeb);

			u16 (musb_readw)(const void __iomem addr, unsigned offset);
			EXPORT_SYMBOL_GPL(musb_readw);

			void (musb_writew)(void __iomem addr, unsigned offset, u16 data);
			EXPORT_SYMBOL_GPL(musb_writew);

			u32 (musb_readl)(const void __iomem addr, unsigned offset);
			EXPORT_SYMBOL_GPL(musb_readl);

			void (musb_writel)(void __iomem addr, unsigned offset, u32 data);
			EXPORT_SYMBOL_GPL(musb_writel);

			/*
			* New style IO functions
			*/
			void musb_read_fifo(struct musb_hw_ep hw_ep, u16 len, u8 dst)
			{
			return hw_ep->musb->io.read_fifo(hw_ep, len, dst);
			}

			void musb_write_fifo(struct musb_hw_ep hw_ep, u16 len, const u8 src)
			{
			return hw_ep->musb->io.write_fifo(hw_ep, len, src);
			}

	/-------------------------------------------------------------------------/		/-------------------------------------------------------------------------/

	@@ -1456,17 +1519,22 @@ static int musb_core_init(u16 musb_type, struct musb *musb)
	for (i = 0; i < musb->nr_endpoints; i++) {		for (i = 0; i < musb->nr_endpoints; i++) {
	struct musb_hw_ep *hw_ep = musb->endpoints + i;		struct musb_hw_ep *hw_ep = musb->endpoints + i;

	hw_ep->fifo = MUSB_FIFO_OFFSET(i) + mbase;		hw_ep->fifo = musb->io.fifo_offset(i) + mbase;
	#if defined(CONFIG_USB_MUSB_TUSB6010) \|\| defined (CONFIG_USB_MUSB_TUSB6010_MODULE)		#if defined(CONFIG_USB_MUSB_TUSB6010) \|\| defined (CONFIG_USB_MUSB_TUSB6010_MODULE)
	hw_ep->fifo_async = musb->async + 0x400 + MUSB_FIFO_OFFSET(i);		if (musb->io.quirks & MUSB_IN_TUSB) {
	hw_ep->fifo_sync = musb->sync + 0x400 + MUSB_FIFO_OFFSET(i);		hw_ep->fifo_async = musb->async + 0x400 +
			musb->io.fifo_offset(i);
			hw_ep->fifo_sync = musb->sync + 0x400 +
			musb->io.fifo_offset(i);
	hw_ep->fifo_sync_va =		hw_ep->fifo_sync_va =
	musb->sync_va + 0x400 + MUSB_FIFO_OFFSET(i);		musb->sync_va + 0x400 + musb->io.fifo_offset(i);

	if (i == 0)		if (i == 0)
	hw_ep->conf = mbase - 0x400 + TUSB_EP0_CONF;		hw_ep->conf = mbase - 0x400 + TUSB_EP0_CONF;
	else		else
	hw_ep->conf = mbase + 0x400 + (((i - 1) & 0xf) << 2);		hw_ep->conf = mbase + 0x400 +
			(((i - 1) & 0xf) << 2);
			}
	#endif		#endif

	hw_ep->regs = MUSB_EP_OFFSET(i, 0) + mbase;		hw_ep->regs = MUSB_EP_OFFSET(i, 0) + mbase;
	@@ -1903,6 +1971,18 @@ musb_init_controller(struct device dev, int nIrq, void __iomem ctrl)
	musb->ops = plat->platform_ops;		musb->ops = plat->platform_ops;
	musb->port_mode = plat->mode;		musb->port_mode = plat->mode;

			/*
			* Initialize the default IO functions. At least omap2430 needs
			* these early. We initialize the platform specific IO functions
			* later on.
			*/
			musb_readb = musb_default_readb;
			musb_writeb = musb_default_writeb;
			musb_readw = musb_default_readw;
			musb_writew = musb_default_writew;
			musb_readl = musb_default_readl;
			musb_writel = musb_default_writel;

	/* The musb_platform_init() call:		/* The musb_platform_init() call:
	* - adjusts musb->mregs		* - adjusts musb->mregs
	* - sets the musb->isr		* - sets the musb->isr
	@@ -1924,6 +2004,37 @@ musb_init_controller(struct device dev, int nIrq, void __iomem ctrl)
	goto fail2;		goto fail2;
	}		}

			if (musb->ops->quirks)
			musb->io.quirks = musb->ops->quirks;

			if (musb->ops->fifo_offset)
			musb->io.fifo_offset = musb->ops->fifo_offset;
			else
			musb->io.fifo_offset = musb_default_fifo_offset;

			if (musb->ops->readb)
			musb_readb = musb->ops->readb;
			if (musb->ops->writeb)
			musb_writeb = musb->ops->writeb;
			if (musb->ops->readw)
			musb_readw = musb->ops->readw;
			if (musb->ops->writew)
			musb_writew = musb->ops->writew;
			if (musb->ops->readl)
			musb_readl = musb->ops->readl;
			if (musb->ops->writel)
			musb_writel = musb->ops->writel;

			if (musb->ops->read_fifo)
			musb->io.read_fifo = musb->ops->read_fifo;
			else
			musb->io.read_fifo = musb_default_read_fifo;

			if (musb->ops->write_fifo)
			musb->io.write_fifo = musb->ops->write_fifo;
			else
			musb->io.write_fifo = musb_default_write_fifo;

	if (!musb->xceiv->io_ops) {		if (!musb->xceiv->io_ops) {
	musb->xceiv->io_dev = musb->controller;		musb->xceiv->io_dev = musb->controller;
	musb->xceiv->io_priv = musb->mregs;		musb->xceiv->io_priv = musb->mregs;

drivers/usb/musb/musb_io.h

+7 −81

Original line number	Original line	Diff line number	Diff line
	@@ -55,86 +55,12 @@ struct musb_io {
	void (write_fifo)(struct musb_hw_ep hw_ep, u16 len, const u8 *buf);		void (write_fifo)(struct musb_hw_ep hw_ep, u16 len, const u8 *buf);
	};		};

	#ifndef CONFIG_BLACKFIN		/* Do not add new entries here, add them the struct musb_io instead */
			extern u8 (musb_readb)(const void __iomem addr, unsigned offset);
	/* NOTE: these offsets are all in bytes */		extern void (musb_writeb)(void __iomem addr, unsigned offset, u8 data);
			extern u16 (musb_readw)(const void __iomem addr, unsigned offset);
	static inline u16 musb_readw(const void __iomem *addr, unsigned offset)		extern void (musb_writew)(void __iomem addr, unsigned offset, u16 data);
	{ return __raw_readw(addr + offset); }		extern u32 (musb_readl)(const void __iomem addr, unsigned offset);
			extern void (musb_writel)(void __iomem addr, unsigned offset, u32 data);
	static inline u32 musb_readl(const void __iomem *addr, unsigned offset)
	{ return __raw_readl(addr + offset); }


	static inline void musb_writew(void __iomem *addr, unsigned offset, u16 data)
	{ __raw_writew(data, addr + offset); }

	static inline void musb_writel(void __iomem *addr, unsigned offset, u32 data)
	{ __raw_writel(data, addr + offset); }


	#if defined(CONFIG_USB_MUSB_TUSB6010) \|\| defined (CONFIG_USB_MUSB_TUSB6010_MODULE)

	/*
	* TUSB6010 doesn't allow 8-bit access; 16-bit access is the minimum.
	*/
	static inline u8 musb_readb(const void __iomem *addr, unsigned offset)
	{
	u16 tmp;
	u8 val;

	tmp = __raw_readw(addr + (offset & ~1));
	if (offset & 1)
	val = (tmp >> 8);
	else
	val = tmp & 0xff;

	return val;
	}

	static inline void musb_writeb(void __iomem *addr, unsigned offset, u8 data)
	{
	u16 tmp;

	tmp = __raw_readw(addr + (offset & ~1));
	if (offset & 1)
	tmp = (data << 8) \| (tmp & 0xff);
	else
	tmp = (tmp & 0xff00) \| data;

	__raw_writew(tmp, addr + (offset & ~1));
	}

	#else

	static inline u8 musb_readb(const void __iomem *addr, unsigned offset)
	{ return __raw_readb(addr + offset); }

	static inline void musb_writeb(void __iomem *addr, unsigned offset, u8 data)
	{ __raw_writeb(data, addr + offset); }

	#endif /* CONFIG_USB_MUSB_TUSB6010 */

	#else

	static inline u8 musb_readb(const void __iomem *addr, unsigned offset)
	{ return (u8) (bfin_read16(addr + offset)); }

	static inline u16 musb_readw(const void __iomem *addr, unsigned offset)
	{ return bfin_read16(addr + offset); }

	static inline u32 musb_readl(const void __iomem *addr, unsigned offset)
	{ return (u32) (bfin_read16(addr + offset)); }

	static inline void musb_writeb(void __iomem *addr, unsigned offset, u8 data)
	{ bfin_write16(addr + offset, (u16) data); }

	static inline void musb_writew(void __iomem *addr, unsigned offset, u16 data)
	{ bfin_write16(addr + offset, data); }

	static inline void musb_writel(void __iomem *addr, unsigned offset, u32 data)
	{ bfin_write16(addr + offset, (u16) data); }

	#endif /* CONFIG_BLACKFIN */

	#endif		#endif

drivers/usb/musb/musb_regs.h

+0 −12

Original line number	Original line	Diff line number	Diff line
	@@ -239,14 +239,6 @@
	#define MUSB_INDEX 0x0E /* 8 bit */		#define MUSB_INDEX 0x0E /* 8 bit */
	#define MUSB_TESTMODE 0x0F /* 8 bit */		#define MUSB_TESTMODE 0x0F /* 8 bit */

	/* Get offset for a given FIFO from musb->mregs */
	#if defined(CONFIG_USB_MUSB_TUSB6010) \|\| \
	defined(CONFIG_USB_MUSB_TUSB6010_MODULE)
	#define MUSB_FIFO_OFFSET(epnum) (0x200 + ((epnum) * 0x20))
	#else
	#define MUSB_FIFO_OFFSET(epnum) (0x20 + ((epnum) * 4))
	#endif

	/*		/*
	* Additional Control Registers		* Additional Control Registers
	*/		*/
	@@ -480,10 +472,6 @@ static inline u8 musb_read_txhubport(void __iomem *mbase, u8 epnum)
	#define MUSB_INDEX USB_OFFSET(USB_INDEX) /* 8 bit */		#define MUSB_INDEX USB_OFFSET(USB_INDEX) /* 8 bit */
	#define MUSB_TESTMODE USB_OFFSET(USB_TESTMODE)/* 8 bit */		#define MUSB_TESTMODE USB_OFFSET(USB_TESTMODE)/* 8 bit */

	/* Get offset for a given FIFO from musb->mregs */
	#define MUSB_FIFO_OFFSET(epnum) \
	(USB_OFFSET(USB_EP0_FIFO) + ((epnum) * 8))

	/*		/*
	* Additional Control Registers		* Additional Control Registers
	*/		*/