From patchwork Sat May 25 17:47:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 2613891 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id F3BD1DF2A2 for ; Sat, 25 May 2013 17:48:48 +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 1UgIaF-0008JM-Kf; Sat, 25 May 2013 17:48:47 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UgIaC-0003a1-Uq; Sat, 25 May 2013 17:48:45 +0000 Received: from mail-gg0-x22e.google.com ([2607:f8b0:4002:c02::22e]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UgIa9-0003Zg-SM for linux-arm-kernel@lists.infradead.org; Sat, 25 May 2013 17:48:43 +0000 Received: by mail-gg0-f174.google.com with SMTP id y1so1664096ggc.5 for ; Sat, 25 May 2013 10:48:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=Gr9qxiwb9JdDfTFR6gppn9ikRijr9Civ/nG51AkrTQQ=; b=Ky9TAggGwFZXr5rEg48MPWpUGoO14pD++seoCUcnzSWJcEtNphFtVwZC1ZX89X9lg6 Yw5i1C/011O6XzZyoAjVyk6VyR83RF81AxSY9M9fzpGV1yvTDDOWXPeV00V8+3cabaqR G3FNazPMq9AWz1RYmVf33aK1heoKHfoMy0RpUCHpd/9y6+LPkRXXq01hkHFQyYrpqR/E BwnDx5fkgOag6ELXIzlxsZtm9kHKHKvn8mSz64SoW6JYkvUurSGei0CZhObqOGMzaafA WEIIPq8JZrArTba6ef37ONLonsbD5zkVYsA5PZQK+XhUiK7c5uPuMRLU9EQD4vDoaH+F OkIg== X-Received: by 10.236.31.37 with SMTP id l25mr11871838yha.196.1369504100548; Sat, 25 May 2013 10:48:20 -0700 (PDT) Received: from localhost.localdomain ([189.101.179.164]) by mx.google.com with ESMTPSA id s20sm30593673yhh.17.2013.05.25.10.48.18 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 25 May 2013 10:48:20 -0700 (PDT) From: Fabio Estevam To: shawn.guo@linaro.org Subject: [PATCH] ARM: mx6: Use the same sdma firmware name for all mx6 variants Date: Sat, 25 May 2013 14:47:28 -0300 Message-Id: <1369504048-19805-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.8.1.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130525_134842_031092_C6BB50EE X-CRM114-Status: GOOD ( 10.49 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (festevam[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Fabio Estevam , linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de 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 From: Fabio Estevam All the mx6 variants (quad, dual, solo and solo-lite) use the same sdma firmware, so drop the the suffix from the file name. Signed-off-by: Fabio Estevam --- 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 42e461c..b6730cc 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 {