From patchwork Wed Jul 25 12:05:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Padmavathi Venna X-Patchwork-Id: 1236901 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 8B673DFFCE for ; Wed, 25 Jul 2012 12:08:15 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Su0Hf-0000v4-Bg; Wed, 25 Jul 2012 12:01:43 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Su0HC-0000uq-2T for linux-arm-kernel@lists.infradead.org; Wed, 25 Jul 2012 12:01:38 +0000 Received: from epcpsbgm1.samsung.com (mailout4.samsung.com [203.254.224.34]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0M7P00E3QTDS9YQ0@mailout4.samsung.com> for linux-arm-kernel@lists.infradead.org; Wed, 25 Jul 2012 21:01:04 +0900 (KST) X-AuditID: cbfee61a-b7f616d000004b7e-f7-500fdffddcc5 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 6B.45.19326.DFFDF005; Wed, 25 Jul 2012 21:01:02 +0900 (KST) Received: from padma-linuxpc.sisodomain.com ([107.108.83.35]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0M7P00L9ETDJZI60@mmp1.samsung.com> for linux-arm-kernel@lists.infradead.org; Wed, 25 Jul 2012 21:01:01 +0900 (KST) From: Padmavathi Venna To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH] ARM: EXYNOS: Add I2S SFR base addresses Date: Wed, 25 Jul 2012 17:35:38 +0530 Message-id: <1343217938-30351-1-git-send-email-padma.v@samsung.com> X-Mailer: git-send-email 1.7.4.4 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrBJMWRmVeSWpSXmKPExsVy+t9jAd1/9/kDDK5cYrHY9PgaqwOjx+Yl 9QGMUVw2Kak5mWWpRfp2CVwZK093MxXc4a2YtOoZSwPjYe4uRg4OCQETiVmTa7sYOYFMMYkL 99azdTFycQgJLGKUeL1+KzOEs5VJYurp/4wgDWwCOhItZ11ATBEBb4nl1xRBSpgFjjJK9C5a wQIySFjAQqL55is2EJtFQFXiw902JhCbV8BZ4szUDYwQyxQkjk39yjqBkXsBI8MqRtHUguSC 4qT0XEO94sTc4tK8dL3k/NxNjGD/PZPawbiyweIQowAHoxIP788nfAFCrIllxZW5hxglOJiV RHgf3+APEOJNSaysSi3Kjy8qzUktPsQozcGiJM5r7P3VX0ggPbEkNTs1tSC1CCbLxMEp1cB4 ekn5B2m3OZn6fYkcZ521Uibll2/y+7JZlpt7xpNSvy/7rPLSroXbTFv4+RfrMfe8vMn7Nnr+ ynoftvqj5nMp+cfXpi7U2dxgwz258IygMLv0Jw4ZAbkuzlzBubMFWjJ44963r5DJL6ur9t/8 I/9wuGy+VJby6V0Jz9bVFUyxmVC04XvOdG8lluKMREMt5qLiRAD35HD22wEAAA== X-TM-AS-MML: No X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.9 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.34 listed in list.dnswl.org] -0.0 T_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] 4.0 HDRS_LCASE Odd capitalization of message header Cc: kgene.kim@samsung.com, rcsekar@samsung.com, sbkim73@samsung.com, sangsu4u.park@samsung.com, padma.v@samsung.com, joshi@samsung.com, thutt@chromium.org, ben-linux@fluff.org, olofj@google.com 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: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The base address of I2S 0 controller is similar in exynos4 and exynos5 platforms. So this patch defines a common macro for the I2S controller 0 base address in both the platforms and use the same macro. This patch also defines the I2S controller 1,2 base addresses in exynos5 and correct the I2S controller 1 base address in exynos4 Signed-off-by: Padmavathi Venna --- arch/arm/mach-exynos/dev-audio.c | 2 +- arch/arm/mach-exynos/include/mach/map.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-exynos/dev-audio.c b/arch/arm/mach-exynos/dev-audio.c index b33a5b6..5dbc9a2 100644 --- a/arch/arm/mach-exynos/dev-audio.c +++ b/arch/arm/mach-exynos/dev-audio.c @@ -62,7 +62,7 @@ static struct s3c_audio_pdata i2sv5_pdata = { }; static struct resource exynos4_i2s0_resource[] = { - [0] = DEFINE_RES_MEM(EXYNOS4_PA_I2S0, SZ_256), + [0] = DEFINE_RES_MEM(EXYNOS_PA_I2S0, SZ_256), [1] = DEFINE_RES_DMA(DMACH_I2S0_TX), [2] = DEFINE_RES_DMA(DMACH_I2S0_RX), [3] = DEFINE_RES_DMA(DMACH_I2S0S_TX), diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h index c72b675..5cf7d91 100644 --- a/arch/arm/mach-exynos/include/mach/map.h +++ b/arch/arm/mach-exynos/include/mach/map.h @@ -39,9 +39,11 @@ #define EXYNOS4_PA_G2D 0x12800000 -#define EXYNOS4_PA_I2S0 0x03830000 -#define EXYNOS4_PA_I2S1 0xE3100000 +#define EXYNOS_PA_I2S0 0x03830000 +#define EXYNOS4_PA_I2S1 0xE2100000 #define EXYNOS4_PA_I2S2 0xE2A00000 +#define EXYNOS5_PA_I2S1 0x12D60000 +#define EXYNOS5_PA_I2S2 0x12D70000 #define EXYNOS4_PA_PCM0 0x03840000 #define EXYNOS4_PA_PCM1 0x13980000