diff mbox series

arm64: zynqmp: Fix irps5401 device nodes

Message ID e92ed48fa281ad509a6f8402ea77968b4a98b056.1586765110.git.michal.simek@xilinx.com
State Accepted
Commit 14c0fbbc94e30ef8a586e9b8685393337246b19d
Headers show
Series arm64: zynqmp: Fix irps5401 device nodes | expand

Commit Message

Michal Simek April 13, 2020, 8:05 a.m. UTC
- Do not use irps54012 as device node which is not correct.
- Fix addresses of irps5401/u180 on zcu104 revisions.
- Remove clock-cells property. It is PMIC without any clock output.
- Define irps5401 nodes in zynqmp-e-a2197

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

 arch/arm/dts/zynqmp-e-a2197-00-revA.dts | 16 +++++++++++++---
 arch/arm/dts/zynqmp-zcu104-revA.dts     | 10 ++++------
 arch/arm/dts/zynqmp-zcu104-revC.dts     | 10 ++++------
 arch/arm/dts/zynqmp-zcu111-revA.dts     |  9 +++------
 arch/arm/dts/zynqmp-zcu208-revA.dts     |  6 ++----
 arch/arm/dts/zynqmp-zcu216-revA.dts     |  6 ++----
 6 files changed, 28 insertions(+), 29 deletions(-)

Comments

