From patchwork Tue Jul 9 14:05:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amar X-Patchwork-Id: 257717 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 E636F2C0095 for ; Wed, 10 Jul 2013 00:02:32 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 48E334A0EF; Tue, 9 Jul 2013 16:02:30 +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 PMW3MWDf4gwV; Tue, 9 Jul 2013 16:02:30 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 544044A0F2; Tue, 9 Jul 2013 16:02:25 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6F2764A0F2 for ; Tue, 9 Jul 2013 16:02:19 +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 EQywTaqlaBm3 for ; Tue, 9 Jul 2013 16:02:12 +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 mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by theia.denx.de (Postfix) with ESMTP id 6E8E94A0EF for ; Tue, 9 Jul 2013 16:02:07 +0200 (CEST) Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MPO002X69NFLZN0@mailout4.samsung.com> for u-boot@lists.denx.de; Tue, 09 Jul 2013 23:02:03 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.124]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 7A.86.29708.BD71CD15; Tue, 09 Jul 2013 23:02:03 +0900 (KST) X-AuditID: cbfee690-b7f6f6d00000740c-c3-51dc17db4be0 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 14.41.28381.BD71CD15; Tue, 09 Jul 2013 23:02:03 +0900 (KST) Received: from amarendra-desktop.sisodomain.com ([107.108.73.18]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MPO006D99NAYE00@mmp2.samsung.com>; Tue, 09 Jul 2013 23:02:03 +0900 (KST) From: amar_g To: u-boot@lists.denx.de, jh80.chung@samsung.com Date: Tue, 09 Jul 2013 19:35:40 +0530 Message-id: <1373378740-25734-1-git-send-email-amarendra.xt@samsung.com> X-Mailer: git-send-email 1.7.3.rc2 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBLMWRmVeSWpSXmKPExsWyRsSkRve2+J1Ag96lmhY3rv9ks3i4/iaL xY4795ktbvxqY7XoONLCaDHl8BcWi29btjFavN3bye7A4TG74SKLx7xZJ1g8ds66y+5x59oe No+zd3YwevRtWcUYwBbFZZOSmpNZllqkb5fAlfH8w2emgpvCFS8unmNrYNwj0MXIwSEhYCLx vsOmi5ETyBSTuHBvPVsXIxeHkMBSRokHPZOYIRImEr9vb2aFSExnlFjVupEdJCEkMIFJYs52 FRCbTUBd4smntawgtoiAgcT0J9vBbGaBGonJ828xgdjCAq4S7Z/Pg9ksAqoS+1f2MYLYvAIe Ets+NLNALFOSOL/xNdgyCYHJ7BJr5z1lhWgQkPg2+RALxNWyEpsOQB0nKXFwxQ2WCYyCCxgZ VjGKphYkFxQnpReZ6BUn5haX5qXrJefnbmIEhvLpf88m7GC8d8D6EGMy0LiJzFKiyfnAWMgr iTc0NjOyMDUxNTYytzQjTVhJnFe9xTpQSCA9sSQ1OzW1ILUovqg0J7X4ECMTB6dUA+NswVnv NK7V99jd2Xo12UVse9mzpoPtL7xuhjvVJuw5tvIb77GpxTwGCl8DGB9tjrvj5n1k7ZJ2lfZr Jg82P4481bn03NJLN97nzt8qopbtnmkU8pY5wSSobskypza2VXUmUc2BqbPUnvIcEz6uM39z 8Itz6997XVt8hGfpTOtf5bt217kxy7crsRRnJBpqMRcVJwIAreBKWnsCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrGIsWRmVeSWpSXmKPExsVy+t9jQd3b4ncCDRY+lLe4cf0nm8XD9TdZ LHbcuc9sceNXG6tFx5EWRosph7+wWHzbso3R4u3eTnYHDo/ZDRdZPObNOsHisXPWXXaPO9f2 sHmcvbOD0aNvyyrGALaoBkabjNTElNQihdS85PyUzLx0WyXv4HjneFMzA0NdQ0sLcyWFvMTc VFslF58AXbfMHKCTlBTKEnNKgUIBicXFSvp2mCaEhrjpWsA0Ruj6hgTB9RgZoIGENYwZzz98 Ziq4KVzx4uI5tgbGPQJdjJwcEgImEr9vb2aFsMUkLtxbz9bFyMUhJDCdUWJV60Z2kISQwAQm iTnbVUBsNgF1iSef1oI1iAgYSEx/sh3MZhaokZg8/xYTiC0s4CrR/vk8mM0ioCqxf2UfI4jN K+Ahse1DMwvEMiWJ8xtfs05g5F7AyLCKUTS1ILmgOCk911CvODG3uDQvXS85P3cTIzhWnknt YFzZYHGIUYCDUYmH98PlW4FCrIllxZW5hxglOJiVRHiT+O4ECvGmJFZWpRblxxeV5qQWH2JM Bto+kVlKNDkfGMd5JfGGxibmpsamliYWJmaWpAkrifMeaLUOFBJITyxJzU5NLUgtgtnCxMEp 1cC4bKYI365tLjcjlnbdNIvaYX2y9mv89kdq39+YTs5sbPWoeWAvsedSnBqTxAeNifVCjofb k6eeXaq2ctntqPlPLm++6vrYjOmzUZZFOf/UEKnUmb0zE/YncrZvZniyRfrsm/jz1i4Pl5zR FtJa5j5zd9Qka7vzV5JlUt5/nfVf+l5Yq7/Is7V7lFiKMxINtZiLihMBPUnLStkCAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: patches@linaro.org, afleming@gmail.com, hs@denx.de Subject: [U-Boot] [PATCH V1 1/1] EXYNOS: Resolve the i2c compilation error for 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 resolves the below mentiond compilation error of i2c driver for non-FDT case Compilation error: s3c24x0_i2c.c: In function 'board_i2c_init': s3c24x0_i2c.c:544:18: error: 'CONFIG_MAX_I2C_NUM' undeclared (first use in this function) s3c24x0_i2c.c:544:18: note: each undeclared identifier is reported only once for each function it appears in s3c24x0_i2c.c:545:3: warning: implicit declaration of function 'exynos_pinmux_config' [-Wimplicit-function-declaration] s3c24x0_i2c.c:545:25: error: 'PERIPH_ID_I2C0' undeclared (first use in this function) s3c24x0_i2c.c:546:10: error: 'PINMUX_FLAG_NONE' undeclared (first use in this function) make[1]: *** [/home/albert/src/u-boot-arm/build/VCMA9/drivers/i2c/s3c24x0_i2c.o] Error 1 make: *** [/home/albert/src/u-boot-arm/build/VCMA9/drivers/i2c/libi2c.o] Error 2 Signed-off-by: Rajeshwari Shinde Signed-off-by: Amar --- board/samsung/smdk5250/smdk5250.c | 10 ++++++++++ drivers/i2c/s3c24x0_i2c.c | 9 +-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c index ae1f077..f1d3d97 100644 --- a/board/samsung/smdk5250/smdk5250.c +++ b/board/samsung/smdk5250/smdk5250.c @@ -332,6 +332,16 @@ static int board_uart_init(void) return ret; } +void board_i2c_init(const void *blob) +{ + int i; + + for (i = 0; i < CONFIG_MAX_I2C_NUM; i++) { + exynos_pinmux_config((PERIPH_ID_I2C0 + i), + PINMUX_FLAG_NONE); + } +} + #ifdef CONFIG_BOARD_EARLY_INIT_F int board_early_init_f(void) { diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c index 3fc1c5b..382e4c2 100644 --- a/drivers/i2c/s3c24x0_i2c.c +++ b/drivers/i2c/s3c24x0_i2c.c @@ -515,10 +515,10 @@ 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; @@ -540,15 +540,8 @@ 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)