Revert "arm64: dts: tegra: Fix boolean properties with values"

This reverts commit 1a67653de0dd, 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 <thierry.reding@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi b/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
index 1df84335925b59204f198d795b3cffc02cb58328..aff857df25cf4c35ec71bad4c896be4e7a5b485c 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
@@ -262,25 +262,25 @@
                                        gpio4 {
                                                pins = "gpio4";
                                                function = "32k-out1";
-                                               drive-push-pull;
+                                               drive-push-pull = <1>;
                                        };
 
                                        gpio5 {
                                                pins = "gpio5";
                                                function = "gpio";
-                                               drive-push-pull;
+                                               drive-push-pull = <0>;
                                        };
 
                                        gpio6 {
                                                pins = "gpio6";
                                                function = "gpio";
-                                               drive-push-pull;
+                                               drive-push-pull = <1>;
                                        };
 
                                        gpio7 {
                                                pins = "gpio7";
                                                function = "gpio";
-                                               drive-push-pull;
+                                               drive-push-pull = <0>;
                                        };
                                };
 

diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p3509-0000+p3636-0001.dts b/arch/arm64/boot/dts/nvidia/tegra186-p3509-0000+p3636-0001.dts
index 1ab132c152bb9e22c3ed1a8d64605e8f693a8df9..4631504c3c7a6456416a1df7757b0a72a0d4362f 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra186-p3509-0000+p3636-0001.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra186-p3509-0000+p3636-0001.dts
@@ -462,25 +462,25 @@
                                        gpio4 {
                                                pins = "gpio4";
                                                function = "32k-out1";
-                                               drive-push-pull;
+                                               drive-push-pull = <1>;
                                        };
 
                                        gpio5 {
                                                pins = "gpio5";
                                                function = "gpio";
-                                               drive-push-pull;
+                                               drive-push-pull = <0>;
                                        };
 
                                        gpio6 {
                                                pins = "gpio6";
                                                function = "gpio";
-                                               drive-push-pull;
+                                               drive-push-pull = <1>;
                                        };
 
                                        gpio7 {
                                                pins = "gpio7";
                                                function = "gpio";
-                                               drive-push-pull;
+                                               drive-push-pull = <1>;
                                        };
                                };
 

diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
index 634d0f493c2e8f938d8e63eab4066955389cc061..a7d7cfd66379f305173a5d81e59c1421f85ae93e 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
@@ -174,19 +174,19 @@
                                        gpio4 {
                                                pins = "gpio4";
                                                function = "32k-out1";
-                                               drive-push-pull;
+                                               drive-push-pull = <1>;
                                        };
 
                                        gpio6 {
                                                pins = "gpio6";
                                                function = "gpio";
-                                               drive-push-pull;
+                                               drive-push-pull = <1>;
                                        };
 
                                        gpio7 {
                                                pins = "gpio7";
                                                function = "gpio";
-                                               drive-push-pull;
+                                               drive-push-pull = <0>;
                                        };
                                };
 

diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi
index 0b219e72765edbfdd683325defa6f0b69cf5945e..0bd66f9c620b92f1370e3db4a61116e86f6a57c4 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi
@@ -148,19 +148,19 @@
                                        gpio4 {
                                                pins = "gpio4";
                                                function = "32k-out1";
-                                               drive-push-pull;
+                                               drive-push-pull = <1>;
                                        };
 
                                        gpio6 {
                                                pins = "gpio6";
                                                function = "gpio";
-                                               drive-push-pull;
+                                               drive-push-pull = <1>;
                                        };
 
                                        gpio7 {
                                                pins = "gpio7";
                                                function = "gpio";
-                                               drive-push-pull;
+                                               drive-push-pull = <0>;
                                        };
                                };
 

diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi
index 0fe772b04bd02242511c89ca808c42083aca344c..75eb743a724270230a5f3f7b18163596b15b914e 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi
@@ -59,7 +59,7 @@
                                gpio1 {
                                        pins = "gpio1";
                                        function = "fps-out";
-                                       drive-push-pull;
+                                       drive-push-pull = <1>;
                                        maxim,active-fps-source = <MAX77620_FPS_SRC_0>;
                                        maxim,active-fps-power-up-slot = <7>;
                                        maxim,active-fps-power-down-slot = <0>;
@@ -68,7 +68,7 @@
                                gpio2_3 {
                                        pins = "gpio2", "gpio3";
                                        function = "fps-out";
-                                       drive-open-drain;
+                                       drive-open-drain = <1>;
                                        maxim,active-fps-source = <MAX77620_FPS_SRC_0>;
                                };
 
@@ -80,7 +80,7 @@
                                gpio5_6_7 {
                                        pins = "gpio5", "gpio6", "gpio7";
                                        function = "gpio";
-                                       drive-push-pull;
+                                       drive-push-pull = <1>;
                                };
                        };
 

diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi
index 936a309e288c3ecf090afeb51e438b40f8d50a48..10347b6e6e8478f9130b5952b1b8d2a8bde40e6f 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi
@@ -1351,7 +1351,7 @@
                                gpio1 {
                                        pins = "gpio1";
                                        function = "fps-out";
-                                       drive-push-pull;
+                                       drive-push-pull = <1>;
                                        maxim,active-fps-source = <MAX77620_FPS_SRC_0>;
                                        maxim,active-fps-power-up-slot = <7>;
                                        maxim,active-fps-power-down-slot = <0>;
@@ -1360,14 +1360,14 @@
                                gpio2 {
                                        pins = "gpio2";
                                        function = "fps-out";
-                                       drive-open-drain;
+                                       drive-open-drain = <1>;
                                        maxim,active-fps-source = <MAX77620_FPS_SRC_0>;
                                };
 
                                gpio3 {
                                        pins = "gpio3";
                                        function = "fps-out";
-                                       drive-open-drain;
+                                       drive-open-drain = <1>;
                                        maxim,active-fps-source = <MAX77620_FPS_SRC_0>;
                                };
 
@@ -1379,7 +1379,7 @@
                                gpio5_6_7 {
                                        pins = "gpio5", "gpio6", "gpio7";
                                        function = "gpio";
-                                       drive-push-pull;
+                                       drive-push-pull = <1>;
                                };
                        };
 

diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts b/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts
index f6446120c26725bb905759b08d2e886938e7d715..72c2dc3c14eac4dc9df481ccbb4cc5b5b5e84f82 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts
@@ -195,7 +195,7 @@
                                gpio1 {
                                        pins = "gpio1";
                                        function = "fps-out";
-                                       drive-push-pull;
+                                       drive-push-pull = <1>;
                                        maxim,active-fps-source = <MAX77620_FPS_SRC_NONE>;
                                        maxim,active-fps-power-up-slot = <0>;
                                        maxim,active-fps-power-down-slot = <7>;
@@ -204,7 +204,7 @@
                                gpio2 {
                                        pins = "gpio2";
                                        function = "fps-out";
-                                       drive-open-drain;
+                                       drive-open-drain = <1>;
                                        maxim,active-fps-source = <MAX77620_FPS_SRC_0>;
                                        maxim,active-fps-power-up-slot = <0>;
                                        maxim,active-fps-power-down-slot = <7>;
@@ -213,7 +213,7 @@
                                gpio3 {
                                        pins = "gpio3";
                                        function = "fps-out";
-                                       drive-open-drain;
+                                       drive-open-drain = <1>;
                                        maxim,active-fps-source = <MAX77620_FPS_SRC_0>;
                                        maxim,active-fps-power-up-slot = <4>;
                                        maxim,active-fps-power-down-slot = <3>;
@@ -227,7 +227,7 @@
                                gpio5_6_7 {
                                        pins = "gpio5", "gpio6", "gpio7";
                                        function = "gpio";
-                                       drive-push-pull;
+                                       drive-push-pull = <1>;
                                };
                        };
 

diff --git a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
index e42384f097d64847652d991acfb2631ce48fd906..a263d51882ee766ac6061eb6c812a4075458d915 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
@@ -1386,7 +1386,7 @@
                                gpio3 {
                                        pins = "gpio3";
                                        function = "fps-out";
-                                       drive-open-drain;
+                                       drive-open-drain = <1>;
                                        maxim,active-fps-source = <MAX77620_FPS_SRC_0>;
                                        maxim,active-fps-power-up-slot = <4>;
                                        maxim,active-fps-power-down-slot = <2>;
@@ -1395,7 +1395,7 @@
                                gpio5_6 {
                                        pins = "gpio5", "gpio6";
                                        function = "gpio";
-                                       drive-push-pull;
+                                       drive-push-pull = <1>;
                                };
 
                                gpio4 {