From patchwork Fri Mar 14 09:12:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Carikli X-Patchwork-Id: 3831431 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8C26EBF540 for ; Fri, 14 Mar 2014 09:13:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A7EAE20306 for ; Fri, 14 Mar 2014 09:13:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D0EE8202E9 for ; Fri, 14 Mar 2014 09:13:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755855AbaCNJNN (ORCPT ); Fri, 14 Mar 2014 05:13:13 -0400 Received: from smtp1-g21.free.fr ([212.27.42.1]:40452 "EHLO smtp1-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755773AbaCNJNM (ORCPT ); Fri, 14 Mar 2014 05:13:12 -0400 Received: from denis-N73SV.local.eukrea.com (unknown [88.170.243.169]) by smtp1-g21.free.fr (Postfix) with ESMTP id C13E7940146; Fri, 14 Mar 2014 10:13:05 +0100 (CET) From: Denis Carikli To: Jean-Christophe Plagniol-Villard , Tomi Valkeinen Cc: =?UTF-8?q?Eric=20B=C3=A9nard?= , Shawn Guo , Sascha Hauer , linux-arm-kernel@lists.infradead.org, linux-fbdev@vger.kernel.org, Denis Carikli Subject: [PATCH v7][ 4/5] ARM: dts: i.MX35: Add display support. Date: Fri, 14 Mar 2014 10:12:48 +0100 Message-Id: <1394788369-5096-4-git-send-email-denis@eukrea.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1394788369-5096-1-git-send-email-denis@eukrea.com> References: <1394788369-5096-1-git-send-email-denis@eukrea.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 There is already a "dma ipu driver" for the mx3* that is currently at drivers/dma/ipu/ipu_idmac.c The mx3fb framebuffer driver uses this "dma ipu driver". The goal is not to expose the "dma ipu driver" in the device tree bindings, to make the mx3fb bindings look similar to the ipuv3 ones. In the device tree bindings, the "dma ipu driver" is absent, and the mx3fb compatible is "fsl,imx-ipu". An node for the mx3fb was also added in the imx35 dtsi. Signed-off-by: Denis Carikli --- ChangeLog v6->v7: - Removed the Cc from the patch, they went into git send-email instead. - Removed the comment, and instead a commit messaage was added to explain the non-straingtforward part of the change. 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 | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/arch/arm/boot/dts/imx35.dtsi b/arch/arm/boot/dts/imx35.dtsi index e59ccb4..b9bf6a0 100644 --- a/arch/arm/boot/dts/imx35.dtsi +++ b/arch/arm/boot/dts/imx35.dtsi @@ -230,6 +230,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..657cc5d 100644 --- a/arch/arm/mach-imx/imx35-dt.c +++ b/arch/arm/mach-imx/imx35-dt.c @@ -18,14 +18,20 @@ #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); + + 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)