Patchwork [U-Boot,V2] misc: pmic: fix regression in pmic_fsl.c (SPI)

login
register
mail settings
Submitter Helmut Raiger
Date Oct. 20, 2011, 6:28 a.m.
Message ID <1319092123-7836-1-git-send-email-helmut.raiger@hale.at>
Download mbox | patch
Permalink /patch/120727/
State Superseded
Headers show

Comments

Helmut Raiger - Oct. 20, 2011, 6:28 a.m.
This fixes write access to PMIC registers, the bug was
introduced partly in commit 64aac65099 and in commit c9fe76dd91.
It was tested on an i.mx31 with a mc13783.

Signed-off-by: Helmut Raiger <helmut.raiger@hale.at>
---
 V2: threw in the wrong readback line in V1

 drivers/misc/pmic_fsl.c |    5 +----
 drivers/misc/pmic_spi.c |    1 -
 2 files changed, 1 insertions(+), 5 deletions(-)

Patch

diff --git a/drivers/misc/pmic_fsl.c b/drivers/misc/pmic_fsl.c
index b6e809a..0ff75ed 100644
--- a/drivers/misc/pmic_fsl.c
+++ b/drivers/misc/pmic_fsl.c
@@ -29,10 +29,7 @@ 
 #if defined(CONFIG_PMIC_SPI)
 static u32 pmic_spi_prepare_tx(u32 reg, u32 *val, u32 write)
 {
-	if ((val == NULL) && (write))
-		return *val & ~(1 << 31);
-	else
-		return (write << 31) | (reg << 25) | (*val & 0x00FFFFFF);
+	return (write << 31) | (reg << 25) | (*val & 0x00FFFFFF);
 }
 #endif
 
diff --git a/drivers/misc/pmic_spi.c b/drivers/misc/pmic_spi.c
index ff35377..e772884 100644
--- a/drivers/misc/pmic_spi.c
+++ b/drivers/misc/pmic_spi.c
@@ -76,7 +76,6 @@  static u32 pmic_reg(struct pmic *p, u32 reg, u32 *val, u32 write)
 	}
 
 	if (write) {
-		pmic_tx = p->hw.spi.prepare_tx(0, NULL, write);
 		pmic_tx &= ~(1 << 31);
 		tmp = cpu_to_be32(pmic_tx);
 		if (spi_xfer(slave, pmic_spi_bitlen, &tmp, &pmic_rx,