lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

firewire: ohci: add a function for reading PHY registers

Browse Source 
Move the register reading code from ohci_update_phy_reg() into
a function which can be used separately.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Clemens Ladisch
2010-04-04 15:19:52 +02:00
committed by Stefan Richter
parent ca658b1e29
commit 4a96b4fcd6
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/firewire/ohci.c
View File

@@ -460,22 +460,36 @@ static inline void flush_writes(const struct fw_ohci *ohci)
reg_read(ohci, OHCI1394_Version); reg_read(ohci, OHCI1394_Version);
} }
static int ohci_update_phy_reg(struct fw_card *card, int addr, static int read_phy_reg(struct fw_card *card, int addr, u32 *value)
int clear_bits, int set_bits)
{ {
struct fw_ohci *ohci = fw_ohci(card); struct fw_ohci *ohci = fw_ohci(card);
u32 val, old; u32 val;
reg_write(ohci, OHCI1394_PhyControl, OHCI1394_PhyControl_Read(addr)); reg_write(ohci, OHCI1394_PhyControl, OHCI1394_PhyControl_Read(addr));
flush_writes(ohci); flush_writes(ohci);
msleep(2); msleep(2);
val = reg_read(ohci, OHCI1394_PhyControl); val = reg_read(ohci, OHCI1394_PhyControl);
if ((val & OHCI1394_PhyControl_ReadDone) == 0) { if ((val & OHCI1394_PhyControl_ReadDone) == 0) {
fw_error("failed to set phy reg bits.\n"); fw_error("failed to read phy reg bits\n");
return -EBUSY; return -EBUSY;
} }
old = OHCI1394_PhyControl_ReadData(val); *value = OHCI1394_PhyControl_ReadData(val);
return 0;
}
static int ohci_update_phy_reg(struct fw_card *card, int addr,
int clear_bits, int set_bits)
{
struct fw_ohci *ohci = fw_ohci(card);
u32 old;
int err;
err = read_phy_reg(card, addr, &old);
if (err < 0)
return err;
old = (old & ~clear_bits) | set_bits; old = (old & ~clear_bits) | set_bits;
reg_write(ohci, OHCI1394_PhyControl, reg_write(ohci, OHCI1394_PhyControl,
OHCI1394_PhyControl_Write(addr, old)); OHCI1394_PhyControl_Write(addr, old));