arm64: zynqmp: Fix tps65086 pmic i2c entry

Enable pmic i2c and gpio controller.
There is also regulator part which can be enabled
and it is question what that brings up.
This is done for firmware version detection.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/dts/zynqmp-zcu100-revA.dts b/arch/arm/dts/zynqmp-zcu100-revA.dts
index 151b58a4499230bc3586b9c10554f6c31e9a6b3f..dc3a78d55c59f3fd07d5053ea0c4fb9904a80f47 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu100-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu100-revA.dts
@@ -180,7 +180,7 @@
                i2csw_4: i2c@4 { /* i2c mw 75 0 10 */
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       reg = <0x5e>;
+                       reg = <0x4>;
 
                        /* Also RTC, GPIO and regulators */
                        /*
@@ -196,18 +196,16 @@
 
                        /* Comment it out because will be pre-programmed
                           at the factory */
-                       /*
-                       pmu: tps6586x@34 { // Custom TI PMIC u33
-                               compatible = "ti,tps6586x";
-                               reg = <0x34>;
-                               interrupt-parent = <&gpio>;
-                               interrupts = <39 GPIO_ACTIVE_LOW>; shared with gpio switch
 
+                       pmic: tps65086x@5e { // Custom TI PMIC u33
+                               compatible = "ti,tps65086";
+                               reg = <0x5e>;
+                               interrupt-parent = <&gpio>;
+                               interrupts = <39 GPIO_ACTIVE_LOW>; /* shared with pmic IRQ */
                                #gpio-cells = <2>;
                                gpio-controller;
 
-                               ti,system-power-controller;
-
+/*
                                sys-supply = <&some_reg>;
                                // spec 12V
 
@@ -218,8 +216,6 @@
                                buck5 1V2
                                buck6 VCC_PSAUX 1V8
 
-
-
                                vin-sm0-supply = <&some_reg>;
                                vin-sm1-supply = <&some_reg>;
                                vin-sm2-supply = <&some_reg>;
@@ -316,9 +312,8 @@
                                                regulator-always-on;
                                        };
                                };
-                       };
-                       */
-
+                               */
+                       };
                };
                i2csw_5: i2c@5 { /* i2c mw 75 0 20 */
                        #address-cells = <1>;

diff --git a/arch/arm/dts/zynqmp-zcu100-revB.dts b/arch/arm/dts/zynqmp-zcu100-revB.dts
index 7f8a1f5bb3b02077bb35f5eeffa771b268e27671..1eb393c125506e0cac744a81f062fb5074a78419 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu100-revB.dts
+++ b/arch/arm/dts/zynqmp-zcu100-revB.dts
@@ -53,7 +53,7 @@
                autorepeat;
                sw4 {
                        label = "sw4";
-                       gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 23 GPIO_ACTIVE_LOW>; /* shared with pmic IRQ */
                        linux,code = <108>; /* down */
                        gpio-key,wakeup; /* FIXME test this */
                        autorepeat;
@@ -203,7 +203,7 @@
                i2csw_4: i2c@4 { /* i2c mw 75 0 10 */
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       reg = <0x5e>;
+                       reg = <0x4>;
 
                        /* Also RTC, GPIO and regulators */
                        /*
@@ -219,18 +219,16 @@
 
                        /* Comment it out because will be pre-programmed
                           at the factory */
-                       /*
-                       pmu: tps6586x@34 { // Custom TI PMIC u33
-                               compatible = "ti,tps6586x";
-                               reg = <0x34>;
-                               interrupt-parent = <&gpio>;
-                               interrupts = <39 GPIO_ACTIVE_LOW>; shared with gpio switch
 
+                       pmic: tps65086x@5e { // Custom TI PMIC u33
+                               compatible = "ti,tps65086";
+                               reg = <0x5e>;
+                               interrupt-parent = <&gpio>;
+                               interrupts = <23 GPIO_ACTIVE_LOW>; /* shared with pmic IRQ */
                                #gpio-cells = <2>;
                                gpio-controller;
 
-                               ti,system-power-controller;
-
+/*
                                sys-supply = <&some_reg>;
                                // spec 12V
 
@@ -241,8 +239,6 @@
                                buck5 1V2
                                buck6 VCC_PSAUX 1V8
 
-
-
                                vin-sm0-supply = <&some_reg>;
                                vin-sm1-supply = <&some_reg>;
                                vin-sm2-supply = <&some_reg>;
@@ -339,8 +335,8 @@
                                                regulator-always-on;
                                        };
                                };
+                               */
                        };
-                       */
                };
                i2csw_5: i2c@5 { /* i2c mw 75 0 20 */
                        #address-cells = <1>;