1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
From 9388d08644b2397682db8d5cfce894e42e128999 Mon Sep 17 00:00:00 2001
From: Valentin Raevsky <valentin@compulab.co.il>
Date: Thu, 9 Apr 2015 13:30:42 +0300
Subject: [PATCH 57/59] ARM: dts: cm-fx6: fix missing defines
Fix missing defines that have been changed since 3.10.17
Signed-off-by: Valentin Raevsky <valentin@compulab.co.il>
---
arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi b/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi
index cff8d4e..e8f80bc 100644
--- a/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi
@@ -182,6 +182,10 @@
compatible = "fsl,mxc_v4l2_output";
status = "okay";
};
+
+ pu_dummy: pudummy_reg {
+ compatible = "fsl,imx6-dummy-pureg"; /* only used in ldo-bypass */
+ };
};
&iomuxc {
@@ -397,6 +401,26 @@
MX6QDL_PAD_GPIO_5__CCM_CLKO1 0x17059
>;
};
+
+ pinctrl_hdmi_hdcp: hdmihdcpgrp {
+ fsl,pins = <
+ MX6QDL_PAD_KEY_COL3__HDMI_TX_DDC_SCL 0x4001b8b1
+ MX6QDL_PAD_KEY_ROW3__HDMI_TX_DDC_SDA 0x4001b8b1
+ >;
+ };
+
+ pinctrl_pwm3_1: pwm3grp-1 {
+ fsl,pins = <
+ MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1
+ >;
+ };
+
+ pinctrl_flexcan1_1: flexcan1grp-1 {
+ fsl,pins = <
+ MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x80000000
+ MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX 0x80000000
+ >;
+ };
};
};
@@ -583,7 +607,7 @@
&hdmi_video {
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_hdmi_hdcp_1>;
+ pinctrl-0 = <&pinctrl_hdmi_hdcp>;
fsl,hdcp;
status = "okay";
};
--
1.7.9.5
|
