summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorGerard Salvatella <gerard.salvatella@toradex.com>2018-06-11 16:08:12 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2018-06-21 09:28:26 +0200
commitb8753f648c18aefee460abc00e2e5e2a4c25684c (patch)
treee42a5351a8e187f49babd04dca508975d4327790 /arch
parent255f8cbac3b9d434669e99533c3a6fb9003f67a8 (diff)
dts: enable hdmi also on aster
Signed-off-by: Gerard Salvatella <gerard.salvatella@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/imx6dl-colibri-aster.dts1
-rw-r--r--arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts28
-rw-r--r--arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts30
-rw-r--r--arch/arm/boot/dts/imx6qdl-colibri.dtsi17
4 files changed, 14 insertions, 62 deletions
diff --git a/arch/arm/boot/dts/imx6dl-colibri-aster.dts b/arch/arm/boot/dts/imx6dl-colibri-aster.dts
index 1107d04ff43f..3c2d706262f4 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-aster.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-aster.dts
@@ -23,6 +23,7 @@
compatible = "toradex,colibri_imx6dl-aster", "toradex,colibri_imx6dl", "fsl,imx6dl";
aliases {
+ i2c0 = &i2cddc;
i2c1 = &i2c2;
i2c2 = &i2c3;
};
diff --git a/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts
index f518dd675849..9114bd175c14 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts
@@ -107,18 +107,6 @@
};
};
-&hdmi_audio {
- status = "okay";
-};
-
-&hdmi_core {
- status = "okay";
-};
-
-&hdmi_video {
- status = "okay";
-};
-
/*
* I2C: I2C3_SDA/SCL on SODIMM 194/196 (e.g. RTC on carrier
* board)
@@ -196,18 +184,6 @@
};
};
-/*
- * DDC_I2C: I2C2_SDA/SCL on extension connector pin 15/16
- */
-&i2cddc {
- status = "okay";
-
- hdmi_ddc: edid@50 {
- compatible = "fsl,imx6-hdmi-i2c";
- reg = <0x50>;
- };
-};
-
&iomuxc {
/*
* Mux all pins which are unused to be GPIOs
@@ -255,10 +231,6 @@
};
#endif
-&sound_hdmi {
- status = "okay";
-};
-
&uart1 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
index 866c943d1423..3e61d141cc1b 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 Toradex AG
+ * Copyright 2014-2018 Toradex AG
* Copyright 2012 Freescale Semiconductor, Inc.
* Copyright 2011 Linaro Ltd.
*
@@ -122,18 +122,6 @@
};
};
-&hdmi_audio {
- status = "okay";
-};
-
-&hdmi_core {
- status = "okay";
-};
-
-&hdmi_video {
- status = "okay";
-};
-
/*
* I2C: I2C3_SDA/SCL on SODIMM 194/196 (e.g. RTC on carrier
* board)
@@ -177,18 +165,6 @@
};
};
-/*
- * DDC_I2C: I2C2_SDA/SCL on extension connector pin 15/16
- */
-&i2cddc {
- status = "okay";
-
- hdmi_ddc: edid@50 {
- compatible = "fsl,imx6-hdmi-i2c";
- reg = <0x50>;
- };
-};
-
&iomuxc {
/*
* Mux all pins which are unused to be GPIOs
@@ -252,10 +228,6 @@
};
#endif
-&sound_hdmi {
- status = "okay";
-};
-
&uart1 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
index 4c10c62e6624..abc72e9600bb 100644
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -52,6 +52,12 @@
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
+
+ /* Extension connector pin 15/16 */
+ hdmi_ddc: edid@50 {
+ compatible = "fsl,imx6-hdmi-i2c";
+ reg = <0x50>;
+ };
};
lcd: lcd@0 {
@@ -145,12 +151,13 @@
mux-ext-port = <5>;
};
+ /* On-module HDMI interface */
sound_hdmi: sound-hdmi {
compatible = "fsl,imx6q-audio-hdmi",
"fsl,imx-audio-hdmi";
model = "imx-audio-hdmi";
hdmi-controller = <&hdmi_audio>;
- status = "disabled";
+ status = "okay";
};
sound_spdif: sound-spdif {
@@ -190,14 +197,14 @@
status = "okay";
};
-/* Colibri SDDIMM 55/63 */
+/* Colibri SODIMM 55/63 */
&can1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_flexcan1>;
status = "disabled";
};
-/* Colibri SODOMM 178/188 */
+/* Colibri SODIMM 178/188 */
&can2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_flexcan2>;
@@ -211,13 +218,13 @@
&hdmi_core {
ipu_id = <0>;
disp_id = <1>;
- status = "disabled";
+ status = "okay";
};
&hdmi_video {
fsl,phy_reg_vlev = <0x0294>;
fsl,phy_reg_cksymtx = <0x800d>;
- status = "disabled";
+ status = "okay";
};
&i2c2 {