From patchwork Fri May 17 12:55:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Piotr Wilczek X-Patchwork-Id: 244637 X-Patchwork-Delegate: promsoft@gmail.com 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 2856B2C009E for ; Fri, 17 May 2013 22:57:46 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DF5254A0F1; Fri, 17 May 2013 14:57:44 +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 4cnXoP9kOfH9; Fri, 17 May 2013 14:57:44 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B8E444A11C; Fri, 17 May 2013 14:57:23 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 742064A0F3 for ; Fri, 17 May 2013 14:57:21 +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 ZMOuIhGRe97Y for ; Fri, 17 May 2013 14:57:20 +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 mailout2.samsung.com (mailout2.samsung.com [203.254.224.25]) by theia.denx.de (Postfix) with ESMTP id 7FA914A0BE for ; Fri, 17 May 2013 14:57:11 +0200 (CEST) Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MMY0058X1AWOC10@mailout2.samsung.com> for u-boot@lists.denx.de; Fri, 17 May 2013 21:57:10 +0900 (KST) X-AuditID: cbfee61b-b7f0d6d00000450a-6e-519629261f4f Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 9C.66.17674.62926915; Fri, 17 May 2013 21:57:10 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MMY00JBP199NY80@mmp1.samsung.com>; Fri, 17 May 2013 21:57:10 +0900 (KST) From: Piotr Wilczek To: u-boot@lists.denx.de Date: Fri, 17 May 2013 14:55:49 +0200 Message-id: <1368795355-6717-7-git-send-email-p.wilczek@samsung.com> X-Mailer: git-send-email 1.7.10 In-reply-to: <1368795355-6717-1-git-send-email-p.wilczek@samsung.com> References: <1368795355-6717-1-git-send-email-p.wilczek@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDJMWRmVeSWpSXmKPExsVy+t9jAV01zWmBBhfWC1qcbXrDbvHm4WZG i44jLYwW656sZbV4u7eT3YHV4+ydHYwefVtWMQYwRXHZpKTmZJalFunbJXBlrOqwKtjBXtHw p5G1gXECWxcjJ4eEgIlE98O7TBC2mMSFe+uB4lwcQgKLGCXapy6DcrqYJH5tOscIUsUmoC2x /M0bMFtEQELiV/9VRpAiZoFljBINDb/ZQRLCAiESx/sPgdksAqoSfV/Ogdm8Ai4Sq+ddYodY Jy/x9H4f2BmcAq4Sn45OZQGxhYBqpty8wz6BkXcBI8MqRtHUguSC4qT0XCO94sTc4tK8dL3k /NxNjOAweSa9g3FVg8UhRgEORiUeXoWfUwKFWBPLiitzDzFKcDArifAe/zg1UIg3JbGyKrUo P76oNCe1+BCjNAeLkjjvwVbrQCGB9MSS1OzU1ILUIpgsEwenVAPjtiP7uab68qZmZ7z4ZcKq +fey1sOgFxL/umLF/QKmXZ1RnxR2wvj56gNrk6WuTM1I3+x0wLD+pLsmu8yz3Tq/QpLdrDdr F8RvnbSu4ofPgQ7z6cWGE+cVP3GoXPBvf838g9zKfaLcc8Un279Me5B+bmtszrLXnwVfFi2t XHD0T8eXW+J3vGX6lFiKMxINtZiLihMB5+zQZQ8CAAA= Cc: Piotr Wilczek , Kyungmin Park Subject: [U-Boot] [PATCH v3 06/12] drivers:power:power_i2c: adapt file to new i2c framework X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 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 This patch repalce I2C_SET_BUS macro with i2c_set_bus_num() finction. Signed-off-by: Piotr Wilczek Signed-off-by: Kyungmin Park --- Changes in v3: - new patch Changes in v2: None drivers/power/power_i2c.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/power/power_i2c.c b/drivers/power/power_i2c.c index 3e5a784..e0f2092 100644 --- a/drivers/power/power_i2c.c +++ b/drivers/power/power_i2c.c @@ -114,7 +114,13 @@ int pmic_reg_read(struct pmic *p, u32 reg, u32 *val) int pmic_probe(struct pmic *p) { + /* this #ifdef should go away when all i2c drivers */ + /* are adapted to the new i2c framework */ +#ifdef CONFIG_SYS_I2C + i2c_set_bus_num(p->bus); +#else I2C_SET_BUS(p->bus); +#endif debug("Bus: %d PMIC:%s probed!\n", p->bus, p->name); if (i2c_probe(pmic_i2c_addr)) { printf("Can't find PMIC:%s\n", p->name);