Skip to content

Commit 2f477ee

Browse files
arndbarndb
committed
Revert "arm64: dts: tegra: Fix boolean properties with values"
This reverts commit 1a67653, which caused a boot regression. The behavior of the "drive-push-pull" in the kernel does not match what the binding document describes. Revert Rob's patch to make the DT match the kernel again, rather than the binding. Link: https://lore.kernel.org/lkml/YlVAy95eF%2F9b1nmu@orome/ Reported-by: Thierry Reding <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
1 parent 846e24d commit 2f477ee

File tree

8 files changed

+27
-27
lines changed

8 files changed

+27
-27
lines changed

‎arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -262,25 +262,25 @@
262262
gpio4 {
263263
pins = "gpio4";
264264
function = "32k-out1";
265-
drive-push-pull;
265+
drive-push-pull = <1>;
266266
};
267267

268268
gpio5 {
269269
pins = "gpio5";
270270
function = "gpio";
271-
drive-push-pull;
271+
drive-push-pull = <0>;
272272
};
273273

274274
gpio6 {
275275
pins = "gpio6";
276276
function = "gpio";
277-
drive-push-pull;
277+
drive-push-pull = <1>;
278278
};
279279

280280
gpio7 {
281281
pins = "gpio7";
282282
function = "gpio";
283-
drive-push-pull;
283+
drive-push-pull = <0>;
284284
};
285285
};
286286

‎arch/arm64/boot/dts/nvidia/tegra186-p3509-0000+p3636-0001.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -462,25 +462,25 @@
462462
gpio4 {
463463
pins = "gpio4";
464464
function = "32k-out1";
465-
drive-push-pull;
465+
drive-push-pull = <1>;
466466
};
467467

468468
gpio5 {
469469
pins = "gpio5";
470470
function = "gpio";
471-
drive-push-pull;
471+
drive-push-pull = <0>;
472472
};
473473

474474
gpio6 {
475475
pins = "gpio6";
476476
function = "gpio";
477-
drive-push-pull;
477+
drive-push-pull = <1>;
478478
};
479479

480480
gpio7 {
481481
pins = "gpio7";
482482
function = "gpio";
483-
drive-push-pull;
483+
drive-push-pull = <1>;
484484
};
485485
};
486486

‎arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,19 +174,19 @@
174174
gpio4 {
175175
pins = "gpio4";
176176
function = "32k-out1";
177-
drive-push-pull;
177+
drive-push-pull = <1>;
178178
};
179179

180180
gpio6 {
181181
pins = "gpio6";
182182
function = "gpio";
183-
drive-push-pull;
183+
drive-push-pull = <1>;
184184
};
185185

186186
gpio7 {
187187
pins = "gpio7";
188188
function = "gpio";
189-
drive-push-pull;
189+
drive-push-pull = <0>;
190190
};
191191
};
192192

‎arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,19 +148,19 @@
148148
gpio4 {
149149
pins = "gpio4";
150150
function = "32k-out1";
151-
drive-push-pull;
151+
drive-push-pull = <1>;
152152
};
153153

154154
gpio6 {
155155
pins = "gpio6";
156156
function = "gpio";
157-
drive-push-pull;
157+
drive-push-pull = <1>;
158158
};
159159

160160
gpio7 {
161161
pins = "gpio7";
162162
function = "gpio";
163-
drive-push-pull;
163+
drive-push-pull = <0>;
164164
};
165165
};
166166

‎arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
gpio1 {
6060
pins = "gpio1";
6161
function = "fps-out";
62-
drive-push-pull;
62+
drive-push-pull = <1>;
6363
maxim,active-fps-source = <MAX77620_FPS_SRC_0>;
6464
maxim,active-fps-power-up-slot = <7>;
6565
maxim,active-fps-power-down-slot = <0>;
@@ -68,7 +68,7 @@
6868
gpio2_3 {
6969
pins = "gpio2", "gpio3";
7070
function = "fps-out";
71-
drive-open-drain;
71+
drive-open-drain = <1>;
7272
maxim,active-fps-source = <MAX77620_FPS_SRC_0>;
7373
};
7474

@@ -80,7 +80,7 @@
8080
gpio5_6_7 {
8181
pins = "gpio5", "gpio6", "gpio7";
8282
function = "gpio";
83-
drive-push-pull;
83+
drive-push-pull = <1>;
8484
};
8585
};
8686

