From patchwork Fri Feb 15 06:34:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amar X-Patchwork-Id: 220655 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 466422C0077 for ; Fri, 15 Feb 2013 17:16:01 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E7F274A13C; Fri, 15 Feb 2013 07:15:51 +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 uA4wTAeyDWh7; Fri, 15 Feb 2013 07:15:51 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3349F4A1E3; Fri, 15 Feb 2013 07:14:54 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 954544A180 for ; Fri, 15 Feb 2013 07:14:37 +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 T2wZdC69GOnw for ; Fri, 15 Feb 2013 07:14:36 +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 C05A34A18E for ; Fri, 15 Feb 2013 07:14:14 +0100 (CET) Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MI800C0YZZ235K0@mailout1.samsung.com> for u-boot@lists.denx.de; Fri, 15 Feb 2013 15:14:13 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.122]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 52.68.06692.532DD115; Fri, 15 Feb 2013 15:14:13 +0900 (KST) X-AuditID: cbfee691-b7f556d000001a24-d7-511dd235c93f Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 53.63.03880.532DD115; Fri, 15 Feb 2013 15:14:13 +0900 (KST) Received: from chrome-ubuntu.sisodomain.com ([107.108.73.106]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MI8005Z0ZYZ7R20@mmp2.samsung.com> for u-boot@lists.denx.de; Fri, 15 Feb 2013 15:14:13 +0900 (KST) From: Amar To: u-boot@lists.denx.de Date: Fri, 15 Feb 2013 01:34:51 -0500 Message-id: <1360910091-6285-11-git-send-email-amarendra.xt@samsung.com> X-Mailer: git-send-email 1.8.0 In-reply-to: <1360910091-6285-1-git-send-email-amarendra.xt@samsung.com> References: <1360910091-6285-1-git-send-email-amarendra.xt@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrCLMWRmVeSWpSXmKPExsWyRsSkStf0kmygQcsHE4u3ezvZHRg9zt7Z wRjAGMVlk5Kak1mWWqRvl8CVMfvGHsaCC1wVWxdfZGpgvMDRxcjJISFgIvH+5QImCFtM4sK9 9WxdjFwcQgJLGSUW3D3GClP0ZfVjFhBbSGA6o8STrjyIomVMEs8XzgVKcHCwCahK/FpsD1Ij IiAh8av/KiNIDbNAB6PEjombGUESwgK+Eit/fmIGsVmA6ptf3mQD6eUV8JC4sboUYpecxIc9 j9hBbE6g8LnJr5kh9rpL7PzUATZTQuAym8TGN8/YIeYISHybfAjsBgkBWYlNB5gh5khKHFxx g2UCo/ACRoZVjKKpBckFxUnpRaZ6xYm5xaV56XrJ+bmbGIEhePrfs4k7GO8fsD7EmAw0biKz lGhyPjCE80riDY1NzE2NTc2MLC0tTUkTVhLnlb8kEygkkJ5YkpqdmlqQWhRfVJqTWnyIkYmD U6qBkTW58F5o79tXAoLOh31OBHAsu+55rTg7b1tLw++cTKuMFZHt3Y03LlhdX/zGnmtmosPh z0+K5p5u+mjh8OvjqvyVihV+cpt9J6V1LZEyO3VIMPfF1uZfy7f95ZCOF7Lq/GbHvKze0Xd/ rdSBk3/2SDj3C4Y8Piy7Vv9tzgrXjOi2WNvmqtVySizFGYmGWsxFxYkALge9XFcCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrIIsWRmVeSWpSXmKPExsVy+t9jQV3TS7KBBndv6Vi83dvJ7sDocfbO DsYAxqgGRpuM1MSU1CKF1Lzk/JTMvHRbJe/geOd4UzMDQ11DSwtzJYW8xNxUWyUXnwBdt8wc oLFKCmWJOaVAoYDE4mIlfTtME0JD3HQtYBojdH1DguB6jAzQQMIaxozZN/YwFlzgqti6+CJT A+MFji5GTg4JAROJL6sfs0DYYhIX7q1nA7GFBKYzSjzpyuti5AKylzFJPF84F6iIg4NNQFXi 12J7kBoRAQmJX/1XGUFqmAU6GCV2TNzMCJIQFvCVWPnzEzOIzQJU3/zyJhtIL6+Ah8SN1aUQ u+QkPux5xA5icwKFz01+zQyx111i56cOxgmMvAsYGVYxiqYWJBcUJ6XnGukVJ+YWl+al6yXn 525iBAf4M+kdjKsaLA4xCnAwKvHwCkjIBgqxJpYVV+YeYpTgYFYS4V0TAhTiTUmsrEotyo8v Ks1JLT7EmAx01ERmKdHkfGD05ZXEGxqbmJsam1qaWJiYWZImrCTOy3jqSYCQQHpiSWp2ampB ahHMFiYOTqkGxlIBx8zpTPd1luzdtPqdxf9p++fpLu72mhG37+Tjr5E/BYSu+CVPVsnR2exn xp4Q0HDEibNu+zI+s+hgP9dnMk4Xv/AVzubX09l7wY79zcXssG9btysypDYLGVb82Nd3JF85 58Vytr/XTCZfsJv5UGLXRxW/slgexz9bZOuZb0nNcVh09hpjnxJLcUaioRZzUXEiAIxOO3e0 AgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: patches@linaro.org, jh80.chung@samsung.com, afleming@gmail.com Subject: [U-Boot] [PATCH V6 10/10] EXYNOS5: I2C: Added FDT and non-FDT support for I2C 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 adds FDT and non-FDT support for I2C, and initialise the I2C channels. Signed-off-by: Amar Acked-by: Simon Glass --- Changes since V4: New patch. Changes since V5: 1)Removed the function call i2c_init() present inside the function board_i2c_init(). drivers/i2c/s3c24x0_i2c.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c index 769a2ba..5b4c3d2 100644 --- a/drivers/i2c/s3c24x0_i2c.c +++ b/drivers/i2c/s3c24x0_i2c.c @@ -524,11 +524,12 @@ int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len) len) != 0); } -#ifdef CONFIG_OF_CONTROL void board_i2c_init(const void *blob) { + int i; +#ifdef CONFIG_OF_CONTROL int node_list[CONFIG_MAX_I2C_NUM]; - int count, i; + int count; count = fdtdec_find_aliases_for_id(blob, "i2c", COMPAT_SAMSUNG_S3C2440_I2C, node_list, @@ -548,8 +549,15 @@ void board_i2c_init(const void *blob) bus->bus_num = i2c_busses++; exynos_pinmux_config(bus->id, 0); } +#else + for (i = 0; i < CONFIG_MAX_I2C_NUM; i++) { + exynos_pinmux_config((PERIPH_ID_I2C0 + i), + PINMUX_FLAG_NONE); + } +#endif } +#ifdef CONFIG_OF_CONTROL static struct s3c24x0_i2c_bus *get_bus(unsigned int bus_idx) { if (bus_idx < i2c_busses)