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

Commit 5916733e authored by Al Cooper's avatar Al Cooper Committed by Felipe Balbi
Browse files

usb: bdc: Fix misleading register names 



The BDC endpoint status registers 0-7 were originally each going
to be an array of regsiters. This was later changed to being a
single register. The register definitions are being changed from:
"#define BDC_EPSTS0(n)  (0x60 + (n * 0x10))"
to
"#define BDC_EPSTS0	0x60"
to reflect this change and to avoid future coding mistakes.

Signed-off-by: default avatarAl Cooper <alcooperx@gmail.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 73517cf4

drivers/usb/gadget/udc/bdc/bdc.h

+8 −8
Original line number Diff line number Diff line
@@ -83,14 +83,14 @@ 


#define BDC_DVCSA	0x50

#define BDC_DVCSB	0x54

#define BDC_EPSTS0(n)	(0x60 + (n * 0x10))

#define BDC_EPSTS1(n)	(0x64 + (n * 0x10))

#define BDC_EPSTS2(n)	(0x68 + (n * 0x10))

#define BDC_EPSTS3(n)	(0x6c + (n * 0x10))

#define BDC_EPSTS4(n)	(0x70 + (n * 0x10))

#define BDC_EPSTS5(n)	(0x74 + (n * 0x10))

#define BDC_EPSTS6(n)	(0x78 + (n * 0x10))

#define BDC_EPSTS7(n)	(0x7c + (n * 0x10))

#define BDC_EPSTS0	0x60

#define BDC_EPSTS1	0x64

#define BDC_EPSTS2	0x68

#define BDC_EPSTS3	0x6c

#define BDC_EPSTS4	0x70

#define BDC_EPSTS5	0x74

#define BDC_EPSTS6	0x78

#define BDC_EPSTS7	0x7c

#define BDC_SRRBAL(n)	(0x200 + (n * 0x10))

#define BDC_SRRBAH(n)	(0x204 + (n * 0x10))

#define BDC_SRRINT(n)	(0x208 + (n * 0x10))

drivers/usb/gadget/udc/bdc/bdc_dbg.c

+8 −8
Original line number Diff line number Diff line
@@ -40,28 +40,28 @@ void bdc_dump_epsts(struct bdc *bdc) 
{

	u32 temp;



	temp = bdc_readl(bdc->regs, BDC_EPSTS0(0));

	temp = bdc_readl(bdc->regs, BDC_EPSTS0);

	dev_vdbg(bdc->dev, "BDC_EPSTS0:0x%08x\n", temp);



	temp = bdc_readl(bdc->regs, BDC_EPSTS1(0));

	temp = bdc_readl(bdc->regs, BDC_EPSTS1);

	dev_vdbg(bdc->dev, "BDC_EPSTS1:0x%x\n", temp);



	temp = bdc_readl(bdc->regs, BDC_EPSTS2(0));

	temp = bdc_readl(bdc->regs, BDC_EPSTS2);

	dev_vdbg(bdc->dev, "BDC_EPSTS2:0x%08x\n", temp);



	temp = bdc_readl(bdc->regs, BDC_EPSTS3(0));

	temp = bdc_readl(bdc->regs, BDC_EPSTS3);

	dev_vdbg(bdc->dev, "BDC_EPSTS3:0x%08x\n", temp);



	temp = bdc_readl(bdc->regs, BDC_EPSTS4(0));

	temp = bdc_readl(bdc->regs, BDC_EPSTS4);

	dev_vdbg(bdc->dev, "BDC_EPSTS4:0x%08x\n", temp);



	temp = bdc_readl(bdc->regs, BDC_EPSTS5(0));

	temp = bdc_readl(bdc->regs, BDC_EPSTS5);

	dev_vdbg(bdc->dev, "BDC_EPSTS5:0x%08x\n", temp);



	temp = bdc_readl(bdc->regs, BDC_EPSTS6(0));

	temp = bdc_readl(bdc->regs, BDC_EPSTS6);

	dev_vdbg(bdc->dev, "BDC_EPSTS6:0x%08x\n", temp);



	temp = bdc_readl(bdc->regs, BDC_EPSTS7(0));

	temp = bdc_readl(bdc->regs, BDC_EPSTS7);

	dev_vdbg(bdc->dev, "BDC_EPSTS7:0x%08x\n", temp);

}

drivers/usb/gadget/udc/bdc/bdc_ep.c

+2 −2
Original line number Diff line number Diff line
@@ -777,9 +777,9 @@ static int ep_dequeue(struct bdc_ep *ep, struct bdc_req *req) 
	 */



	/* The current hw dequeue pointer */

	tmp_32 = bdc_readl(bdc->regs, BDC_EPSTS0(0));

	tmp_32 = bdc_readl(bdc->regs, BDC_EPSTS0);

	deq_ptr_64 = tmp_32;

	tmp_32 = bdc_readl(bdc->regs, BDC_EPSTS1(0));

	tmp_32 = bdc_readl(bdc->regs, BDC_EPSTS1);

	deq_ptr_64 |= ((u64)tmp_32 << 32);



	/* we have the dma addr of next bd that will be fetched by hardware */