‎arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1351,7 +1351,7 @@
13511351
gpio1 {
13521352
pins = "gpio1";
13531353
function = "fps-out";
1354-
drive-push-pull;
1354+
drive-push-pull = <1>;
13551355
maxim,active-fps-source = <MAX77620_FPS_SRC_0>;
13561356
maxim,active-fps-power-up-slot = <7>;
13571357
maxim,active-fps-power-down-slot = <0>;
@@ -1360,14 +1360,14 @@
13601360
gpio2 {
13611361
pins = "gpio2";
13621362
function = "fps-out";
1363-
drive-open-drain;
1363+
drive-open-drain = <1>;
13641364
maxim,active-fps-source = <MAX77620_FPS_SRC_0>;
13651365
};
13661366

13671367
gpio3 {
13681368
pins = "gpio3";
13691369
function = "fps-out";
1370-
drive-open-drain;
1370+
drive-open-drain = <1>;
13711371
maxim,active-fps-source = <MAX77620_FPS_SRC_0>;
13721372
};
13731373

@@ -1379,7 +1379,7 @@
13791379
gpio5_6_7 {
13801380
pins = "gpio5", "gpio6", "gpio7";
13811381
function = "gpio";
1382-
drive-push-pull;
1382+
drive-push-pull = <1>;
13831383
};
13841384
};
13851385

‎arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
gpio1 {
196196
pins = "gpio1";
197197
function = "fps-out";
198-
drive-push-pull;
198+
drive-push-pull = <1>;
199199
maxim,active-fps-source = <MAX77620_FPS_SRC_NONE>;
200200
maxim,active-fps-power-up-slot = <0>;
201201
maxim,active-fps-power-down-slot = <7>;
@@ -204,7 +204,7 @@
204204
gpio2 {
205205
pins = "gpio2";
206206
function = "fps-out";
207-
drive-open-drain;
207+
drive-open-drain = <1>;
208208
maxim,active-fps-source = <MAX77620_FPS_SRC_0>;
209209
maxim,active-fps-power-up-slot = <0>;
210210
maxim,active-fps-power-down-slot = <7>;
@@ -213,7 +213,7 @@
213213
gpio3 {
214214
pins = "gpio3";
215215
function = "fps-out";
216-
drive-open-drain;
216+
drive-open-drain = <1>;
217217
maxim,active-fps-source = <MAX77620_FPS_SRC_0>;
218218
maxim,active-fps-power-up-slot = <4>;
219219
maxim,active-fps-power-down-slot = <3>;
@@ -227,7 +227,7 @@
227227
gpio5_6_7 {
228228
pins = "gpio5", "gpio6", "gpio7";
229229
function = "gpio";
230-
drive-push-pull;
230+
drive-push-pull = <1>;
231231
};
232232
};
233233

‎arch/arm64/boot/dts/nvidia/tegra210-smaug.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1386,7 +1386,7 @@
13861386
gpio3 {
13871387
pins = "gpio3";
13881388
function = "fps-out";
1389-
drive-open-drain;
1389+
drive-open-drain = <1>;
13901390
maxim,active-fps-source = <MAX77620_FPS_SRC_0>;
13911391
maxim,active-fps-power-up-slot = <4>;
13921392
maxim,active-fps-power-down-slot = <2>;
@@ -1395,7 +1395,7 @@
13951395
gpio5_6 {
13961396
pins = "gpio5", "gpio6";
13971397
function = "gpio";
1398-
drive-push-pull;
1398+
drive-push-pull = <1>;
13991399
};
14001400

14011401
gpio4 {

0 commit comments

Comments
 (0)