From patchwork Thu Nov 8 05:30:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajeshwari Birje X-Patchwork-Id: 197759 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 794DF2C00D7 for ; Thu, 8 Nov 2012 16:28:59 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3218C4A776; Thu, 8 Nov 2012 06:28:57 +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 KZLDXju7Fsrb; Thu, 8 Nov 2012 06:28:56 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CFDA54A83C; Thu, 8 Nov 2012 06:28:55 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9D6B04A83C for ; Thu, 8 Nov 2012 06:28:54 +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 giHCY8XsXtbw for ; Thu, 8 Nov 2012 06:28:53 +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 mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by theia.denx.de (Postfix) with ESMTP id D73EC4A776 for ; Thu, 8 Nov 2012 06:28:52 +0100 (CET) Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MD5000OILVR7AL0@mailout4.samsung.com> for u-boot@lists.denx.de; Thu, 08 Nov 2012 14:28:45 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.126]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id F7.D0.12699.D034B905; Thu, 08 Nov 2012 14:28:45 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-9e-509b430d30d9 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 77.D0.12699.D034B905; Thu, 08 Nov 2012 14:28:45 +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 <0MD500D18LOC2U10@mmp2.samsung.com> for u-boot@lists.denx.de; Thu, 08 Nov 2012 14:28:45 +0900 (KST) From: Rajeshwari Shinde To: u-boot@lists.denx.de Date: Thu, 08 Nov 2012 11:00:02 +0530 Message-id: <1352352603-17114-6-git-send-email-rajeshwari.s@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1352352603-17114-1-git-send-email-rajeshwari.s@samsung.com> References: <1352352603-17114-1-git-send-email-rajeshwari.s@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrNLMWRmVeSWpSXmKPExsWyRsSkTpfXeXaAwcsWOYu3ezvZHRg9zt7Z wRjAGMVlk5Kak1mWWqRvl8CV8XrOR7aC4yoVf5/uY2lgnCfbxcjJISFgIvFzwQ1WCFtM4sK9 9WxdjFwcQgJLGSUm9D9ihik6OamPGSIxnVGi/VA3C4SzikliH9AukCo2ASOJrSengdkiAhIS v/qvgtnMAhkStz8sYQGxhQUsJM686GHvYuTgYBFQlTg2URPE5BXwkNiwTQNil4LEsalfwQ7i FPCUWPfxO9gUIaCSX/sns4PYLAICEt8mH2IBaZUQkJXYdADsNAmBy2wSN6ftZ4SYIylxcMUN lgmMwgsYGVYxiqYWJBcUJ6XnGukVJ+YWl+al6yXn525iBIbg6X/PpHcwrmqwOMQowMGoxMOr ITk7QIg1say4MvcQowQHs5II75QjswKEeFMSK6tSi/Lji0pzUosPMfoAXTKRWUo0OR8YH3kl 8YbGJuamxqaWRkZmpqY4hJXEeZs9UgKEBNITS1KzU1MLUotgxjFxcEo1MG5e0uDznW3apkms FbcKWG0+/vhitVGz0s+c+zfH50uPmiq9zl1hn7HpXZxF8b0T93iKp73Q+199KChpzSshkwk3 z3g+mymj/PbLvhUF+//8u7nRSiWm7tD6vfnTX9TYLD/7ZZXpr7nbPPuOey1JOxbZ4D79Xrng 49MFrQV/mZ4eWbf14Ln/smVTlFiKMxINtZiLihMBTu74Jm4CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupikeLIzCtJLcpLzFFi42I5/e+xoC6v8+wAg9ZJghZv93ayOzB6nL2z gzGAMaqB0SYjNTEltUghNS85PyUzL91WyTs43jne1MzAUNfQ0sJcSSEvMTfVVsnFJ0DXLTMH aKySQlliTilQKCCxuFhJ3w7ThNAQN10LmMYIXd+QILgeIwM0kLCGMeP1nI9sBcdVKv4+3cfS wDhPtouRk0NCwETi5KQ+ZghbTOLCvfVsXYxcHEIC0xkl2g91s0A4q5gk9gG9AlLFJmAksfXk NDBbREBC4lf/VTCbWSBD4vaHJSwgtrCAhcSZFz3sXYwcHCwCqhLHJmqCmLwCHhIbtmlA7FKQ ODb1KyuIzSngKbHu43ewKUJAJb/2T2afwMi7gJFhFaNoakFyQXFSeq6RXnFibnFpXrpecn7u JkZwgD+T3sG4qsHiEKMAB6MSD6+G5OwAIdbEsuLK3EOMEhzMSiK8U47MChDiTUmsrEotyo8v Ks1JLT7E6AN000RmKdHkfGD05ZXEGxqbmJsam1qaWJiYWeIQVhLnbfZICRASSE8sSc1OTS1I LYIZx8TBKdXAaC85ycte67hLl8QRfdYP7Ycmqj+9VGXwljPnpvdMTg3VxFqmmPPvjhbyMiUt 33mGoXDKstjo1DcbAiYcVZN+p++cX3nSfp8/f31loKucm73Z/08+Mwt4uS6c23dz74brdSeD 14RcO/F846Ev9z9MyHeq1DvbK2Riky37zOlH+DeXYxuuXfiySYmlOCPRUIu5qDgRALRADbCd AgAA X-CFilter-Loop: Reflected Cc: hs@denx.de, patches@linaro.org Subject: [U-Boot] [PATCH 5/6] 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 --- drivers/i2c/s3c24x0_i2c.c | 89 ++++++++++++++++++++++++++++++++++++++++++++- drivers/i2c/s3c24x0_i2c.h | 7 ++++ include/i2c.h | 28 ++++++++++++++ 3 files changed, 123 insertions(+), 1 deletions(-) diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c index 9bc4c7f..952f76c 100644 --- a/drivers/i2c/s3c24x0_i2c.c +++ b/drivers/i2c/s3c24x0_i2c.c @@ -27,6 +27,7 @@ */ #include +#include #ifdef CONFIG_EXYNOS5 #include #include @@ -60,7 +61,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 +515,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 +unsigned int i2c_fdt_bus_values(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->node = node; + bus->bus_num = i2c_busses++; + } + + return count; +} + +static struct s3c24x0_i2c_bus *get_bus(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; + fdt_addr_t reg; + int i; + + compat = fdtdec_lookup(blob, node); + if (compat != COMPAT_SAMSUNG_S3C2440_I2C) { + debug("%s: Not a supported I2C node\n", __func__); + return -1; + } + reg = fdtdec_get_addr(blob, node, "reg"); + for (i = 0; i < i2c_busses; i++) { + if (reg == (fdt_addr_t)(uintptr_t)i2c_bus[i].regs) + 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..bdd5514 100644 --- a/drivers/i2c/s3c24x0_i2c.h +++ b/drivers/i2c/s3c24x0_i2c.h @@ -30,4 +30,11 @@ 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; +}; + #endif /* _S3C24X0_I2C_H */ diff --git a/include/i2c.h b/include/i2c.h index 16f099d..52be093 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -262,4 +262,32 @@ extern int get_multi_scl_pin(void); extern int get_multi_sda_pin(void); extern int multi_i2c_init(void); #endif + +#ifdef CONFIG_OF_CONTROL +/** + * Get FDT values for i2c bus. + * + * @param blob Device tree blbo + * @return the number of I2C bus + */ +unsigned int i2c_fdt_bus_values(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 #endif /* _I2C_H_ */