From patchwork Fri Nov 23 12:01:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajeshwari Birje X-Patchwork-Id: 201300 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 22DEE2C0081 for ; Fri, 23 Nov 2012 22:59:17 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8E4BB4A028; Fri, 23 Nov 2012 12:59:15 +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 WCU6gPtw+vpG; Fri, 23 Nov 2012 12:59:15 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E53024A01F; Fri, 23 Nov 2012 12:59:13 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A9EA94A01F for ; Fri, 23 Nov 2012 12:59:12 +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 3YX3cCU9vxkb for ; Fri, 23 Nov 2012 12:59:11 +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 mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by theia.denx.de (Postfix) with ESMTP id F0A994A01E for ; Fri, 23 Nov 2012 12:59:10 +0100 (CET) Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MDX00FTNVYKX810@mailout3.samsung.com> for u-boot@lists.denx.de; Fri, 23 Nov 2012 20:59:08 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.123]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 5B.50.12699.C056FA05; Fri, 23 Nov 2012 20:59:08 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-9d-50af650c89e4 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id EA.50.12699.C056FA05; Fri, 23 Nov 2012 20:59:08 +0900 (KST) Received: from rajeshwari-linux.sisodomain.com ([107.108.215.115]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MDX00GYHVRX36B0@mmp1.samsung.com> for u-boot@lists.denx.de; Fri, 23 Nov 2012 20:59:08 +0900 (KST) From: Rajeshwari Shinde To: u-boot@lists.denx.de Date: Fri, 23 Nov 2012 17:31:46 +0530 Message-id: <1353672107-12904-6-git-send-email-rajeshwari.s@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1353672107-12904-1-git-send-email-rajeshwari.s@samsung.com> References: <1353672107-12904-1-git-send-email-rajeshwari.s@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrDLMWRmVeSWpSXmKPExsWyRsSkWpcndX2Awb8DyhZv93ayOzB6nL2z gzGAMYrLJiU1J7MstUjfLoErY/bpmWwF7aoV92a9Zm1g3CrbxcjJISFgIrHl+DkmCFtM4sK9 9WxdjFwcQgJLGSXeHPnGAlP06fI2dojEIkaJPxOXQzmrmCQ2Xd7MCFLFJmAksfXkNDBbREBC 4lf/VTCbWcBLYtvp72ArhAWsJf5u+Ao2lUVAVWLyyy6wOK+Ah8SShrfsENsUJI5N/coKYnMK eErc2bEOKM4BtMxDovlgBUSrgMS3yYdYQMISArISmw4wg5wjIXCZTWL5jonMEGMkJQ6uuMEy gVF4ASPDKkbR1ILkguKk9FwjveLE3OLSvHS95PzcTYzAIDz975n0DsZVDRaHGAU4GJV4eA3L 1gUIsSaWFVfmHmKU4GBWEuEt91sfIMSbklhZlVqUH19UmpNafIjRB+iSicxSosn5wAjJK4k3 NDYxNzU2tTQyMjM1xSGsJM7b7JESICSQnliSmp2aWpBaBDOOiYNTqoExcILktmiWv619Zk/n SxUt2+myN4cvpfJbxOs9049td/x+r6HKdvOjYiOnOxulLZpm1xYHXP2SbyxRaaU3Obp9kvrv bYycphaPlTufaH0vvGag+qNDYG3CcsW7rxqb3v+d887jwR+/zBcdb8VStpS67/BP/+NyfW9q lEhyy5vn6nFLl/kotr5TYinOSDTUYi4qTgQAIpfVu28CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmkeLIzCtJLcpLzFFi42I5/e+xgC5P6voAg1mvBC3e7u1kd2D0OHtn B2MAY1QDo01GamJKapFCal5yfkpmXrqtkndwvHO8qZmBoa6hpYW5kkJeYm6qrZKLT4CuW2YO 0FglhbLEnFKgUEBicbGSvh2mCaEhbroWMI0Rur4hQXA9RgZoIGENY8bs0zPZCtpVK+7Nes3a wLhVtouRk0NCwETi0+Vt7BC2mMSFe+vZuhi5OIQEFjFK/Jm4nB3CWcUksenyZkaQKjYBI4mt J6eB2SICEhK/+q+C2cwCXhLbTn9nArGFBawl/m74ygJiswioSkx+2QUW5xXwkFjS8BZqm4LE salfWUFsTgFPiTs71gHFOYCWeUg0H6yYwMi7gJFhFaNoakFyQXFSeq6RXnFibnFpXrpecn7u JkZwiD+T3sG4qsHiEKMAB6MSD69h2boAIdbEsuLK3EOMEhzMSiK85X7rA4R4UxIrq1KL8uOL SnNSiw8x+gAdNZFZSjQ5Hxh/eSXxhsYm5qbGppYmFiZmljiElcR5mz1SAoQE0hNLUrNTUwtS i2DGMXFwSjUw6nT1XVf9K6ll9obVxNkrY0/K2aNzOXSXvb9Z4Ob/zkPkXlb0rRvm/t9PSuX+ bH3yr/lL3oEkJ7e9iaUGNxpmqkUwfEtYVaYS3vNN7HpIj/8jPZekgPwzuXKF69Nu6LF27OLV 9zpXJBv+zl/GSPWm39TNoQ+XHnr1OzL5x8OrVnbB+htiGW4osRRnJBpqMRcVJwIABwDd2Z4C AAA= X-CFilter-Loop: Reflected Cc: hs@denx.de, patches@linaro.org Subject: [U-Boot] [PATCH 5/6 V3] 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: Rajeshwari Shinde Acked-by: Simon Glass --- 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. Chnages in V3: - peripheral id decoded based on interrupts. - removed compat id check in i2c_get_bus_num_fdt. drivers/i2c/s3c24x0_i2c.c | 83 ++++++++++++++++++++++++++++++++++++++++++++- drivers/i2c/s3c24x0_i2c.h | 8 ++++ include/i2c.h | 26 ++++++++++++++ 3 files changed, 116 insertions(+), 1 deletions(-) diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c index 9bc4c7f..c270ff0 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,76 @@ 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 = decode_periph_id(blob, node); + 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(int node) +{ + int i; + + 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(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..c60d075 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(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_ */