Michal Simek April 30, 2020, 7:36 a.m. UTC | #1
po 13. 4. 2020 v 10:05 odes?latel Michal Simek <michal.simek at xilinx.com> napsal:
>
> - Do not use irps54012 as device node which is not correct.
> - Fix addresses of irps5401/u180 on zcu104 revisions.
> - Remove clock-cells property. It is PMIC without any clock output.
> - Define irps5401 nodes in zynqmp-e-a2197
>
> Signed-off-by: Michal Simek <michal.simek at xilinx.com>
> ---
>
>  arch/arm/dts/zynqmp-e-a2197-00-revA.dts | 16 +++++++++++++---
>  arch/arm/dts/zynqmp-zcu104-revA.dts     | 10 ++++------
>  arch/arm/dts/zynqmp-zcu104-revC.dts     | 10 ++++------
>  arch/arm/dts/zynqmp-zcu111-revA.dts     |  9 +++------
>  arch/arm/dts/zynqmp-zcu208-revA.dts     |  6 ++----
>  arch/arm/dts/zynqmp-zcu216-revA.dts     |  6 ++----
>  6 files changed, 28 insertions(+), 29 deletions(-)
>
> diff --git a/arch/arm/dts/zynqmp-e-a2197-00-revA.dts b/arch/arm/dts/zynqmp-e-a2197-00-revA.dts
> index 65cf5914945d..bf982e221830 100644
> --- a/arch/arm/dts/zynqmp-e-a2197-00-revA.dts
> +++ b/arch/arm/dts/zynqmp-e-a2197-00-revA.dts
> @@ -198,9 +198,6 @@
>                         #size-cells = <0>;
>                         reg = <0>;
>                         /* u152 IR35215 0x16/0x46 vcc_soc */
> -                       /* u160 IRPS5401 0x17/0x47 */
> -                       /* u167 IRPS5401 0x1c/0x4c */
> -                       /* u175 IRPS5401 0x1d/0x4d */
>                         /* u179 ir38164 0x19/0x49 vcco_500 */
>                         /* u181 ir38164 0x1a/0x4a vcco_501 */
>                         /* u183 ir38164 0x1b/0x4b vcco_502 */
> @@ -209,6 +206,19 @@
>                         /* u189 ir38164 0x20/0x50 mgtyavtt */
>                         /* u194 ir38164 0x13/0x43 vdd1_1v8_lp4 */
>                         /* u195 ir38164 0x14/0x44 vdd2_1v8_lp4 */
> +
> +                       irps5401_47: irps5401 at 47 { /* IRPS5401 - u160 */
> +                               compatible = "infineon,irps5401";
> +                               reg = <0x47>; /* pmbus / i2c 0x17 */
> +                       };
> +                       irps5401_4c: irps5401 at 4c { /* IRPS5401 - u167 */
> +                               compatible = "infineon,irps5401";
> +                               reg = <0x4c>; /* pmbus / i2c 0x1c */
> +                       };
> +                       irps5401_4d: irps5401 at 4d { /* IRPS5401 - u175 */
> +                               compatible = "infineon,irps5401";
> +                               reg = <0x4d>; /* pmbus / i2c 0x1d */
> +                       };
>                 };
>                 i2c at 1 { /* PMBUS1_INA226 */
>                         #address-cells = <1>;
> diff --git a/arch/arm/dts/zynqmp-zcu104-revA.dts b/arch/arm/dts/zynqmp-zcu104-revA.dts
> index 3ceb39dce02b..a4bd6b800a18 100644
> --- a/arch/arm/dts/zynqmp-zcu104-revA.dts
> +++ b/arch/arm/dts/zynqmp-zcu104-revA.dts
> @@ -147,15 +147,13 @@
>                         #address-cells = <1>;
>                         #size-cells = <0>;
>                         reg = <2>;
> -                       irps5401_43: irps54012 at 43 { /* IRPS5401 - u175 */
> -                               #clock-cells = <0>;
> +                       irps5401_43: irps5401 at 43 { /* IRPS5401 - u175 */
>                                 compatible = "infineon,irps5401";
> -                               reg = <0x43>;
> +                               reg = <0x43>; /* pmbus / i2c 0x13 */
>                         };
> -                       irps5401_4d: irps54012 at 4d { /* IRPS5401 - u180 */
> -                               #clock-cells = <0>;
> +                       irps5401_44: irps5401 at 44 { /* IRPS5401 - u180 */
>                                 compatible = "infineon,irps5401";
> -                               reg = <0x4d>;
> +                               reg = <0x44>; /* pmbus / i2c 0x14 */
>                         };
>                 };
>
> diff --git a/arch/arm/dts/zynqmp-zcu104-revC.dts b/arch/arm/dts/zynqmp-zcu104-revC.dts
> index 7dad4523deb0..d4b3769a27cc 100644
> --- a/arch/arm/dts/zynqmp-zcu104-revC.dts
> +++ b/arch/arm/dts/zynqmp-zcu104-revC.dts
> @@ -172,15 +172,13 @@
>                         #address-cells = <1>;
>                         #size-cells = <0>;
>                         reg = <2>;
> -                       irps5401_43: irps54012 at 43 { /* IRPS5401 - u175 */
> -                               #clock-cells = <0>;
> +                       irps5401_43: irps5401 at 43 { /* IRPS5401 - u175 */
>                                 compatible = "infineon,irps5401";
> -                               reg = <0x43>;
> +                               reg = <0x43>; /* pmbus / i2c 0x13 */
>                         };
> -                       irps5401_4d: irps54012 at 4d { /* IRPS5401 - u180 */
> -                               #clock-cells = <0>;
> +                       irps5401_44: irps5401 at 44 { /* IRPS5401 - u180 */
>                                 compatible = "infineon,irps5401";
> -                               reg = <0x4d>;
> +                               reg = <0x44>; /* pmbus / i2c 0x14 */
>                         };
>                 };
>
> diff --git a/arch/arm/dts/zynqmp-zcu111-revA.dts b/arch/arm/dts/zynqmp-zcu111-revA.dts
> index d16bf8ac7ac7..63e285fe9a9a 100644
> --- a/arch/arm/dts/zynqmp-zcu111-revA.dts
> +++ b/arch/arm/dts/zynqmp-zcu111-revA.dts
> @@ -327,18 +327,15 @@
>                         #address-cells = <1>;
>                         #size-cells = <0>;
>                         reg = <2>;
> -                       irps5401_43: irps54012 at 43 { /* IRPS5401 - u53 check these */
> -                               #clock-cells = <0>;
> +                       irps5401_43: irps5401 at 43 { /* IRPS5401 - u53 check these */
>                                 compatible = "infineon,irps5401";
>                                 reg = <0x43>;
>                         };
> -                       irps5401_44: irps54012 at 44 { /* IRPS5401 - u55 */
> -                               #clock-cells = <0>;
> +                       irps5401_44: irps5401 at 44 { /* IRPS5401 - u55 */
>                                 compatible = "infineon,irps5401";
>                                 reg = <0x44>;
>                         };
> -                       irps5401_45: irps54012 at 45 { /* IRPS5401 - u57 */
> -                               #clock-cells = <0>;
> +                       irps5401_45: irps5401 at 45 { /* IRPS5401 - u57 */
>                                 compatible = "infineon,irps5401";
>                                 reg = <0x45>;
>                         };
> diff --git a/arch/arm/dts/zynqmp-zcu208-revA.dts b/arch/arm/dts/zynqmp-zcu208-revA.dts
> index 75ecd7a5c203..118a2de96b3c 100644
> --- a/arch/arm/dts/zynqmp-zcu208-revA.dts
> +++ b/arch/arm/dts/zynqmp-zcu208-revA.dts
> @@ -351,13 +351,11 @@
>                         /* u112 - ir38164 0x13/0x43 */
>                         /* u123 - ir38164 0x1c/0x4c */
>
> -                       irps5401_44: irps54012 at 44 { /* IRPS5401 - u53 */
> -                               #clock-cells = <0>;
> +                       irps5401_44: irps5401 at 44 { /* IRPS5401 - u53 */
>                                 compatible = "infineon,irps5401";
>                                 reg = <0x44>; /* i2c addr 0x14 */
>                         };
> -                       irps5401_45: irps54012 at 45 { /* IRPS5401 - u55 */
> -                               #clock-cells = <0>;
> +                       irps5401_45: irps5401 at 45 { /* IRPS5401 - u55 */
>                                 compatible = "infineon,irps5401";
>                                 reg = <0x45>; /* i2c addr 0x15 */
>                         };
> diff --git a/arch/arm/dts/zynqmp-zcu216-revA.dts b/arch/arm/dts/zynqmp-zcu216-revA.dts
> index f3b5edfeb423..e454bfcba797 100644
> --- a/arch/arm/dts/zynqmp-zcu216-revA.dts
> +++ b/arch/arm/dts/zynqmp-zcu216-revA.dts
> @@ -355,13 +355,11 @@
>                         /* u112 - ir38164 0x13/0x43 */
>                         /* u123 - ir38164 0x1c/0x4c */
>
> -                       irps5401_44: irps54012 at 44 { /* IRPS5401 - u53 */
> -                               #clock-cells = <0>;
> +                       irps5401_44: irps5401 at 44 { /* IRPS5401 - u53 */
>                                 compatible = "infineon,irps5401";
>                                 reg = <0x44>; /* i2c addr 0x14 */
>                         };
> -                       irps5401_45: irps54012 at 45 { /* IRPS5401 - u55 */
> -                               #clock-cells = <0>;
> +                       irps5401_45: irps5401 at 45 { /* IRPS5401 - u55 */
>                                 compatible = "infineon,irps5401";
>                                 reg = <0x45>; /* i2c addr 0x15 */
>                         };
> --
> 2.26.0
>

Applied.
M
diff mbox series

Patch

diff --git a/arch/arm/dts/zynqmp-e-a2197-00-revA.dts b/arch/arm/dts/zynqmp-e-a2197-00-revA.dts
index 65cf5914945d..bf982e221830 100644
--- a/arch/arm/dts/zynqmp-e-a2197-00-revA.dts
+++ b/arch/arm/dts/zynqmp-e-a2197-00-revA.dts
@@ -198,9 +198,6 @@ 
 			#size-cells = <0>;
 			reg = <0>;
 			/* u152 IR35215 0x16/0x46 vcc_soc */
-			/* u160 IRPS5401 0x17/0x47 */
-			/* u167 IRPS5401 0x1c/0x4c */
-			/* u175 IRPS5401 0x1d/0x4d */
 			/* u179 ir38164 0x19/0x49 vcco_500 */
 			/* u181 ir38164 0x1a/0x4a vcco_501 */
 			/* u183 ir38164 0x1b/0x4b vcco_502 */
@@ -209,6 +206,19 @@ 
 			/* u189 ir38164 0x20/0x50 mgtyavtt */
 			/* u194 ir38164 0x13/0x43 vdd1_1v8_lp4 */
 			/* u195 ir38164 0x14/0x44 vdd2_1v8_lp4 */
+
+			irps5401_47: irps5401 at 47 { /* IRPS5401 - u160 */
+				compatible = "infineon,irps5401";
+				reg = <0x47>; /* pmbus / i2c 0x17 */
+			};
+			irps5401_4c: irps5401 at 4c { /* IRPS5401 - u167 */
+				compatible = "infineon,irps5401";
+				reg = <0x4c>; /* pmbus / i2c 0x1c */
+			};
+			irps5401_4d: irps5401 at 4d { /* IRPS5401 - u175 */
+				compatible = "infineon,irps5401";
+				reg = <0x4d>; /* pmbus / i2c 0x1d */
+			};
 		};
 		i2c at 1 { /* PMBUS1_INA226 */
 			#address-cells = <1>;
diff --git a/arch/arm/dts/zynqmp-zcu104-revA.dts b/arch/arm/dts/zynqmp-zcu104-revA.dts
index 3ceb39dce02b..a4bd6b800a18 100644
--- a/arch/arm/dts/zynqmp-zcu104-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu104-revA.dts
@@ -147,15 +147,13 @@ 
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <2>;
-			irps5401_43: irps54012 at 43 { /* IRPS5401 - u175 */
-				#clock-cells = <0>;
+			irps5401_43: irps5401 at 43 { /* IRPS5401 - u175 */
 				compatible = "infineon,irps5401";
-				reg = <0x43>;
+				reg = <0x43>; /* pmbus / i2c 0x13 */
 			};
-			irps5401_4d: irps54012 at 4d { /* IRPS5401 - u180 */
-				#clock-cells = <0>;
+			irps5401_44: irps5401 at 44 { /* IRPS5401 - u180 */
 				compatible = "infineon,irps5401";
-				reg = <0x4d>;
+				reg = <0x44>; /* pmbus / i2c 0x14 */
 			};
 		};
 
diff --git a/arch/arm/dts/zynqmp-zcu104-revC.dts b/arch/arm/dts/zynqmp-zcu104-revC.dts
index 7dad4523deb0..d4b3769a27cc 100644
--- a/arch/arm/dts/zynqmp-zcu104-revC.dts
+++ b/arch/arm/dts/zynqmp-zcu104-revC.dts
@@ -172,15 +172,13 @@ 
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <2>;
-			irps5401_43: irps54012 at 43 { /* IRPS5401 - u175 */
-				#clock-cells = <0>;
+			irps5401_43: irps5401 at 43 { /* IRPS5401 - u175 */
 				compatible = "infineon,irps5401";
-				reg = <0x43>;
+				reg = <0x43>; /* pmbus / i2c 0x13 */
 			};
-			irps5401_4d: irps54012 at 4d { /* IRPS5401 - u180 */
-				#clock-cells = <0>;
+			irps5401_44: irps5401 at 44 { /* IRPS5401 - u180 */
 				compatible = "infineon,irps5401";
-				reg = <0x4d>;
+				reg = <0x44>; /* pmbus / i2c 0x14 */
 			};
 		};
 
diff --git a/arch/arm/dts/zynqmp-zcu111-revA.dts b/arch/arm/dts/zynqmp-zcu111-revA.dts
index d16bf8ac7ac7..63e285fe9a9a 100644
--- a/arch/arm/dts/zynqmp-zcu111-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu111-revA.dts
@@ -327,18 +327,15 @@ 
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <2>;
-			irps5401_43: irps54012 at 43 { /* IRPS5401 - u53 check these */
-				#clock-cells = <0>;
+			irps5401_43: irps5401 at 43 { /* IRPS5401 - u53 check these */
 				compatible = "infineon,irps5401";
 				reg = <0x43>;
 			};
-			irps5401_44: irps54012 at 44 { /* IRPS5401 - u55 */
-				#clock-cells = <0>;
+			irps5401_44: irps5401 at 44 { /* IRPS5401 - u55 */
 				compatible = "infineon,irps5401";
 				reg = <0x44>;
 			};
-			irps5401_45: irps54012 at 45 { /* IRPS5401 - u57 */
-				#clock-cells = <0>;
+			irps5401_45: irps5401 at 45 { /* IRPS5401 - u57 */
 				compatible = "infineon,irps5401";
 				reg = <0x45>;
 			};
diff --git a/arch/arm/dts/zynqmp-zcu208-revA.dts b/arch/arm/dts/zynqmp-zcu208-revA.dts
index 75ecd7a5c203..118a2de96b3c 100644
--- a/arch/arm/dts/zynqmp-zcu208-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu208-revA.dts
@@ -351,13 +351,11 @@ 
 			/* u112 - ir38164 0x13/0x43 */
 			/* u123 - ir38164 0x1c/0x4c */
 
-			irps5401_44: irps54012 at 44 { /* IRPS5401 - u53 */
-				#clock-cells = <0>;
+			irps5401_44: irps5401 at 44 { /* IRPS5401 - u53 */
 				compatible = "infineon,irps5401";
 				reg = <0x44>; /* i2c addr 0x14 */
 			};
-			irps5401_45: irps54012 at 45 { /* IRPS5401 - u55 */
-				#clock-cells = <0>;
+			irps5401_45: irps5401 at 45 { /* IRPS5401 - u55 */
 				compatible = "infineon,irps5401";
 				reg = <0x45>; /* i2c addr 0x15 */
 			};
diff --git a/arch/arm/dts/zynqmp-zcu216-revA.dts b/arch/arm/dts/zynqmp-zcu216-revA.dts
index f3b5edfeb423..e454bfcba797 100644
--- a/arch/arm/dts/zynqmp-zcu216-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu216-revA.dts
@@ -355,13 +355,11 @@ 
 			/* u112 - ir38164 0x13/0x43 */
 			/* u123 - ir38164 0x1c/0x4c */
 
-			irps5401_44: irps54012 at 44 { /* IRPS5401 - u53 */
-				#clock-cells = <0>;
+			irps5401_44: irps5401 at 44 { /* IRPS5401 - u53 */
 				compatible = "infineon,irps5401";
 				reg = <0x44>; /* i2c addr 0x14 */
 			};
-			irps5401_45: irps54012 at 45 { /* IRPS5401 - u55 */
-				#clock-cells = <0>;
+			irps5401_45: irps5401 at 45 { /* IRPS5401 - u55 */
 				compatible = "infineon,irps5401";
 				reg = <0x45>; /* i2c addr 0x15 */
 			};