From patchwork Mon Nov 19 14:07:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 200011 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 9DE9B2C01FD for ; Tue, 20 Nov 2012 01:10:31 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TaS1Q-00008N-VF; Mon, 19 Nov 2012 14:08:25 +0000 Received: from co9ehsobe001.messaging.microsoft.com ([207.46.163.24] helo=co9outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TaS1M-00005i-4o for linux-arm-kernel@lists.infradead.org; Mon, 19 Nov 2012 14:08:20 +0000 Received: from mail96-co9-R.bigfish.com (10.236.132.241) by CO9EHSOBE020.bigfish.com (10.236.130.83) with Microsoft SMTP Server id 14.1.225.23; Mon, 19 Nov 2012 14:08:17 +0000 Received: from mail96-co9 (localhost [127.0.0.1]) by mail96-co9-R.bigfish.com (Postfix) with ESMTP id A13E1D00189; Mon, 19 Nov 2012 14:08:17 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1de0h1202h1d1ah1d2ahzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1155h) Received: from mail96-co9 (localhost.localdomain [127.0.0.1]) by mail96-co9 (MessageSwitch) id 1353334095721496_22867; Mon, 19 Nov 2012 14:08:15 +0000 (UTC) Received: from CO9EHSMHS011.bigfish.com (unknown [10.236.132.253]) by mail96-co9.bigfish.com (Postfix) with ESMTP id A160C1C0059; Mon, 19 Nov 2012 14:08:15 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO9EHSMHS011.bigfish.com (10.236.130.21) with Microsoft SMTP Server (TLS) id 14.1.225.23; Mon, 19 Nov 2012 14:07:19 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server (TLS) id 14.2.318.3; Mon, 19 Nov 2012 14:07:18 +0000 Received: from fabio-Latitude-E6410.am.freescale.net ([10.29.240.140]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id qAJE79iG019739; Mon, 19 Nov 2012 07:07:16 -0700 From: Fabio Estevam To: Subject: [PATCH v3 3/3] ARM: mx27: Add VPU support Date: Mon, 19 Nov 2012 12:07:07 -0200 Message-ID: <1353334027-30009-3-git-send-email-fabio.estevam@freescale.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1353334027-30009-1-git-send-email-fabio.estevam@freescale.com> References: <1353334027-30009-1-git-send-email-fabio.estevam@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121119_090820_481144_ABEF3982 X-CRM114-Status: GOOD ( 17.24 ) X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [207.46.163.24 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Fabio Estevam , javier.martin@vista-silicon.com, linux-arm-kernel@lists.infradead.org, eric@eukrea.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 mx27 has a VPU (Video Processing Unit) block that allows doing H264/MPEG4 decoding and encoding in hardware. Add support for it in a common SoC file instead of per board file. Signed-off-by: Fabio Estevam --- Changes since v2: - Do not register VPU for mx27lite version Changes since v1: - Call imx27_add_coda() on a common mx27 location instead of pe arch/arm/mach-imx/iim.h | 2 ++ arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 1 - arch/arm/mach-imx/mm-imx27.c | 21 ++++++++++++++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/iim.h b/arch/arm/mach-imx/iim.h index d1d6f35..afe4bc1 100644 --- a/arch/arm/mach-imx/iim.h +++ b/arch/arm/mach-imx/iim.h @@ -74,4 +74,6 @@ #define MXC_IIMHWV2_BP_SDMA (0x1 << 6) #define MXC_IIMHWV2_SCM_DCM (0x1 << 5) +#define MXC_IIM_CHIPANDMEDIA_DISABLE (0x1 << 7) + #endif /* __ASM_ARCH_MXC_IIM_H__ */ diff --git a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c index 801b797..25303a8 100644 --- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c +++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c @@ -531,7 +531,6 @@ static void __init visstrim_m10_board_init(void) gpio_led_register_device(0, &visstrim_m10_led_data); visstrim_deinterlace_init(); visstrim_camera_init(); - imx27_add_coda(); } static void __init visstrim_m10_timer_init(void) diff --git a/arch/arm/mach-imx/mm-imx27.c b/arch/arm/mach-imx/mm-imx27.c index 4f1be65..0a8b9d4 100644 --- a/arch/arm/mach-imx/mm-imx27.c +++ b/arch/arm/mach-imx/mm-imx27.c @@ -25,9 +25,10 @@ #include #include "common.h" -#include "devices/devices-common.h" +#include "devices-imx27.h" #include "hardware.h" #include "iomux-v1.h" +#include "iim.h" /* MX27 memory map definition */ static struct map_desc imx27_io_desc[] __initdata = { @@ -80,6 +81,20 @@ static const struct resource imx27_audmux_res[] __initconst = { DEFINE_RES_MEM(MX27_AUDMUX_BASE_ADDR, SZ_4K), }; +static int cpu_is_mx27l(void) +{ + int fuse; + fuse = __raw_readl(MX27_IO_ADDRESS(MX27_IIM_BASE_ADDR + + MXC_IIMWORD3_BANK0)); + + fuse &= MXC_IIM_CHIPANDMEDIA_DISABLE; + + if (fuse) + return 1; + else + return 0; +} + void __init imx27_soc_init(void) { mxc_device_init(); @@ -98,4 +113,8 @@ void __init imx27_soc_init(void) /* imx27 has the imx21 type audmux */ platform_device_register_simple("imx21-audmux", 0, imx27_audmux_res, ARRAY_SIZE(imx27_audmux_res)); + + /* MX27L variant does not have VPU, so do not register VPU for it */ + if (!cpu_is_mx27l()) + imx27_add_coda(); }