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

Commit bb59dbff authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Felipe Balbi
Browse files

usb: gadget: m66592-udc: add function for external controller 



M66592 has the pin of WR0 and WR1. So, if one write-pin of CPU
connects to the pins, we have to change the setting of FIFOSEL
register in the controller. If we don't change the setting,
the controller cannot send the data of odd length.

Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 8ca13756

drivers/usb/gadget/m66592-udc.c

+2 −2
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ static void irq_ep0_write(struct m66592_ep *ep, struct m66592_request *req) 
	/* write fifo */

	if (req->req.buf) {

		if (size > 0)

			m66592_write_fifo(m66592, ep->fifoaddr, buf, size);

			m66592_write_fifo(m66592, ep, buf, size);

		if ((size == 0) || ((size % ep->ep.maxpacket) != 0))

			m66592_bset(m66592, M66592_BVAL, ep->fifoctr);

	}
@@ -827,7 +827,7 @@ static void irq_packet_write(struct m66592_ep *ep, struct m66592_request *req) 


	/* write fifo */

	if (req->req.buf) {

		m66592_write_fifo(m66592, ep->fifoaddr, buf, size);

		m66592_write_fifo(m66592, ep, buf, size);

		if ((size == 0)

				|| ((size % ep->ep.maxpacket) != 0)

				|| ((bufsize != ep->ep.maxpacket)

drivers/usb/gadget/m66592-udc.h

+21 −17
Original line number Diff line number Diff line
@@ -561,11 +561,26 @@ static inline void m66592_write(struct m66592 *m66592, u16 val, 
	iowrite16(val, m66592->reg + offset);

}



static inline void m66592_mdfy(struct m66592 *m66592, u16 val, u16 pat,

		unsigned long offset)

{

	u16 tmp;

	tmp = m66592_read(m66592, offset);

	tmp = tmp & (~pat);

	tmp = tmp | val;

	m66592_write(m66592, tmp, offset);

}



#define m66592_bclr(m66592, val, offset)	\

			m66592_mdfy(m66592, 0, val, offset)

#define m66592_bset(m66592, val, offset)	\

			m66592_mdfy(m66592, val, 0, offset)



static inline void m66592_write_fifo(struct m66592 *m66592,

		unsigned long offset,

		struct m66592_ep *ep,

		void *buf, unsigned long len)

{

	void __iomem *fifoaddr = m66592->reg + offset;

	void __iomem *fifoaddr = m66592->reg + ep->fifoaddr;



	if (m66592->pdata->on_chip) {

		unsigned long count;
@@ -591,26 +606,15 @@ static inline void m66592_write_fifo(struct m66592 *m66592, 
		iowrite16_rep(fifoaddr, buf, len);

		if (odd) {

			unsigned char *p = buf + len*2;

			if (m66592->pdata->wr0_shorted_to_wr1)

				m66592_bclr(m66592, M66592_MBW_16, ep->fifosel);

			iowrite8(*p, fifoaddr);

			if (m66592->pdata->wr0_shorted_to_wr1)

				m66592_bset(m66592, M66592_MBW_16, ep->fifosel);

		}

	}

}



static inline void m66592_mdfy(struct m66592 *m66592, u16 val, u16 pat,

		unsigned long offset)

{

	u16 tmp;

	tmp = m66592_read(m66592, offset);

	tmp = tmp & (~pat);

	tmp = tmp | val;

	m66592_write(m66592, tmp, offset);

}



#define m66592_bclr(m66592, val, offset)	\

			m66592_mdfy(m66592, 0, val, offset)

#define m66592_bset(m66592, val, offset)	\

			m66592_mdfy(m66592, val, 0, offset)



#endif	/* ifndef __M66592_UDC_H__ */

include/linux/usb/m66592.h

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ struct m66592_platdata { 
	/* (external controller only) one = 3.3V, zero = 1.5V */

	unsigned	vif:1;



	/* (external controller only) set one = WR0_N shorted to WR1_N */

	unsigned	wr0_shorted_to_wr1:1;

};



#endif /* __LINUX_USB_M66592_H */