Skip to content

Commit 93a0138

Browse files
trinitrini
committed
Merge tag 'v2024.01-rc6' into next
Prepare v2024.01-rc6
2 parents dffa6d0 + 80cb22c commit 93a0138

35 files changed

+1287
-920
lines changed

‎.get_maintainer.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
--find-maintainer-files --maintainer-path=.
1+
--find-maintainer-files --git --maintainer-path=.

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
VERSION = 2024
44
PATCHLEVEL = 01
55
SUBLEVEL =
6-
EXTRAVERSION = -rc5
6+
EXTRAVERSION = -rc6
77
NAME =
88

99
# *DOCUMENTATION*

‎arch/arm/dts/imx8mm-data-modul-edm-sbc-u-boot.dtsi

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,59 @@
7777

7878
&gpio2 {
7979
bootph-pre-ram;
80+
81+
dsi-reset-hog {
82+
bootph-pre-ram;
83+
gpio-hog;
84+
output-high;
85+
gpios = <2 GPIO_ACTIVE_LOW>;
86+
line-name = "DSI_RESET_1V8#";
87+
};
88+
89+
90+
dsi-irq-hog {
91+
bootph-pre-ram;
92+
gpio-hog;
93+
input;
94+
gpios = <3 GPIO_ACTIVE_LOW>;
95+
line-name = "DSI_IRQ_1V8#";
96+
};
97+
98+
graphics-prsnt-hog {
99+
bootph-pre-ram;
100+
gpio-hog;
101+
input;
102+
gpios = <7 GPIO_ACTIVE_LOW>;
103+
line-name = "GRAPHICS_PRSNT_1V8#";
104+
};
80105
};
81106

82107
&gpio3 {
83108
bootph-pre-ram;
109+
110+
bl-enable-hog {
111+
bootph-pre-ram;
112+
gpio-hog;
113+
output-low;
114+
gpios = <0 GPIO_ACTIVE_HIGH>;
115+
line-name = "BL_ENABLE_1V8";
116+
};
117+
118+
tft-enable-hog {
119+
bootph-pre-ram;
120+
gpio-hog;
121+
output-low;
122+
gpios = <6 GPIO_ACTIVE_HIGH>;
123+
line-name = "TFT_ENABLE_1V8";
124+
};
125+
126+
graphics-gpio0-hog {
127+
bootph-pre-ram;
128+
gpio-hog;
129+
input;
130+
gpios = <7 GPIO_ACTIVE_HIGH>;
131+
line-name = "GRAPHICS_GPIO0_1V8";
132+
};
84133
};
85134

86135
&gpio4 {

‎arch/arm/dts/imx8mp-data-modul-edm-sbc-u-boot.dtsi

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,58 @@
6767

6868
&gpio3 {
6969
bootph-pre-ram;
70+
71+
bl-enable-hog {
72+
bootph-pre-ram;
73+
gpio-hog;
74+
output-low;
75+
gpios = <0 GPIO_ACTIVE_HIGH>;
76+
line-name = "BL_ENABLE_1V8";
77+
};
78+
79+
tft-enable-hog {
80+
bootph-pre-ram;
81+
gpio-hog;
82+
output-low;
83+
gpios = <6 GPIO_ACTIVE_HIGH>;
84+
line-name = "TFT_ENABLE_1V8";
85+
};
86+
87+
graphics-gpio0-hog {
88+
bootph-pre-ram;
89+
gpio-hog;
90+
input;
91+
gpios = <7 GPIO_ACTIVE_HIGH>;
92+
line-name = "GRAPHICS_GPIO0_1V8";
93+
};
7094
};
7195

7296
&gpio4 {
7397
bootph-pre-ram;
98+
99+
dsi-reset-hog {
100+
bootph-pre-ram;
101+
gpio-hog;
102+
output-high;
103+
gpios = <0 GPIO_ACTIVE_LOW>;
104+
line-name = "DSI_RESET_1V8#";
105+
};
106+
107+
graphics-prsnt-hog {
108+
bootph-pre-ram;
109+
gpio-hog;
110+
input;
111+
gpios = <18 GPIO_ACTIVE_LOW>;
112+
line-name = "GRAPHICS_PRSNT_1V8#";
113+
};
114+
115+
dsi-irq-hog {
116+
bootph-pre-ram;
117+
gpio-hog;
118+
input;
119+
gpios = <19 GPIO_ACTIVE_LOW>;
120+
line-name = "DSI_IRQ_1V8#";
121+
};
74122
};
75123

76124
&gpio5 {

0 commit comments

Comments
 (0)