From patchwork Tue Jun 14 06:20:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 100282 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3B44FB6F91 for ; Tue, 14 Jun 2011 16:11:04 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QWMpy-0004Yp-Tf; Tue, 14 Jun 2011 06:10:55 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QWMpy-0008M0-GX; Tue, 14 Jun 2011 06:10:54 +0000 Received: from mail-pw0-f49.google.com ([209.85.160.49]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QWMpv-0008Lh-7D for linux-arm-kernel@lists.infradead.org; Tue, 14 Jun 2011 06:10:52 +0000 Received: by pwi8 with SMTP id 8so3449716pwi.36 for ; Mon, 13 Jun 2011 23:10:46 -0700 (PDT) Received: by 10.142.245.8 with SMTP id s8mr1030268wfh.316.1308031846385; Mon, 13 Jun 2011 23:10:46 -0700 (PDT) Received: from localhost.localdomain ([114.216.159.248]) by mx.google.com with ESMTPS id o16sm6772771wff.13.2011.06.13.23.10.38 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 13 Jun 2011 23:10:45 -0700 (PDT) From: Shawn Guo To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 5/6] ARM: mxc: all three imx51 TOs use TO1 version of sdma script Date: Tue, 14 Jun 2011 14:20:07 +0800 Message-Id: <1308032407-3860-1-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1307950645-26529-6-git-send-email-shawn.guo@linaro.org> References: <1307950645-26529-6-git-send-email-shawn.guo@linaro.org> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110614_021051_473837_1D867AEB X-CRM114-Status: GOOD ( 13.57 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.49 listed in list.dnswl.org] Cc: Shawn Guo , Fabio Estevam , kernel@pengutronix.de, patches@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list 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+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Though there are three TOs of imx51 soc, the sdma script never changes since TO1, which means all three TOs of imx51 uses TO1 version of sdma script. The current code passes TO number to imx-sdma driver to load different firmware for different TO. That means we have to prepare 3 identical firmwares, sdma-imx51-to1.bin sdma-imx51-to2.bin and sdma-imx51-to3.bin, to have the kernel capable of running on all three TOs. This just makes no sense. The patch removes the TO number passing and get the default TO1 version of sdma firmware work for all TOs. Signed-off-by: Shawn Guo --- Changes since v1: * fix typo in imx51 firmware name caught by Fabio Estevam arch/arm/plat-mxc/devices/platform-imx-dma.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/arch/arm/plat-mxc/devices/platform-imx-dma.c b/arch/arm/plat-mxc/devices/platform-imx-dma.c index c64f015..2091540 100644 --- a/arch/arm/plat-mxc/devices/platform-imx-dma.c +++ b/arch/arm/plat-mxc/devices/platform-imx-dma.c @@ -196,8 +196,6 @@ static int __init imxXX_add_imx_dma(void) #if defined(CONFIG_SOC_IMX51) if (cpu_is_mx51()) { - int to_version = mx51_revision() >> 4; - imx51_imx_sdma_data.pdata.to_version = to_version; imx51_imx_sdma_data.pdata.script_addrs = &addr_imx51; ret = imx_add_imx_sdma(&imx51_imx_sdma_data); } else