From patchwork Fri Jul 4 06:46:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 4478161 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 56174BEEAA for ; Fri, 4 Jul 2014 06:48:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 942B5203E5 for ; Fri, 4 Jul 2014 06:48:23 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B39862039D for ; Fri, 4 Jul 2014 06:48:22 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X2xGg-0008On-Fb; Fri, 04 Jul 2014 06:46:46 +0000 Received: from mail-bl2lp0206.outbound.protection.outlook.com ([207.46.163.206] helo=na01-bl2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X2xGd-0008Id-Ef for linux-arm-kernel@lists.infradead.org; Fri, 04 Jul 2014 06:46:44 +0000 Received: from BY2PR03CA078.namprd03.prod.outlook.com (10.141.249.51) by SN2PR03MB046.namprd03.prod.outlook.com (10.255.175.146) with Microsoft SMTP Server (TLS) id 15.0.974.11; Fri, 4 Jul 2014 06:46:14 +0000 Received: from BN1BFFO11FD012.protection.gbl (2a01:111:f400:7c10::1:105) by BY2PR03CA078.outlook.office365.com (2a01:111:e400:2c5d::51) with Microsoft SMTP Server (TLS) id 15.0.974.11 via Frontend Transport; Fri, 4 Jul 2014 06:46:14 +0000 Received: from az84smr01.freescale.net (192.88.158.2) by BN1BFFO11FD012.mail.protection.outlook.com (10.58.144.75) with Microsoft SMTP Server (TLS) id 15.0.969.12 via Frontend Transport; Fri, 4 Jul 2014 06:46:13 +0000 Received: from dragon.ap.freescale.net ([10.192.185.75]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id s646k7qm031146; Thu, 3 Jul 2014 23:46:09 -0700 From: Shawn Guo To: Subject: [PATCH] ARM: dts: imx: correct sdma compatbile for imx6sl and imx6sx Date: Fri, 4 Jul 2014 14:46:01 +0800 Message-ID: <1404456361-8197-1-git-send-email-shawn.guo@freescale.com> X-Mailer: git-send-email 1.8.3.2 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:CAL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(979002)(6009001)(199002)(189002)(4396001)(102836001)(50226001)(92566001)(77982001)(6806004)(20776003)(89996001)(104166001)(99396002)(76482001)(97736001)(69596002)(83072002)(33646001)(26826002)(21056001)(68736004)(2351001)(88136002)(62966002)(46102001)(36756003)(79102001)(74502001)(44976005)(19580395003)(50986999)(87286001)(85852003)(48376002)(83322001)(84676001)(19580405001)(64706001)(105606002)(95666004)(93916002)(74662001)(81156004)(80022001)(31966008)(85306003)(87936001)(50466002)(92726001)(86362001)(47776003)(107046002)(229853001)(77156001)(104016002)(81542001)(106466001)(575784001)(81342001)(110136001)(32563001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:; SCL:1; SRVR:SN2PR03MB046; H:az84smr01.freescale.net; FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID: X-Forefront-PRVS: 02622CEF0A Received-SPF: Fail (: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=Shawn.Guo@freescale.com; X-OriginatorOrg: freescale.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140703_234643_657219_3971CD3F X-CRM114-Status: UNSURE ( 7.71 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -3.0 (---) Cc: Fabio Estevam , Robin Gong , Shawn Guo X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The SDMA on imx6sl and imx6sx is more compatible with imx6q one than imx35. Let's use "fsl,imx6q-sdma" instead of "fsl,imx35-sdma", so that SDMA ROM script on imx6sl and imx6sx can work for audio driver just like the case of imx6q. Reported-by: Fabio Estevam Signed-off-by: Shawn Guo --- Thanks to Robin for finding this out. arch/arm/boot/dts/imx6sl.dtsi | 2 +- arch/arm/boot/dts/imx6sx.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi index c0ee12f1f171..0467ac064e9d 100644 --- a/arch/arm/boot/dts/imx6sl.dtsi +++ b/arch/arm/boot/dts/imx6sl.dtsi @@ -608,7 +608,7 @@ }; sdma: sdma@020ec000 { - compatible = "fsl,imx6sl-sdma", "fsl,imx35-sdma"; + compatible = "fsl,imx6sl-sdma", "fsl,imx6q-sdma"; reg = <0x020ec000 0x4000>; interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6SL_CLK_SDMA>, diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index 92d48becdb45..0c5094adedfa 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -706,7 +706,7 @@ }; sdma: sdma@020ec000 { - compatible = "fsl,imx6sx-sdma", "fsl,imx35-sdma"; + compatible = "fsl,imx6sx-sdma", "fsl,imx6q-sdma"; reg = <0x020ec000 0x4000>; interrupts = ; clocks = <&clks IMX6SX_CLK_SDMA>,