From patchwork Sun Aug 11 15:04:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luka Perkov X-Patchwork-Id: 2842714 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3517C9F271 for ; Sun, 11 Aug 2013 15:14:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 56DF320201 for ; Sun, 11 Aug 2013 15:14:23 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0B26C201FD for ; Sun, 11 Aug 2013 15:14:22 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V8XLX-0004kG-9u; Sun, 11 Aug 2013 15:14:19 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V8XLV-0004PS-35; Sun, 11 Aug 2013 15:14:17 +0000 Received: from arrakis.dune.hu ([78.24.191.176]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V8XLR-0004OY-69 for linux-arm-kernel@lists.infradead.org; Sun, 11 Aug 2013 15:14:13 +0000 Received: from localhost (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 3FBFA28080F; Sun, 11 Aug 2013 17:04:12 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Virus-Scanned: at arrakis.dune.hu Received: from localhost.localdomain (213-191-157-201.dhcp.iskon.hr [213.191.157.201]) by arrakis.dune.hu (Postfix) with ESMTPSA id 2DF3E28008D; Sun, 11 Aug 2013 17:04:11 +0200 (CEST) From: Luka Perkov To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: dts: imx6sl/imx6qdl: use the same SDMA firmware Date: Sun, 11 Aug 2013 17:04:00 +0200 Message-Id: <1376233440-30067-1-git-send-email-luka@openwrt.org> X-Mailer: git-send-email 1.8.3.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130811_111413_343841_E3582834 X-CRM114-Status: GOOD ( 12.76 ) X-Spam-Score: -1.9 (-) Cc: Fabio Estevam , Luka Perkov X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Patch for SDMA firmware sent by Fabio Estevam in January [1] didn't make upstream. Nonetheless, it was pointed out that all imx6 use the same SDMA firmware [2]. Reflect this fact in appropriate .dtsi files. [1] http://lists.infradead.org/pipermail/linux-arm-kernel/2013-January/143025.html [2] http://lists.infradead.org/pipermail/linux-arm-kernel/2013-January/143150.html Signed-off-by: Luka Perkov --- arch/arm/boot/dts/imx6qdl.dtsi | 2 +- arch/arm/boot/dts/imx6sl.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index f21d259..267d080 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -582,7 +582,7 @@ interrupts = <0 2 0x04>; clocks = <&clks 155>, <&clks 155>; clock-names = "ipg", "ahb"; - fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6q.bin"; + fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6.bin"; }; }; diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi index c5e5da0..9596000 100644 --- a/arch/arm/boot/dts/imx6sl.dtsi +++ b/arch/arm/boot/dts/imx6sl.dtsi @@ -594,7 +594,7 @@ clocks = <&clks IMX6SL_CLK_SDMA>, <&clks IMX6SL_CLK_SDMA>; clock-names = "ipg", "ahb"; - fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6sl.bin"; + fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6.bin"; }; pxp: pxp@020f0000 {