xilinx: dts: Fix open drain warning on Zynq, ZynqMP and Versal

Fix for below open drain warning on Zynq, ZynqMP and Versal reported by
Linux.
"enforced open drain please flag it properly in DT/ACPI DSDT/board
file."

Signed-off-by: Manikanta Guntupalli <manikanta.guntupalli@amd.com>
Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/056b6f60f89fa2addb762669b80640cd5b31b001.1688992653.git.michal.simek@amd.com

diff --git a/arch/arm/dts/zynq-zc702.dts b/arch/arm/dts/zynq-zc702.dts
index 27fb194..8d47f24 100644 (file)
--- a/arch/arm/dts/zynq-zc702.dts
+++ b/arch/arm/dts/zynq-zc702.dts
@@ -5,6 +5,7 @@
  */
 /dts-v1/;
 #include "zynq-7000.dtsi"
+#include <dt-bindings/gpio/gpio.h>
 
 / {
        model = "Xilinx ZC702 board";
@@ -102,8 +103,8 @@
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c0_default>;
        pinctrl-1 = <&pinctrl_i2c0_gpio>;
-       scl-gpios = <&gpio0 50 0>;
-       sda-gpios = <&gpio0 51 0>;
+       scl-gpios = <&gpio0 50 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio0 51 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 
        i2c-mux@74 {
                compatible = "nxp,pca9548";

diff --git a/arch/arm/dts/zynqmp-g-a2197-00-revA.dts b/arch/arm/dts/zynqmp-g-a2197-00-revA.dts
index b185669..1114240 100644 (file)
--- a/arch/arm/dts/zynqmp-g-a2197-00-revA.dts
+++ b/arch/arm/dts/zynqmp-g-a2197-00-revA.dts
@@ -131,8 +131,8 @@
 &i2c0 { /* MIO 34-35 - can't stay here */
        status = "okay";
        clock-frequency = <400000>;
-       scl-gpios = <&gpio 34 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
+       scl-gpios = <&gpio 34 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 35 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
        i2c-mux@74 { /* u94 */
                compatible = "nxp,pca9548";
                #address-cells = <1>;

diff --git a/arch/arm/dts/zynqmp-sck-kr-g-revA.dts b/arch/arm/dts/zynqmp-sck-kr-g-revA.dts
index 9534760..5ac66bc 100644 (file)
--- a/arch/arm/dts/zynqmp-sck-kr-g-revA.dts
+++ b/arch/arm/dts/zynqmp-sck-kr-g-revA.dts
@@ -68,8 +68,8 @@
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c1_default>;
        pinctrl-1 = <&pinctrl_i2c1_gpio>;
-       scl-gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;
+       scl-gpios = <&gpio 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 
        u14: ina260@40 { /* u14 */
                compatible = "ti,ina260";

diff --git a/arch/arm/dts/zynqmp-sck-kr-g-revB.dts b/arch/arm/dts/zynqmp-sck-kr-g-revB.dts
index 26ac540..401de9e 100644 (file)
--- a/arch/arm/dts/zynqmp-sck-kr-g-revB.dts
+++ b/arch/arm/dts/zynqmp-sck-kr-g-revB.dts
@@ -68,8 +68,8 @@
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c1_default>;
        pinctrl-1 = <&pinctrl_i2c1_gpio>;
-       scl-gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;
+       scl-gpios = <&gpio 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 
        u14: ina260@40 { /* u14 */
                compatible = "ti,ina260";

diff --git a/arch/arm/dts/zynqmp-sck-kv-g-revA.dts b/arch/arm/dts/zynqmp-sck-kv-g-revA.dts
index 2b6c394..8229244 100644 (file)
--- a/arch/arm/dts/zynqmp-sck-kv-g-revA.dts
+++ b/arch/arm/dts/zynqmp-sck-kv-g-revA.dts
@@ -34,8 +34,8 @@
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c1_default>;
        pinctrl-1 = <&pinctrl_i2c1_gpio>;
-       scl-gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;
+       scl-gpios = <&gpio 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 
        u14: ina260@40 { /* u14 */
                compatible = "ti,ina260";

diff --git a/arch/arm/dts/zynqmp-sck-kv-g-revB.dts b/arch/arm/dts/zynqmp-sck-kv-g-revB.dts
index 308d787..96a5121 100644 (file)
--- a/arch/arm/dts/zynqmp-sck-kv-g-revB.dts
+++ b/arch/arm/dts/zynqmp-sck-kv-g-revB.dts
@@ -28,8 +28,8 @@
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c1_default>;
        pinctrl-1 = <&pinctrl_i2c1_gpio>;
-       scl-gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;
+       scl-gpios = <&gpio 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 
        u14: ina260@40 { /* u14 */
                compatible = "ti,ina260";

diff --git a/arch/arm/dts/zynqmp-sm-k26-revA.dts b/arch/arm/dts/zynqmp-sm-k26-revA.dts
index e9ec4b7..4b88b57 100644 (file)
--- a/arch/arm/dts/zynqmp-sm-k26-revA.dts
+++ b/arch/arm/dts/zynqmp-sm-k26-revA.dts
@@ -267,8 +267,8 @@
        status = "okay";
        bootph-all;
        clock-frequency = <400000>;
-       scl-gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;
+       scl-gpios = <&gpio 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 
        eeprom: eeprom@50 { /* u46 - also at address 0x58 */
                bootph-all;

diff --git a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
index b663651..cffad44 100644 (file)
--- a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
+++ b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
@@ -118,8 +118,8 @@
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c1_default>;
        pinctrl-1 = <&pinctrl_i2c1_gpio>;
-       scl-gpios = <&gpio 36 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;
+       scl-gpios = <&gpio 36 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 37 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 
        eeprom: eeprom@55 {
                compatible = "atmel,24c64"; /* 24AA64 */

diff --git a/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts b/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts
index 9d0cf11..bb04778 100644 (file)
--- a/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts
+++ b/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts
@@ -109,8 +109,8 @@
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c0_default>;
        pinctrl-1 = <&pinctrl_i2c0_gpio>;
-       scl-gpios = <&gpio 6 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
+       scl-gpios = <&gpio 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 7 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 
        tca6416_u26: gpio@20 {
                compatible = "ti,tca6416";

diff --git a/arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts b/arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts
index 7f973fc..74a5b02 100644 (file)
--- a/arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts
+++ b/arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts
@@ -91,8 +91,8 @@
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c0_default>;
        pinctrl-1 = <&pinctrl_i2c0_gpio>;
-       scl-gpios = <&gpio 74 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 75 GPIO_ACTIVE_HIGH>;
+       scl-gpios = <&gpio 74 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 75 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 };
 
 &i2c1 {
@@ -100,8 +100,8 @@
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c1_default>;
        pinctrl-1 = <&pinctrl_i2c1_gpio>;
-       scl-gpios = <&gpio 76 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 77 GPIO_ACTIVE_HIGH>;
+       scl-gpios = <&gpio 76 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 77 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 
 };
 

diff --git a/arch/arm/dts/zynqmp-zcu100-revC.dts b/arch/arm/dts/zynqmp-zcu100-revC.dts
index 116037d..78c3250 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu100-revC.dts
+++ b/arch/arm/dts/zynqmp-zcu100-revC.dts
@@ -188,8 +188,8 @@
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c1_default>;
        pinctrl-1 = <&pinctrl_i2c1_gpio>;
-       scl-gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
+       scl-gpios = <&gpio 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
        clock-frequency = <100000>;
        i2c-mux@75 { /* u11 */
                compatible = "nxp,pca9548";

diff --git a/arch/arm/dts/zynqmp-zcu102-revA.dts b/arch/arm/dts/zynqmp-zcu102-revA.dts
index 8823eb2..79d67c4 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu102-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu102-revA.dts
@@ -232,8 +232,8 @@
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c0_default>;
        pinctrl-1 = <&pinctrl_i2c0_gpio>;
-       scl-gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
+       scl-gpios = <&gpio 14 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 15 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 
        tca6416_u97: gpio@20 {
                compatible = "ti,tca6416";
@@ -496,8 +496,8 @@
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c1_default>;
        pinctrl-1 = <&pinctrl_i2c1_gpio>;
-       scl-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
+       scl-gpios = <&gpio 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 
        /* PL i2c via PCA9306 - u45 */
        i2c-mux@74 { /* u34 */

diff --git a/arch/arm/dts/zynqmp-zcu104-revA.dts b/arch/arm/dts/zynqmp-zcu104-revA.dts
index 92e01ac..90fbfca 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu104-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu104-revA.dts
@@ -139,8 +139,8 @@
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c1_default>;
        pinctrl-1 = <&pinctrl_i2c1_gpio>;
-       scl-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
+       scl-gpios = <&gpio 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 
        /* Another connection to this bus via PL i2c via PCA9306 - u45 */
        i2c-mux@74 { /* u34 */

diff --git a/arch/arm/dts/zynqmp-zcu104-revC.dts b/arch/arm/dts/zynqmp-zcu104-revC.dts
index c61d8b1..69470f8 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu104-revC.dts
+++ b/arch/arm/dts/zynqmp-zcu104-revC.dts
@@ -144,8 +144,8 @@
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c1_default>;
        pinctrl-1 = <&pinctrl_i2c1_gpio>;
-       scl-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
+       scl-gpios = <&gpio 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 
        tca6416_u97: gpio@20 {
                compatible = "ti,tca6416";

diff --git a/arch/arm/dts/zynqmp-zcu106-revA.dts b/arch/arm/dts/zynqmp-zcu106-revA.dts
index 67775ec..7a8094a 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu106-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu106-revA.dts
@@ -232,8 +232,8 @@
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c0_default>;
        pinctrl-1 = <&pinctrl_i2c0_gpio>;
-       scl-gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
+       scl-gpios = <&gpio 14 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 15 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 
        tca6416_u97: gpio@20 {
                compatible = "ti,tca6416";
@@ -495,8 +495,8 @@
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c1_default>;
        pinctrl-1 = <&pinctrl_i2c1_gpio>;
-       scl-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
+       scl-gpios = <&gpio 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 
        /* PL i2c via PCA9306 - u45 */
        i2c-mux@74 { /* u34 */

diff --git a/arch/arm/dts/zynqmp-zcu111-revA.dts b/arch/arm/dts/zynqmp-zcu111-revA.dts
index 7fc1aa2..c9ff99f 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu111-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu111-revA.dts
@@ -204,8 +204,8 @@
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c0_default>;
        pinctrl-1 = <&pinctrl_i2c0_gpio>;
-       scl-gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
+       scl-gpios = <&gpio 14 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 15 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 
        tca6416_u22: gpio@20 {
                compatible = "ti,tca6416";
@@ -384,8 +384,8 @@
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c1_default>;
        pinctrl-1 = <&pinctrl_i2c1_gpio>;
-       scl-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
+       scl-gpios = <&gpio 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 
        i2c-mux@74 { /* u26 */
                compatible = "nxp,pca9548";

diff --git a/arch/arm/dts/zynqmp-zcu208-revA.dts b/arch/arm/dts/zynqmp-zcu208-revA.dts
index 1fac632..5ad07d3 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu208-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu208-revA.dts
@@ -231,8 +231,8 @@
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c0_default>;
        pinctrl-1 = <&pinctrl_i2c0_gpio>;
-       scl-gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
+       scl-gpios = <&gpio 14 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 15 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 
        tca6416_u15: gpio@20 { /* u15 */
                compatible = "ti,tca6416";
@@ -397,8 +397,8 @@
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c1_default>;
        pinctrl-1 = <&pinctrl_i2c1_gpio>;
-       scl-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
+       scl-gpios = <&gpio 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 
        i2c-mux@74 {
                compatible = "nxp,pca9548"; /* u20 */

diff --git a/arch/arm/dts/zynqmp-zcu216-revA.dts b/arch/arm/dts/zynqmp-zcu216-revA.dts
index ea96f5c..574e484 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu216-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu216-revA.dts
@@ -241,8 +241,8 @@
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c0_default>;
        pinctrl-1 = <&pinctrl_i2c0_gpio>;
-       scl-gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
+       scl-gpios = <&gpio 14 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 15 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 
        tca6416_u15: gpio@20 { /* u15 */
                compatible = "ti,tca6416";
@@ -407,8 +407,8 @@
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c1_default>;
        pinctrl-1 = <&pinctrl_i2c1_gpio>;
-       scl-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
-       sda-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
+       scl-gpios = <&gpio 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       sda-gpios = <&gpio 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 
        i2c-mux@74 {
                compatible = "nxp,pca9548"; /* u20 */