From mboxrd@z Thu Jan 1 00:00:00 1970 From: Denis Carikli Date: Fri, 08 Nov 2013 13:01:32 +0000 Subject: [PATCHv5][ 4/5] ARM: dts: i.MX35: Add display support. Message-Id: <1383915693-9422-4-git-send-email-denis@eukrea.com> List-Id: References: <1383915693-9422-1-git-send-email-denis@eukrea.com> In-Reply-To: <1383915693-9422-1-git-send-email-denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: Jean-Christophe Plagniol-Villard Cc: Tomi Valkeinen , linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Shawn Guo , Sascha Hauer , devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Denis Carikli , Rob Herring , Pawel Moll , Mark Rutland , Stephen Warren , Ian Campbell , Grant Likely , =?UTF-8?q?Eric=20B=C3=A9nard?= A pinctrl node for the IPU was also added. Cc: Rob Herring Cc: Pawel Moll Cc: Mark Rutland Cc: Stephen Warren Cc: Ian Campbell Cc: Grant Likely Cc: devicetree@vger.kernel.org Cc: Sascha Hauer Cc: Shawn Guo Cc: Jean-Christophe Plagniol-Villard Cc: Tomi Valkeinen Cc: linux-fbdev@vger.kernel.org Cc: Eric B=C3=A9nard Signed-off-by: Denis Carikli --- 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 | 13 +++++++++++++ arch/arm/mach-imx/imx35-dt.c | 7 +++++++ 2 files changed, 20 insertions(+) diff --git a/arch/arm/boot/dts/imx35.dtsi b/arch/arm/boot/dts/imx35.dtsi index 1cf520a..287bf6b 100644 --- a/arch/arm/boot/dts/imx35.dtsi +++ b/arch/arm/boot/dts/imx35.dtsi @@ -175,6 +175,12 @@ }; }; =20 + ipu { + pinctrl_ipu_disp0: ipudisp0grp { + fsl,pins =3D ; + }; + }; + uart1 { pinctrl_uart1_1: uart1grp-1 { fsl,pins =3D ; @@ -266,6 +272,13 @@ status =3D "disabled"; }; =20 + ipu: ipu@53fc0000 { + compatible =3D "fsl,imx35-ipu"; + reg =3D <0x53fc0000 0x4000>; + clocks =3D <&clks 55>; + status =3D "disabled"; + }; + audmux: audmux@53fc4000 { compatible =3D "fsl,imx35-audmux", "fsl,imx31-audmux"; reg =3D <0x53fc4000 0x4000>; diff --git a/arch/arm/mach-imx/imx35-dt.c b/arch/arm/mach-imx/imx35-dt.c index e3def45..6438f292 100644 --- a/arch/arm/mach-imx/imx35-dt.c +++ b/arch/arm/mach-imx/imx35-dt.c @@ -16,14 +16,21 @@ #include #include #include "common.h" +#include "devices-imx35.h" #include "mx35.h" =20 static void __init imx35_dt_init(void) { + struct device_node *np; mxc_arch_reset_init_dt(); =20 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + + /* We don't want to export the IPU as DT bindings. */ + np =3D of_find_compatible_node(NULL, NULL, "fsl,imx35-ipu"); + if (of_device_is_available(np)) + imx35_add_ipu_core(); } =20 static void __init imx35_timer_init(void) --=20 1.7.9.5