From patchwork Tue Aug 28 11:08:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 1380721 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 272A2DF283 for ; Tue, 28 Aug 2012 11:11:55 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T6Jf3-000810-2y; Tue, 28 Aug 2012 11:08:45 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T6Jeu-00080m-FD for linux-arm-kernel@lists.infradead.org; Tue, 28 Aug 2012 11:08:38 +0000 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0M9G00DY8PM7DUE0@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 28 Aug 2012 20:08:31 +0900 (KST) X-AuditID: cbfee61a-b7fc66d0000043b7-7b-503ca6af03e2 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id A1.82.17335.FA6AC305; Tue, 28 Aug 2012 20:08:31 +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 <0M9G002CDPM50ZA0@mmp1.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 28 Aug 2012 20:08:31 +0900 (KST) From: Tomasz Figa To: linux-samsung-soc Subject: [PATCH] ARM: EXYNOS: Use non-secure MDMA1 Date: Tue, 28 Aug 2012 13:08:28 +0200 Message-id: <5886686.Vz6SVkoRWm@amdc1227> Organization: Samsung Poland R&D Center User-Agent: KMail/4.9 (Linux/3.5.2-gentoo; KDE/4.9.0; x86_64; ; ) MIME-version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprPLMWRmVeSWpSXmKPExsVy+t9jAd31y2wCDGb9E7XY9PgaqwOjx+Yl 9QGMUVw2Kak5mWWpRfp2CVwZn3rOsxQs5644/GgucwPjDc4uRk4OCQETiS+LXzJD2GISF+6t Z+ti5OIQEljEKHHl5noWCGctk8StjrNsIFVsAmoSnxsegdkiApYSFz/vBytiFtjNKLG5YyUT SEJYwEji1N9bYGNZBFQlZj3vAGvgFdCUmD73MVgNv4C6xLttT8FsUQFHia+TIGxeAUGJH5Pv sYDYzALyEvv2T2WFsLUk1u88zjSBkX8WkrJZSMpmISlbwMi8ilE0tSC5oDgpPddQrzgxt7g0 L10vOT93EyM42J5J7WBc2WBxiFGAg1GJhzdgl3WAEGtiWXFl7iFGCQ5mJRHeVVU2AUK8KYmV ValF+fFFpTmpxYcYpTlYlMR5+fsMA4QE0hNLUrNTUwtSi2CyTBycUg2MaqeikkITZYquFwVd jJiQ95Q9bL1QIfuZ8h2SSyyvx82YavfytITLe65PeWGK2sJ5vsp5PdZNUz7kbg06ou5Uu0Cx t85T5v9rTvuLRtylBi4G7+ezyylt2dR0Y/rNos/Wh39Njzx84sLPq5ce1yt5+yonfNW0fphT ms82g/nQTXHO39or7yxTYinOSDTUYi4qTgQAXg2OLTICAAA= X-Spam-Note: CRM114 invocation failed X-Spam-Score: -7.0 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.33 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.2 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 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 Using secure MDMA1 on TrustZone-enabled boards causes early boot crash, so use non-secure instead. Signed-off-by: Tomasz Figa Signed-off-by: Kyungmin Park --- arch/arm/mach-exynos/dma.c | 2 +- arch/arm/mach-exynos/include/mach/map.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-exynos/dma.c b/arch/arm/mach-exynos/dma.c index f60b66d..8858df5 100644 --- a/arch/arm/mach-exynos/dma.c +++ b/arch/arm/mach-exynos/dma.c @@ -261,7 +261,7 @@ static struct dma_pl330_platdata exynos_mdma1_pdata = { }; static AMBA_AHB_DEVICE(exynos_mdma1, "dma-pl330.2", 0x00041330, - EXYNOS4_PA_MDMA1, {EXYNOS4_IRQ_MDMA1}, &exynos_mdma1_pdata); + EXYNOS4_PA_NS_MDMA1, {EXYNOS4_IRQ_MDMA1}, &exynos_mdma1_pdata); static int __init exynos_dma_init(void) { diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach- exynos/include/mach/map.h index 51943f2..5df5910 100644 --- a/arch/arm/mach-exynos/include/mach/map.h +++ b/arch/arm/mach-exynos/include/mach/map.h @@ -89,7 +89,8 @@ #define EXYNOS4_PA_L2CC 0x10502000 #define EXYNOS4_PA_MDMA0 0x10810000 -#define EXYNOS4_PA_MDMA1 0x12840000 +#define EXYNOS4_PA_S_MDMA1 0x12840000 +#define EXYNOS4_PA_NS_MDMA1 0x12850000 #define EXYNOS4_PA_PDMA0 0x12680000 #define EXYNOS4_PA_PDMA1 0x12690000 #define EXYNOS5_PA_MDMA0 0x10800000