From patchwork Wed Feb 26 09:59:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Denis Carikli X-Patchwork-Id: 3722921 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 E22529F2F7 for ; Wed, 26 Feb 2014 10:02:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1B46120149 for ; Wed, 26 Feb 2014 10:02:59 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 16EE120115 for ; Wed, 26 Feb 2014 10:02:58 +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 1WIbJ1-0000Oc-9C; Wed, 26 Feb 2014 10:01:36 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIbIg-0000Pp-CK; Wed, 26 Feb 2014 10:01:14 +0000 Received: from smtp6-g21.free.fr ([2a01:e0c:1:1599::15]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIbI9-0000KV-PN for linux-arm-kernel@lists.infradead.org; Wed, 26 Feb 2014 10:00:44 +0000 Received: from denis-N73SV.local.eukrea.com (unknown [88.170.243.169]) by smtp6-g21.free.fr (Postfix) with ESMTP id 4E3E8822D5; Wed, 26 Feb 2014 11:00:16 +0100 (CET) From: Denis Carikli To: linux-arm-kernel@lists.infradead.org, linux-fbdev@vger.kernel.org Subject: [PATCHv6][ 4/5] ARM: dts: i.MX35: Add display support. Date: Wed, 26 Feb 2014 10:59:58 +0100 Message-Id: <1393408800-8946-4-git-send-email-denis@eukrea.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1393408800-8946-1-git-send-email-denis@eukrea.com> References: <1393408800-8946-1-git-send-email-denis@eukrea.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140226_050042_472751_914D99FF X-CRM114-Status: GOOD ( 11.09 ) X-Spam-Score: -1.2 (-) Cc: Denis Carikli , Shawn Guo , =?UTF-8?q?Eric=20B=C3=A9nard?= 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 A pinctrl node for the IPU was also added. Cc: Eric Bénard Cc: Shawn Guo Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Denis Carikli --- ChangeLog v5->v6: - Shrinked the Cc list. ChangeLog v4->v5: - Added Grant Likely and Shawn Guo in the Cc list. - Adapted to the new non-dma ipu bindings. - Adapted to the use of imx35-pingrp.h - The pinctrl ipu node addition was moved in this commit. ChangeLog v3->v4: - Splitted the imx35.dtsi display support (new patch). --- arch/arm/boot/dts/imx35.dtsi | 7 +++++++ arch/arm/mach-imx/imx35-dt.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/arch/arm/boot/dts/imx35.dtsi b/arch/arm/boot/dts/imx35.dtsi index 88b218f..e6ad2a4 100644 --- a/arch/arm/boot/dts/imx35.dtsi +++ b/arch/arm/boot/dts/imx35.dtsi @@ -229,6 +229,13 @@ status = "disabled"; }; + ipu: ipu@53fc0000 { + compatible = "fsl,imx35-ipu"; + reg = <0x53fc0000 0x4000>; + clocks = <&clks 55>; + status = "disabled"; + }; + audmux: audmux@53fc4000 { compatible = "fsl,imx35-audmux", "fsl,imx31-audmux"; reg = <0x53fc4000 0x4000>; diff --git a/arch/arm/mach-imx/imx35-dt.c b/arch/arm/mach-imx/imx35-dt.c index 9d48e00..c2919a8 100644 --- a/arch/arm/mach-imx/imx35-dt.c +++ b/arch/arm/mach-imx/imx35-dt.c @@ -18,14 +18,21 @@ #include #include #include "common.h" +#include "devices-imx35.h" #include "mx35.h" static void __init imx35_dt_init(void) { + struct device_node *np; mxc_arch_reset_init_dt(); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + + /* We don't want to export the IPU as DT bindings. */ + np = of_find_compatible_node(NULL, NULL, "fsl,imx35-ipu"); + if (of_device_is_available(np)) + imx35_add_ipu_core(); } static void __init imx35_irq_init(void)