From patchwork Wed Nov 14 09:11:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajeshwari Birje X-Patchwork-Id: 198836 X-Patchwork-Delegate: hs@denx.de 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 B0C012C0081 for ; Wed, 14 Nov 2012 20:10:27 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0BE0A4A0A2; Wed, 14 Nov 2012 10:10:26 +0100 (CET) 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 0aXUqrDvwbbH; Wed, 14 Nov 2012 10:10:25 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4758B4A03E; Wed, 14 Nov 2012 10:10:24 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4146D4A03E for ; Wed, 14 Nov 2012 10:10:22 +0100 (CET) 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 ASwZzvhGOfRG for ; Wed, 14 Nov 2012 10:10:18 +0100 (CET) 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 mailout1.samsung.com (mailout1.samsung.com [203.254.224.24]) by theia.denx.de (Postfix) with ESMTP id 1AAA84A019 for ; Wed, 14 Nov 2012 10:10:16 +0100 (CET) Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MDH00EZU03XBB10@mailout1.samsung.com> for u-boot@lists.denx.de; Wed, 14 Nov 2012 18:09:40 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.126]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 76.EC.12699.3DF53A05; Wed, 14 Nov 2012 18:09:40 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-1d-50a35fd3ec6d Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id F5.EC.12699.3DF53A05; Wed, 14 Nov 2012 18:09:39 +0900 (KST) Received: from rajeshwari-linux.sisodomain.com ([107.108.215.115]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MDG00I7CZWU0Z70@mmp2.samsung.com> for u-boot@lists.denx.de; Wed, 14 Nov 2012 18:09:39 +0900 (KST) From: Rajeshwari Shinde To: u-boot@lists.denx.de Date: Wed, 14 Nov 2012 14:41:18 +0530 Message-id: <1352884279-24067-6-git-send-email-rajeshwari.s@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1352884279-24067-1-git-send-email-rajeshwari.s@samsung.com> References: <1352884279-24067-1-git-send-email-rajeshwari.s@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrDLMWRmVeSWpSXmKPExsWyRsSkTvdK/OIAg9bLzBZv93ayOzB6nL2z gzGAMYrLJiU1J7MstUjfLoEr4+jGyILDahV/Fz5ga2B8ItfFyMkhIWAisXhaFzOELSZx4d56 ti5GLg4hgaWMEq+O72KHKerY95UFIjGdUeLxo19QVauYJF492M0GUsUmYCSx9eQ0RhBbREBC 4lf/VTCbWSBD4vaHJSwgtrCAtcSmyxPA4iwCqhJzn98H28Ar4CFx/9EtVohtChLHpn4FszkF PCX+P+gBs4WAaibv2M4G0Ssg8W3yIaCZHED1shKbDjCD3CMhcIZNor3hFBvEHEmJgytusExg FF7AyLCKUTS1ILmgOCk910ivODG3uDQvXS85P3cTIzAIT/97Jr2DcVWDxSFGAQ5GJR7egP5F AUKsiWXFlbmHGCU4mJVEeGOtFgcI8aYkVlalFuXHF5XmpBYfYvQBumQis5Rocj4wQvJK4g2N TcxNjU0tjYzMTE1xCCuJ8zZ7pAQICaQnlqRmp6YWpBbBjGPi4JRqYJT68WD6ZjPj6be2m6tX Mc/Ys23LFr8r4V8P5D6pb1vlYXJjd9sCpiUint37Z/jd5rqUe+5S64cbKjc6KjjfReuHLptl s6jWZp1x9rz9m9JLd55U+8VjzaxlaAuM16qt113ZtMxkeHJSTufvSOLYzpw2+378PC5/6e0T 5s63f5WcJn563eEGaSWW4oxEQy3mouJEAKEPINdvAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmkeLIzCtJLcpLzFFi42I5/e+xoO7l+MUBBvtP61m83dvJ7sDocfbO DsYAxqgGRpuM1MSU1CKF1Lzk/JTMvHRbJe/geOd4UzMDQ11DSwtzJYW8xNxUWyUXnwBdt8wc oLFKCmWJOaVAoYDE4mIlfTtME0JD3HQtYBojdH1DguB6jAzQQMIaxoyjGyMLDqtV/F34gK2B 8YlcFyMnh4SAiUTHvq8sELaYxIV769m6GLk4hASmM0o8fvQLylnFJPHqwW42kCo2ASOJrSen MYLYIgISEr/6r4LZzAIZErc/LAGbJCxgLbHp8gSwOIuAqsTc5/fZQWxeAQ+J+49usUJsU5A4 NvUrmM0p4Cnx/0EPmC0EVDN5x3a2CYy8CxgZVjGKphYkFxQnpeca6RUn5haX5qXrJefnbmIE h/gz6R2MqxosDjEKcDAq8fAG9C8KEGJNLCuuzD3EKMHBrCTCG2u1OECINyWxsiq1KD++qDQn tfgQow/QVROZpUST84Hxl1cSb2hsYm5qbGppYmFiZolDWEmct9kjJUBIID2xJDU7NbUgtQhm HBMHp1QDY5tr+Q33vokT39/pPr3VOOB/69mzvDtzYh7FFr+IUm9Plv3U9DcpbWHkgjizHpuO +Wo88fcSSiK1/XcsvbPwa223oPbRJ+nH1000XB0YNl8uuDph/imOmNwY5aP1lnM0Q32VQg7c Cma/5GjxIjc55vAdsQCF3647mmYosK2u4J5z+v21tfklSizFGYmGWsxFxYkAEfz2+p4CAAA= X-CFilter-Loop: Reflected Cc: hs@denx.de, patches@linaro.org Subject: [U-Boot] [PATCH 5/6 V2] I2C: Driver changes for FDT support 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 Functions added to get the I2C bus number and reset I2C bus using FDT node. Signed-off-by: Simon Glass Signed-off-by: Rajeshwari Shinde Reviewed-by: Heiko Schocher Acked-by: Heiko Schocher --- Changes in V2: - Added periph id to I2C bus structure. - Modified i2c_get_bus_num_fdt function to compare with node. - Board i2c init moved to driver in case of FDT. drivers/i2c/s3c24x0_i2c.c | 90 ++++++++++++++++++++++++++++++++++++++++++++- drivers/i2c/s3c24x0_i2c.h | 8 ++++ include/i2c.h | 26 +++++++++++++ 3 files changed, 123 insertions(+), 1 deletions(-) diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c index 9bc4c7f..840585d 100644 --- a/drivers/i2c/s3c24x0_i2c.c +++ b/drivers/i2c/s3c24x0_i2c.c @@ -27,9 +27,11 @@ */ #include +#include #ifdef CONFIG_EXYNOS5 #include #include +#include #else #include #endif @@ -60,7 +62,14 @@ #define I2C_TIMEOUT 1 /* 1 second */ -static unsigned int g_current_bus; /* Stores Current I2C Bus */ +/* + * For SPL boot some boards need i2c before SDRAM is initialised so force + * variables to live in SRAM + */ +static unsigned int g_current_bus __attribute__((section(".data"))); +static struct s3c24x0_i2c_bus i2c_bus[CONFIG_MAX_I2C_NUM] + __attribute__((section(".data"))); +static int i2c_busses __attribute__((section(".data"))); #ifndef CONFIG_EXYNOS5 static int GetI2CSDA(void) @@ -507,4 +516,83 @@ int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len) (i2c, I2C_WRITE, chip << 1, &xaddr[4 - alen], alen, buffer, len) != 0); } + +#ifdef CONFIG_OF_CONTROL +void board_i2c_init(const void *blob) +{ + + int node_list[CONFIG_MAX_I2C_NUM]; + int count, i; + + count = fdtdec_find_aliases_for_id(blob, "i2c", + COMPAT_SAMSUNG_S3C2440_I2C, node_list, + CONFIG_MAX_I2C_NUM); + for (i = 0; i < count; i++) { + struct s3c24x0_i2c_bus *bus; + int node = node_list[i]; + + if (node < 0) + continue; + bus = &i2c_bus[i]; + bus->regs = (struct s3c24x0_i2c *) + fdtdec_get_addr(blob, node, "reg"); + bus->id = (enum periph_id) + fdtdec_get_int(blob, node, "samsung,periph-id", -1); + bus->node = node; + bus->bus_num = i2c_busses++; + exynos_pinmux_config(bus->id, 0); + } + +} + +static struct s3c24x0_i2c_bus *get_bus(unsigned int bus_idx) +{ + if (bus_idx < i2c_busses) + return &i2c_bus[bus_idx]; + debug("Undefined bus: %d\n", bus_idx); + return NULL; +} + +int i2c_get_bus_num_fdt(const void *blob, int node) +{ + enum fdt_compat_id compat; + int i; + + compat = fdtdec_lookup(blob, node); + if (compat != COMPAT_SAMSUNG_S3C2440_I2C) { + debug("%s: Not a supported I2C node\n", __func__); + return -1; + } + for (i = 0; i < i2c_busses; i++) { + if (node == i2c_bus[i].node) + return i; + } + + debug("%s: Can't find any matched I2C bus\n", __func__); + return -1; +} + +int i2c_reset_port_fdt(const void *blob, int node) +{ + struct s3c24x0_i2c_bus *i2c; + + int bus; + + bus = i2c_get_bus_num_fdt(blob, node); + if (bus < 0) { + debug("could not get bus for node %d\n", node); + return -1; + } + i2c = get_bus(bus); + if (!i2c) { + debug("get_bus() failed for node node %d\n", node); + return -1; + } + + i2c_ch_init(i2c->regs, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); + + return 0; +} +#endif + #endif /* CONFIG_HARD_I2C */ diff --git a/drivers/i2c/s3c24x0_i2c.h b/drivers/i2c/s3c24x0_i2c.h index 2dd4b06..1243bf1 100644 --- a/drivers/i2c/s3c24x0_i2c.h +++ b/drivers/i2c/s3c24x0_i2c.h @@ -30,4 +30,12 @@ struct s3c24x0_i2c { u32 iicds; u32 iiclc; }; + +struct s3c24x0_i2c_bus { + int node; /* device tree node */ + int bus_num; /* i2c bus number */ + struct s3c24x0_i2c *regs; + enum periph_id id; +}; + #endif /* _S3C24X0_I2C_H */ diff --git a/include/i2c.h b/include/i2c.h index 16f099d..efb097f 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -262,4 +262,30 @@ extern int get_multi_scl_pin(void); extern int get_multi_sda_pin(void); extern int multi_i2c_init(void); #endif + +/** + * Get FDT values for i2c bus. + * + * @param blob Device tree blbo + * @return the number of I2C bus + */ +void board_i2c_init(const void *blob); + +/** + * Find the I2C bus number by given a FDT I2C node. + * + * @param blob Device tree blbo + * @param node FDT I2C node to find + * @return the number of I2C bus (zero based), or -1 on error + */ +int i2c_get_bus_num_fdt(const void *blob, int node); + +/** + * Reset the I2C bus represented by the given a FDT I2C node. + * + * @param blob Device tree blbo + * @param node FDT I2C node to find + * @return 0 if port was reset, -1 if not found + */ +int i2c_reset_port_fdt(const void *blob, int node); #endif /* _I2C_H_ */