From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergei Shtylyov Date: Sat, 08 Oct 2011 17:57:41 +0400 Subject: [U-Boot] [PATCH 04/11] misc: pmic: addI2C support to pmic_fsl driver In-Reply-To: <1318068428-3453-5-git-send-email-sbabic@denx.de> References: <1318068428-3453-1-git-send-email-sbabic@denx.de> <1318068428-3453-5-git-send-email-sbabic@denx.de> Message-ID: <4E9056D5.4040800@mvista.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello. On 08-10-2011 14:07, Stefano Babic wrote: > Signed-off-by: Stefano Babic > --- > drivers/misc/pmic_fsl.c | 18 ++++++++++++++---- > 1 files changed, 14 insertions(+), 4 deletions(-) > diff --git a/drivers/misc/pmic_fsl.c b/drivers/misc/pmic_fsl.c > index 13dde47..2945dfb 100644 > --- a/drivers/misc/pmic_fsl.c > +++ b/drivers/misc/pmic_fsl.c [...] > @@ -33,25 +34,34 @@ 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_SPI; > + p->interface = PMIC_I2C; You assign one value and immediately assign the other. First assignment shouldn't be here. WBR, Sergei