From patchwork Sat Oct 8 10:07:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 118518 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id AF59BB70C5 for ; Sat, 8 Oct 2011 21:08:21 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BAF1E293C7; Sat, 8 Oct 2011 12:08:12 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Wj8oNSiQcgce; Sat, 8 Oct 2011 12:08:12 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4714D2931E; Sat, 8 Oct 2011 12:07:43 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DA440292AE for ; Sat, 8 Oct 2011 12:07:31 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1yCdjIJVuAyJ for ; Sat, 8 Oct 2011 12:07:29 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from smtpi4.ngi.it (smtpi4.ngi.it [88.149.128.104]) by theia.denx.de (Postfix) with ESMTP id 4F86429275 for ; Sat, 8 Oct 2011 12:07:28 +0200 (CEST) Received: from paperina.lan (unknown [88.149.182.160]) by smtpi4.ngi.it (Postfix) with ESMTP id CC8BF428DF; Sat, 8 Oct 2011 12:07:27 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by paperina.lan (Postfix) with ESMTP id AA096140A0DE; Sat, 8 Oct 2011 12:07:27 +0200 (CEST) Received: from paperina.lan ([127.0.0.1]) by localhost (paperina.lan [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id agKimVUajmqh; Sat, 8 Oct 2011 12:07:25 +0200 (CEST) Received: from papero.lan (papero.lan [192.168.2.105]) by paperina.lan (Postfix) with ESMTP id 06D62140A11E; Sat, 8 Oct 2011 12:07:20 +0200 (CEST) From: Stefano Babic To: u-boot@lists.denx.de Date: Sat, 8 Oct 2011 12:07:01 +0200 Message-Id: <1318068428-3453-5-git-send-email-sbabic@denx.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1318068428-3453-1-git-send-email-sbabic@denx.de> References: <1318068428-3453-1-git-send-email-sbabic@denx.de> Subject: [U-Boot] [PATCH 04/11] misc: pmic: addI2C support to pmic_fsl driver X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de 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 @@ -26,6 +26,7 @@ #include #include +#if defined(CONFIG_PMIC_SPI) static u32 pmic_spi_prepare_tx(u32 reg, u32 *val, u32 write) { if ((val == NULL) && (write)) @@ -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; + 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; }