From 605b4cf50a7be1d5e3de307012c06b4a03150927 Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Thu, 5 Sep 2013 19:42:50 +0800 Subject: [PATCH] ENGR00269945: ARM: imx6: add sabresd hdcp dts files It's basically a revert of commit fc52e42 (ENGR00269945: ARM: imx6: remove sabresd hdcp dts files). As we agree that maintaining multiple dts files for internal tree should not be a problem, let's add the hdcp dts files back as the solution to hdcp pin conflict. Signed-off-by: Shawn Guo --- arch/arm/boot/dts/Makefile | 2 ++ arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts | 19 +++++++++++++++++++ arch/arm/boot/dts/imx6q-sabresd-hdcp.dts | 23 +++++++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts create mode 100644 arch/arm/boot/dts/imx6q-sabresd-hdcp.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 4a1074d2c4cd..6ebac4da8da3 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -115,12 +115,14 @@ dtb-$(CONFIG_ARCH_MXC) += \ imx53-smd.dtb \ imx6dl-sabreauto.dtb \ imx6dl-sabresd.dtb \ + imx6dl-sabresd-hdcp.dtb \ imx6dl-sabresd-ldo.dtb \ imx6dl-wandboard.dtb \ imx6q-arm2.dtb \ imx6q-sabreauto.dtb \ imx6q-sabrelite.dtb \ imx6q-sabresd.dtb \ + imx6q-sabresd-hdcp.dtb \ imx6q-sabresd-ldo.dtb \ imx6q-sbc6x.dtb \ imx6sl-evk.dtb \ diff --git a/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts b/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts new file mode 100644 index 000000000000..8cdba7674869 --- /dev/null +++ b/arch/arm/boot/dts/imx6dl-sabresd-hdcp.dts @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include "imx6dl-sabresd.dts" + +&hdmi_video { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hdmi_hdcp_1>; + fsl,hdcp; +}; + +&i2c2 { + status = "disable"; +}; diff --git a/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts b/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts new file mode 100644 index 000000000000..063abccc5ef8 --- /dev/null +++ b/arch/arm/boot/dts/imx6q-sabresd-hdcp.dts @@ -0,0 +1,23 @@ +/* + * Copyright 2012-2013 Freescale Semiconductor, Inc. + * Copyright 2011 Linaro Ltd. + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +#include "imx6q-sabresd.dts" + +&hdmi_video { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hdmi_hdcp_1>; + fsl,hdcp; +}; + +&i2c2 { + status = "disable"; +}; -- 2.39.5