From patchwork Wed Nov 7 13:00:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 1710561 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id D3FB2DFB7A for ; Wed, 7 Nov 2012 13:02:38 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TW5FE-00088s-6D; Wed, 07 Nov 2012 13:00:36 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TW5Ex-00082S-Fs for linux-arm-kernel@lists.infradead.org; Wed, 07 Nov 2012 13:00:22 +0000 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MD4001ZUC4H6560@mailout2.samsung.com> for linux-arm-kernel@lists.infradead.org; Wed, 07 Nov 2012 22:00:17 +0900 (KST) X-AuditID: cbfee61a-b7fa66d0000004cf-04-509a5b613d04 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id AC.99.01231.16B5A905; Wed, 07 Nov 2012 22:00:17 +0900 (KST) Received: from amdc1227.localnet ([106.116.147.199]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MD400CCLC4F2RB0@mmp1.samsung.com> for linux-arm-kernel@lists.infradead.org; Wed, 07 Nov 2012 22:00:17 +0900 (KST) From: Tomasz Figa To: linux-samsung-soc , jhkim@insignal.co.kr Subject: [PATCH] ARM: EXYNOS: Make s3c_device_i2c0 always use id 0 Date: Wed, 07 Nov 2012 14:00:13 +0100 Message-id: <4039915.8GOx0SKq2B@amdc1227> Organization: Samsung Poland R&D Center User-Agent: KMail/4.9.2 (Linux/3.6.5-gentoo; KDE/4.9.2; x86_64; ; ) MIME-version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprLLMWRmVeSWpSXmKPExsVy+t9jAd3E6FkBBhf+iVpsenyN1YHRY/OS +gDGKC6blNSczLLUIn27BK6M3llPWAsO8FXMafvE3MD4g7uLkZNDQsBE4t+eBhYIW0ziwr31 bCC2kMAiRomGzuIuRi4gey2TRFfDC1aQBJuAmsTnhkdgRSIC/hJHevcxgRQxC+xmlPi1cBkj SEJYwEniw+d/QDYHB4uAKlDcCSTMK6Ap0bTrA9gcfgF1iXfbnjKB2KICzhIrmu+zQdQISvyY fA/sIGYBeYl9+6eyQthaEut3HmeawMg/C0nZLCRls5CULWBkXsUomlqQXFCclJ5rqFecmFtc mpeul5yfu4kRHGjPpHYwrmywOMQowMGoxMM7IX1mgBBrYllxZe4hRgkOZiURXqOIWQFCvCmJ lVWpRfnxRaU5qcWHGKU5WJTEeZs9UgKEBNITS1KzU1MLUotgskwcnFINjBK5336IRDp5XnQp 27/VoT1MbHPKo0uPtjwSepkkeIw709eoof+r9pkzNzrYlh51eXFNJ/vvlg/fvFwrKg/o501u nrLs9bqHeS83VtqGeOYI6p+43Bu7lWvXpSM3WGasncypVCyxP2eJZFjPyW+f9NfxXZyUseW9 tYGPe+2bA8fNJ76JXnng4mQlluKMREMt5qLiRAANkOV+MAIAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121107_080020_555176_C7CDED7A X-CRM114-Status: GOOD ( 10.81 ) X-Spam-Score: -7.5 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.25 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 HDRS_LCASE Odd capitalization of message header 0.0 T_MANY_HDRS_LCASE Odd capitalization of multiple message headers Cc: Kyungmin Park , Kukjin Kim , linux-arm-kernel , Marek Szyprowski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This patch removes compatibility definitions added long time ago when clock ids were used instead of devnames that were needed for platforms with only one i2c controller with id -1 (some s3c24xx's). Because currently devname field is used for matching device instances to clocks and if no devname is provided (as in clock-s3c2412.c and common-s3c2443.c for i2c clock, both in arch/arm/mach-s3c24xx) the clock is being matched only by name, so s3c_device_i2c0 can always have id 0. This patch solves the issue with i2c0 broken on boards where its the only i2c controller used, tested on Origen. Signed-off-by: Tomasz Figa Signed-off-by: Kyungmin Park Reviewed-by: Sylwester Nawrocki --- arch/arm/mach-s3c64xx/clock.c | 4 ---- arch/arm/plat-samsung/devs.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c index 28041e8..0fd7417 100644 --- a/arch/arm/mach-s3c64xx/clock.c +++ b/arch/arm/mach-s3c64xx/clock.c @@ -138,11 +138,7 @@ static struct clk init_clocks_off[] = { .ctrlbit = S3C_CLKCON_PCLK_TSADC, }, { .name = "i2c", -#ifdef CONFIG_S3C_DEV_I2C1 .devname = "s3c2440-i2c.0", -#else - .devname = "s3c2440-i2c", -#endif .parent = &clk_p, .enable = s3c64xx_pclk_ctrl, .ctrlbit = S3C_CLKCON_PCLK_IIC, diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 52dfa8f..bc50b20 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c @@ -486,11 +486,7 @@ static struct resource s3c_i2c0_resource[] = { struct platform_device s3c_device_i2c0 = { .name = "s3c2410-i2c", -#ifdef CONFIG_S3C_DEV_I2C1 .id = 0, -#else - .id = -1, -#endif .num_resources = ARRAY_SIZE(s3c_i2c0_resource), .resource = s3c_i2c0_resource, };