Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
usb
/
musb
/
musb_regs.h
diff --git
a/kernel/drivers/usb/musb/musb_regs.h
b/kernel/drivers/usb/musb/musb_regs.h
index
11f0be0
..
cff5bcf
100644
(file)
--- a/
kernel/drivers/usb/musb/musb_regs.h
+++ b/
kernel/drivers/usb/musb/musb_regs.h
@@
-300,9
+300,6
@@
#define MUSB_RXHUBADDR 0x06
#define MUSB_RXHUBPORT 0x07
#define MUSB_RXHUBADDR 0x06
#define MUSB_RXHUBPORT 0x07
-#define MUSB_BUSCTL_OFFSET(_epnum, _offset) \
- (0x80 + (8*(_epnum)) + (_offset))
-
static inline void musb_write_txfifosz(void __iomem *mbase, u8 c_size)
{
musb_writeb(mbase, MUSB_TXFIFOSZ, c_size);
static inline void musb_write_txfifosz(void __iomem *mbase, u8 c_size)
{
musb_writeb(mbase, MUSB_TXFIFOSZ, c_size);
@@
-364,78
+361,84
@@
static inline u16 musb_read_hwvers(void __iomem *mbase)
return musb_readw(mbase, MUSB_HWVERS);
}
return musb_readw(mbase, MUSB_HWVERS);
}
-static inline void __iomem *musb_read_target_reg_base(u8 i, void __iomem *mbase)
-{
- return (MUSB_BUSCTL_OFFSET(i, 0) + mbase);
-}
-
-static inline void musb_write_rxfunaddr(void __iomem *ep_target_regs,
+static inline void musb_write_rxfunaddr(struct musb *musb, u8 epnum,
u8 qh_addr_reg)
{
u8 qh_addr_reg)
{
- musb_writeb(ep_target_regs, MUSB_RXFUNCADDR, qh_addr_reg);
+ musb_writeb(musb->mregs,
+ musb->io.busctl_offset(epnum, MUSB_RXFUNCADDR),
+ qh_addr_reg);
}
}
-static inline void musb_write_rxhubaddr(
void __iomem *ep_target_regs
,
+static inline void musb_write_rxhubaddr(
struct musb *musb, u8 epnum
,
u8 qh_h_addr_reg)
{
u8 qh_h_addr_reg)
{
- musb_writeb(ep_target_regs, MUSB_RXHUBADDR, qh_h_addr_reg);
+ musb_writeb(musb->mregs, musb->io.busctl_offset(epnum, MUSB_RXHUBADDR),
+ qh_h_addr_reg);
}
}
-static inline void musb_write_rxhubport(
void __iomem *ep_target_regs
,
+static inline void musb_write_rxhubport(
struct musb *musb, u8 epnum
,
u8 qh_h_port_reg)
{
u8 qh_h_port_reg)
{
- musb_writeb(ep_target_regs, MUSB_RXHUBPORT, qh_h_port_reg);
+ musb_writeb(musb->mregs, musb->io.busctl_offset(epnum, MUSB_RXHUBPORT),
+ qh_h_port_reg);
}
}
-static inline void
musb_write_txfunaddr(void __iomem *mbase
, u8 epnum,
+static inline void
musb_write_txfunaddr(struct musb *musb
, u8 epnum,
u8 qh_addr_reg)
{
u8 qh_addr_reg)
{
- musb_writeb(mbase, MUSB_BUSCTL_OFFSET(epnum, MUSB_TXFUNCADDR),
- qh_addr_reg);
+ musb_writeb(musb->mregs,
+ musb->io.busctl_offset(epnum, MUSB_TXFUNCADDR),
+ qh_addr_reg);
}
}
-static inline void
musb_write_txhubaddr(void __iomem *mbase
, u8 epnum,
+static inline void
musb_write_txhubaddr(struct musb *musb
, u8 epnum,
u8 qh_addr_reg)
{
u8 qh_addr_reg)
{
- musb_writeb(m
base, MUSB_BUSCTL_OFFSET
(epnum, MUSB_TXHUBADDR),
+ musb_writeb(m
usb->mregs, musb->io.busctl_offset
(epnum, MUSB_TXHUBADDR),
qh_addr_reg);
}
qh_addr_reg);
}
-static inline void
musb_write_txhubport(void __iomem *mbase
, u8 epnum,
+static inline void
musb_write_txhubport(struct musb *musb
, u8 epnum,
u8 qh_h_port_reg)
{
u8 qh_h_port_reg)
{
- musb_writeb(m
base, MUSB_BUSCTL_OFFSET
(epnum, MUSB_TXHUBPORT),
+ musb_writeb(m
usb->mregs, musb->io.busctl_offset
(epnum, MUSB_TXHUBPORT),
qh_h_port_reg);
}
qh_h_port_reg);
}
-static inline u8 musb_read_rxfunaddr(
void __iomem *mbase
, u8 epnum)
+static inline u8 musb_read_rxfunaddr(
struct musb *musb
, u8 epnum)
{
{
- return musb_readb(mbase, MUSB_BUSCTL_OFFSET(epnum, MUSB_RXFUNCADDR));
+ return musb_readb(musb->mregs,
+ musb->io.busctl_offset(epnum, MUSB_RXFUNCADDR));
}
}
-static inline u8 musb_read_rxhubaddr(
void __iomem *mbase
, u8 epnum)
+static inline u8 musb_read_rxhubaddr(
struct musb *musb
, u8 epnum)
{
{
- return musb_readb(mbase, MUSB_BUSCTL_OFFSET(epnum, MUSB_RXHUBADDR));
+ return musb_readb(musb->mregs,
+ musb->io.busctl_offset(epnum, MUSB_RXHUBADDR));
}
}
-static inline u8 musb_read_rxhubport(
void __iomem *mbase
, u8 epnum)
+static inline u8 musb_read_rxhubport(
struct musb *musb
, u8 epnum)
{
{
- return musb_readb(mbase, MUSB_BUSCTL_OFFSET(epnum, MUSB_RXHUBPORT));
+ return musb_readb(musb->mregs,
+ musb->io.busctl_offset(epnum, MUSB_RXHUBPORT));
}
}
-static inline u8
musb_read_txfunaddr(void __iomem *mbase
, u8 epnum)
+static inline u8
musb_read_txfunaddr(struct musb *musb
, u8 epnum)
{
{
- return musb_readb(mbase, MUSB_BUSCTL_OFFSET(epnum, MUSB_TXFUNCADDR));
+ return musb_readb(musb->mregs,
+ musb->io.busctl_offset(epnum, MUSB_TXFUNCADDR));
}
}
-static inline u8
musb_read_txhubaddr(void __iomem *mbase
, u8 epnum)
+static inline u8
musb_read_txhubaddr(struct musb *musb
, u8 epnum)
{
{
- return musb_readb(mbase, MUSB_BUSCTL_OFFSET(epnum, MUSB_TXHUBADDR));
+ return musb_readb(musb->mregs,
+ musb->io.busctl_offset(epnum, MUSB_TXHUBADDR));
}
}
-static inline u8
musb_read_txhubport(void __iomem *mbase
, u8 epnum)
+static inline u8
musb_read_txhubport(struct musb *musb
, u8 epnum)
{
{
- return musb_readb(mbase, MUSB_BUSCTL_OFFSET(epnum, MUSB_TXHUBPORT));
+ return musb_readb(musb->mregs,
+ musb->io.busctl_offset(epnum, MUSB_TXHUBPORT));
}
#else /* CONFIG_BLACKFIN */
}
#else /* CONFIG_BLACKFIN */
@@
-556,22
+559,17
@@
static inline u16 musb_read_hwvers(void __iomem *mbase)
return MUSB_HWVERS_1900;
}
return MUSB_HWVERS_1900;
}
-static inline void __iomem *musb_read_target_reg_base(u8 i, void __iomem *mbase)
-{
- return NULL;
-}
-
-static inline void musb_write_rxfunaddr(void __iomem *ep_target_regs,
+static inline void musb_write_rxfunaddr(void __iomem *mbase, u8 epnum,
u8 qh_addr_req)
{
}
u8 qh_addr_req)
{
}
-static inline void musb_write_rxhubaddr(void __iomem *
ep_target_regs
,
+static inline void musb_write_rxhubaddr(void __iomem *
mbase, u8 epnum
,
u8 qh_h_addr_reg)
{
}
u8 qh_h_addr_reg)
{
}
-static inline void musb_write_rxhubport(void __iomem *
ep_target_regs
,
+static inline void musb_write_rxhubport(void __iomem *
mbase, u8 epnum
,
u8 qh_h_port_reg)
{
}
u8 qh_h_port_reg)
{
}