Skip to content

Commit 1a9aae6

Browse files
lw-karoShawn Guo
lw-karo
authored and
Shawn Guo
committed
ARM: dts: imx6-tx6: move display configuration to .dtsi file
Currently the display (LCD or LVDS) configuration is duplicated with slight variations in each TX6 module specific file. Move it to an include file for simplification and consistency. Signed-off-by: Lothar Waßmann <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
1 parent 038ab10 commit 1a9aae6

17 files changed

+616
-1902
lines changed

‎arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts

Lines changed: 10 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014-2016 Lothar Waßmann <[email protected]>
2+
* Copyright 2014-2017 Lothar Waßmann <[email protected]>
33
*
44
* This file is dual-licensed: you can use it either under the terms
55
* of the GPL or the X11 license, at your option. Note that this dual
@@ -42,70 +42,16 @@
4242
/dts-v1/;
4343
#include "imx6dl.dtsi"
4444
#include "imx6qdl-tx6.dtsi"
45+
#include "imx6qdl-tx6-lcd.dtsi"
4546

4647
/ {
4748
model = "Ka-Ro electronics TX6DL Module on CoMpact TFT";
4849
compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
50+
};
4951

50-
aliases {
51-
display = &display;
52-
};
53-
54-
backlight: backlight {
55-
compatible = "pwm-backlight";
56-
pwms = <&pwm2 0 500000 0>;
57-
power-supply = <&reg_3v3>;
58-
/*
59-
* a poor man's way to create a 1:1 relationship between
60-
* the PWM value and the actual duty cycle
61-
*/
62-
brightness-levels = < 0 1 2 3 4 5 6 7 8 9
63-
10 11 12 13 14 15 16 17 18 19
64-
20 21 22 23 24 25 26 27 28 29
65-
30 31 32 33 34 35 36 37 38 39
66-
40 41 42 43 44 45 46 47 48 49
67-
50 51 52 53 54 55 56 57 58 59
68-
60 61 62 63 64 65 66 67 68 69
69-
70 71 72 73 74 75 76 77 78 79
70-
80 81 82 83 84 85 86 87 88 89
71-
90 91 92 93 94 95 96 97 98 99
72-
100>;
73-
default-brightness-level = <50>;
74-
};
75-
76-
display: disp0 {
77-
compatible = "fsl,imx-parallel-display";
78-
interface-pix-fmt = "rgb24";
79-
pinctrl-names = "default";
80-
pinctrl-0 = <&pinctrl_disp0_1>;
81-
status = "okay";
82-
83-
port {
84-
display0_in: endpoint {
85-
remote-endpoint = <&ipu1_di0_disp0>;
86-
};
87-
};
88-
89-
display-timings {
90-
native-mode = <&ET070001DM6>;
91-
92-
ET070001DM6: CoMTFT { /* same as ET0700 but with inverted pixel clock */
93-
clock-frequency = <33264000>;
94-
hactive = <800>;
95-
vactive = <480>;
96-
hback-porch = <88>;
97-
hsync-len = <128>;
98-
hfront-porch = <40>;
99-
vback-porch = <33>;
100-
vsync-len = <2>;
101-
vfront-porch = <10>;
102-
hsync-active = <0>;
103-
vsync-active = <0>;
104-
de-active = <1>;
105-
pixelclk-active = <1>;
106-
};
107-
};
108-
};
52+
&backlight {
53+
pwms = <&pwm2 0 500000 0>;
54+
/delete-property/ turn-on-delay-ms;
10955
};
11056

11157
&can1 {
@@ -116,14 +62,14 @@
11662
xceiver-supply = <&reg_3v3>;
11763
};
11864

119-
&ipu1_di0_disp0 {
120-
remote-endpoint = <&display0_in>;
121-
};
122-
12365
&kpp {
12466
status = "disabled";
12567
};
12668

69+
&lcd_panel {
70+
compatible = "edt,etm0700g0edh6";
71+
};
72+
12773
&reg_can_xcvr {
12874
status = "disabled";
12975
};

‎arch/arm/boot/dts/imx6dl-tx6s-8034.dts

Lines changed: 2 additions & 169 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2016 Lothar Waßmann <[email protected]>
2+
* Copyright 2015-2017 Lothar Waßmann <[email protected]>
33
*
44
* This file is dual-licensed: you can use it either under the terms
55
* of the GPL or the X11 license, at your option. Note that this dual
@@ -42,174 +42,15 @@
4242
/dts-v1/;
4343
#include "imx6dl.dtsi"
4444
#include "imx6qdl-tx6.dtsi"
45+
#include "imx6qdl-tx6-lcd.dtsi"
4546

