summaryrefslogtreecommitdiff
path: root/drivers/misc
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2011-10-06 21:06:39 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-10-27 21:56:31 +0200
commitb7b7d3ccfd16c5b500ea4c1257269a42aaaeac84 (patch)
tree754d3baaf0cb8ae0403d204a99b4dd730b3e7c5f /drivers/misc
parentd69edadee7035a5607451a3ee014f4e649e8cf92 (diff)
misc: pmic: addI2C support to pmic_fsl driver
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/pmic_fsl.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/drivers/misc/pmic_fsl.c b/drivers/misc/pmic_fsl.c
index 13dde47fc86..b6e809a1886 100644
--- a/drivers/misc/pmic_fsl.c
+++ b/drivers/misc/pmic_fsl.c
@@ -26,6 +26,7 @@
#include <pmic.h>
#include <fsl_pmic.h>
+#if defined(CONFIG_PMIC_SPI)
static u32 pmic_spi_prepare_tx(u32 reg, u32 *val, u32 write)
{
if ((val == NULL) && (write))
@@ -33,25 +34,33 @@ static u32 pmic_spi_prepare_tx(u32 reg, u32 *val, u32 write)
else
return (write << 31) | (reg << 25) | (*val & 0x00FFFFFF);
}
+#endif
int pmic_init(void)
{
struct pmic *p = get_pmic();
static const char name[] = "FSL_PMIC";
- puts("Board PMIC init\n");
-
p->name = name;
- p->interface = PMIC_SPI;
p->number_of_regs = PMIC_NUM_OF_REGS;
- p->bus = CONFIG_FSL_PMIC_BUS;
+#if defined(CONFIG_PMIC_SPI)
+ p->interface = PMIC_SPI;
+ p->bus = CONFIG_FSL_PMIC_BUS;
p->hw.spi.cs = CONFIG_FSL_PMIC_CS;
p->hw.spi.clk = CONFIG_FSL_PMIC_CLK;
p->hw.spi.mode = CONFIG_FSL_PMIC_MODE;
p->hw.spi.bitlen = CONFIG_FSL_PMIC_BITLEN;
p->hw.spi.flags = SPI_XFER_BEGIN | SPI_XFER_END;
p->hw.spi.prepare_tx = pmic_spi_prepare_tx;
+#elif defined(CONFIG_PMIC_I2C)
+ p->interface = PMIC_I2C;
+ p->hw.i2c.addr = CONFIG_SYS_FSL_PMIC_I2C_ADDR;
+ p->hw.i2c.tx_num = 3;
+ p->bus = I2C_PMIC;
+#else
+#error "You must select CONFIG_PMIC_SPI or CONFIG_PMIC_I2C"
+#endif
return 0;
}