V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

power_spi.c: Rewrite pmic_reg function 

The pmic_spi_free function isn't ever used, and as the frameworks stand
today, cannot be, so remove it.  Integrate the probe function into
pmic_reg as it's not really a "probe" today.  Finally, add an err label
for the common failure cases.

Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Stefano Babic <sbabic@denx.de>
Signed-off-by: Tom Rini <trini@ti.com>
Acked-by: Stefano Babic <sbabic@denx.de>
This commit is contained in:
Tom Rini 2014-10-25 07:38:31 -04:00
parent c6150aaf2f
commit 5b471dee99
1 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/power/power_spi.c
View File

@ -17,27 +17,14 @@
static struct spi_slave *slave; static struct spi_slave *slave;
void pmic_spi_free(struct spi_slave *slave)
{
if (slave)
spi_free_slave(slave);
}
struct spi_slave *pmic_spi_probe(struct pmic *p)
{
return spi_setup_slave(p->bus,
p->hw.spi.cs,
p->hw.spi.clk,
p->hw.spi.mode);
}
static u32 pmic_reg(struct pmic *p, u32 reg, u32 *val, u32 write) static u32 pmic_reg(struct pmic *p, u32 reg, u32 *val, u32 write)
{ {
u32 pmic_tx, pmic_rx; u32 pmic_tx, pmic_rx;
u32 tmp; u32 tmp;
if (!slave) { if (!slave) {
slave = pmic_spi_probe(p); slave = spi_setup_slave(p->bus, p->hw.spi.cs, p->hw.spi.clk,
p->hw.spi.mode);
if (!slave) if (!slave)
return -1; return -1;
@ -54,25 +41,25 @@ static u32 pmic_reg(struct pmic *p, u32 reg, u32 *val, u32 write)
tmp = cpu_to_be32(pmic_tx); tmp = cpu_to_be32(pmic_tx);
if (spi_xfer(slave, pmic_spi_bitlen, &tmp, &pmic_rx, if (spi_xfer(slave, pmic_spi_bitlen, &tmp, &pmic_rx,
pmic_spi_flags)) { pmic_spi_flags))
spi_release_bus(slave); goto err;
return -1;
}
if (write) { if (write) {
pmic_tx = p->hw.spi.prepare_tx(reg, val, 0); pmic_tx = p->hw.spi.prepare_tx(reg, val, 0);
tmp = cpu_to_be32(pmic_tx); tmp = cpu_to_be32(pmic_tx);
if (spi_xfer(slave, pmic_spi_bitlen, &tmp, &pmic_rx, if (spi_xfer(slave, pmic_spi_bitlen, &tmp, &pmic_rx,
pmic_spi_flags)) { pmic_spi_flags))
spi_release_bus(slave); goto err;
return -1;
}
} }
spi_release_bus(slave); spi_release_bus(slave);
*val = cpu_to_be32(pmic_rx); *val = cpu_to_be32(pmic_rx);
return 0; return 0;
err:
spi_release_bus(slave);
return -1;
} }
int pmic_reg_write(struct pmic *p, u32 reg, u32 val) int pmic_reg_write(struct pmic *p, u32 reg, u32 val)