4647
/ {
4748
model = "Ka-Ro electronics TX6S-8034 Module";
4849
compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
4950

50-
aliases {
51-
display = &display;
52-
ipu1 = &ipu1;
53-
};
54-
5551
cpus {
5652
/delete-node/ cpu@1;
5753
};
58-
59-
backlight: backlight {
60-
compatible = "pwm-backlight";
61-
pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
62-
pinctrl-names = "default";
63-
pinctrl-0 = <&pinctrl_lcd0_pwr>;
64-
enable-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>;
65-
power-supply = <&reg_lcd1_pwr>;
66-
/*
67-
* a poor man's way to create a 1:1 relationship between
68-
* the PWM value and the actual duty cycle
69-
*/
70-
brightness-levels = < 0 1 2 3 4 5 6 7 8 9
71-
10 11 12 13 14 15 16 17 18 19
72-
20 21 22 23 24 25 26 27 28 29
73-
30 31 32 33 34 35 36 37 38 39
74-
40 41 42 43 44 45 46 47 48 49
75-
50 51 52 53 54 55 56 57 58 59
76-
60 61 62 63 64 65 66 67 68 69
77-
70 71 72 73 74 75 76 77 78 79
78-
80 81 82 83 84 85 86 87 88 89
79-
90 91 92 93 94 95 96 97 98 99
80-
100>;
81-
default-brightness-level = <50>;
82-
};
83-
84-
display: disp0 {
85-
compatible = "fsl,imx-parallel-display";
86-
pinctrl-names = "default";
87-
pinctrl-0 = <&pinctrl_disp0_2>;
88-
interface-pix-fmt = "rgb24";
89-
status = "okay";
90-
91-
port {
92-
display0_in: endpoint {
93-
remote-endpoint = <&ipu1_di0_disp0>;
94-
};
95-
};
96-
97-
display-timings {
98-
native-mode = <&vga>;
99-
100-
vga: VGA {
101-
clock-frequency = <25200000>;
102-
hactive = <640>;
103-
vactive = <480>;
104-
hback-porch = <48>;
105-
hsync-len = <96>;
106-
hfront-porch = <16>;
107-
vback-porch = <31>;
108-
vsync-len = <2>;
109-
vfront-porch = <12>;
110-
hsync-active = <0>;
111-
vsync-active = <0>;
112-
de-active = <1>;
113-
pixelclk-active = <0>;
114-
};
115-
116-
ETV570 {
117-
clock-frequency = <25200000>;
118-
hactive = <640>;
119-
vactive = <480>;
120-
hback-porch = <114>;
121-
hsync-len = <30>;
122-
hfront-porch = <16>;
123-
vback-porch = <32>;
124-
vsync-len = <3>;
125-
vfront-porch = <10>;
126-
hsync-active = <0>;
127-
vsync-active = <0>;
128-
de-active = <1>;
129-
pixelclk-active = <0>;
130-
};
131-
132-
ET0350 {
133-
clock-frequency = <6413760>;
134-
hactive = <320>;
135-
vactive = <240>;
136-
hback-porch = <34>;
137-
hsync-len = <34>;
138-
hfront-porch = <20>;
139-
vback-porch = <15>;
140-
vsync-len = <3>;
141-
vfront-porch = <4>;
142-
hsync-active = <0>;
143-
vsync-active = <0>;
144-
de-active = <1>;
145-
pixelclk-active = <0>;
146-
};
147-
148-
ET0430 {
149-
clock-frequency = <9009000>;
150-
hactive = <480>;
151-
vactive = <272>;
152-
hback-porch = <2>;
153-
hsync-len = <41>;
154-
hfront-porch = <2>;
155-
vback-porch = <2>;
156-
vsync-len = <10>;
157-
vfront-porch = <2>;
158-
hsync-active = <0>;
159-
vsync-active = <0>;
160-
de-active = <1>;
161-
pixelclk-active = <1>;
162-
};
163-
164-
ET0500 {
165-
clock-frequency = <33264000>;
166-
hactive = <800>;
167-
vactive = <480>;
168-
hback-porch = <88>;
169-
hsync-len = <128>;
170-
hfront-porch = <40>;
171-
vback-porch = <33>;
172-
vsync-len = <2>;
173-
vfront-porch = <10>;
174-
hsync-active = <0>;
175-
vsync-active = <0>;
176-
de-active = <1>;
177-
pixelclk-active = <0>;
178-
};
179-
180-
ET0700 { /* same as ET0500 */
181-
clock-frequency = <33264000>;
182-
hactive = <800>;
183-
vactive = <480>;
184-
hback-porch = <88>;
185-
hsync-len = <128>;
186-
hfront-porch = <40>;
187-
vback-porch = <33>;
188-
vsync-len = <2>;
189-
vfront-porch = <10>;
190-
hsync-active = <0>;
191-
vsync-active = <0>;
192-
de-active = <1>;
193-
pixelclk-active = <0>;
194-
};
195-
196-
ETQ570 {
197-
clock-frequency = <6596040>;
198-
hactive = <320>;
199-
vactive = <240>;
200-
hback-porch = <38>;
201-
hsync-len = <30>;
202-
hfront-porch = <30>;
203-
vback-porch = <16>;
204-
vsync-len = <3>;
205-
vfront-porch = <4>;
206-
hsync-active = <0>;
207-
vsync-active = <0>;
208-
de-active = <1>;
209-
pixelclk-active = <0>;
210-
};
211-
};
212-
};
21354
};
21455

21556
&ds1339 {
@@ -227,11 +68,3 @@
22768
MX6QDL_PAD_SD3_CMD__GPIO7_IO02 0x170b0 /* SD1 CD */
22869
>;
22970
};
230-
231-
&ipu1_di0_disp0 {
232-
remote-endpoint = <&display0_in>;
233-
};
234-
235-
&reg_lcd0_pwr {
236-
status = "disabled";
237-
};

0 commit comments

Comments
 (0)