Update device tree for Zaius DVT

Robert Lippert (2):
ARM: dts: aspeed: add LPC snoop device bindings for ASPEED G5
ARM: dts: aspeed: zaius: enable port 80h snoop

Xo Wang (3):
ARM: dts: aspeed: zaius: Use LM5066I driver for hotswap
ARM: dts: aspeed: zaius: Update hotswap controller address for EVT3
ARM: dts: aspeed: zaius: Add PWM/tach peripheral

 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 41 +++++++++++++++++++++++++++---
 arch/arm/boot/dts/aspeed-g5.dtsi           |  7 +++++
 2 files changed, 45 insertions(+), 3 deletions(-)

2.14.1.581.gf28d330327-goog

Not removing the "ti,lm5066" line because the LM5066I support is only in yet-to-be-released 4.13-rc4.

---
 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

index e4e9519cd087..1c39452ffebd 100644
@@ -282,7 +282,10 @@
 			#size-cells = <0>;
 
 			hotswap@10 {
-				compatible = "ti,lm5066";
+				/* Device is LM5066I so prefer that driver
+				 * support if available
+				 */
+				compatible = "ti,lm5066i", "ti,lm5066";
 				reg = <0x10>;
 			};
 		};

2.14.1.581.gf28d330327-goog

Hi Xo,

This commit message is a bit out of date. I dropped the yet-to-be-released bit and applied it.

I figured there's no harm in keeping the backwards compatible string there for now; if you want to drop it please send a follow up patch.

I cherry picked in the upstream driver changes to dev-4.10 too:

5783ec2e5c10 hwmon: (pmbus/lm25066) Add support for TI LM5066I ee983171d49b hwmon: (pmbus/lm25066) Offset coefficient depends on CL

Cheers,

Joel

Acknowledged. Thanks for the review and cherry-picks.

xo

The LM5066I hotswap controller is at PMBus device address 0x54 starting with the EVT3 motherboard.

---
 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index 1c39452ffebd..f178baabfb9d 100644
@@ -281,12 +281,12 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			hotswap@10 {
+			hotswap@54 {
 				/* Device is LM5066I so prefer that driver
 				 * support if available
 				 */
 				compatible = "ti,lm5066i", "ti,lm5066";
-				reg = <0x10>;
+				reg = <0x54>;
 			};
 		};
 	};

2.14.1.581.gf28d330327-goog

Applied to dev-4.10,

Cheers,

Joel

From: Robert Lippert <[email protected]>

---
 arch/arm/boot/dts/aspeed-g5.dtsi | 7 +++++++
 1 file changed, 7 insertions(+)

index bb7652a61bec..9a988f69e610 100644
@@ -154,6 +154,13 @@
 					status = "disabled";
 				};
 
+				lpc_snoop: lpc-snoop@0 {
+					compatible = "aspeed,ast2500-lpc-snoop";
+					reg = <0x0 0x80>;
+					interrupts = <8>;
+					status = "disabled";
+				};
+
 				lhc: lhc@20 {
 					compatible = "aspeed,ast2500-lhc";
 					reg = <0x20 0x24 0x48 0x8>;

2.14.1.581.gf28d330327-goog

Applied to dev-4.10,

Cheers,

Joel

From: Robert Lippert <[email protected]>

---
 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 5 +++++
 1 file changed, 5 insertions(+)

index f178baabfb9d..ad760a7e8cb3 100644
@@ -156,6 +156,11 @@
 	flash = <&spi1>;
 };
 
+&lpc_snoop {
+	status = "okay";
+	snoop-ports = <0x80>;
+};
+
 &mbox {
 	status = "okay";
 };

2.14.1.581.gf28d330327-goog

Applied to dev-4.10.

Cheers,

Joel

---
 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

index ad760a7e8cb3..5410f58a5e9f 100644
@@ -108,6 +108,33 @@
 
 #include "ibm-power9-cfam.dtsi"
 
+&pwm_tacho {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_pwm0_default &pinctrl_pwm1_default
+		&pinctrl_pwm2_default &pinctrl_pwm3_default>;
+
+	fan@0 {
+		reg = <0x00>;
+		aspeed,fan-tach-ch = /bits/ 8 <0x00>;
+	};
+
+	fan@1 {
+		reg = <0x01>;
+		aspeed,fan-tach-ch = /bits/ 8 <0x01>;
+	};
+
+	fan@2 {
+		reg = <0x02>;
+		aspeed,fan-tach-ch = /bits/ 8 <0x02>;
+	};
+
+	fan@3 {
+		reg = <0x03>;
+		aspeed,fan-tach-ch = /bits/ 8 <0x03>;
+	};
+};
+
 &fmc {
 	status = "okay";
 	flash@0 {

2.14.1.581.gf28d330327-goog

Applied to dev-4.10.

Cheers,

Joel