GF: Migrate dbus-sensors patches
Add LTC2991 support in PSUSensorMain
Add new I2CDeviceType for tda38740 in PSUSensorMain
Tested: paste.googleplex.com/6366095146745856
Fusion-Link: fusion2 NA
Patch Tracking Bug: b/366056155
Upstream info / review: N/A
Upstream-Status: Pending
Justification: Provides support for Infineon driver - may be upstreamed if driver is
Google-Bug-Id: 371388033
Change-Id: Icb74d80d902c0c2bc28ee8832e40d6ab7c81aad7
Signed-off-by: Zac Schleich <zschleich@google.com>
diff --git a/recipes-phosphor/sensors/dbus-sensors/0011-LTC2991-PSUSensor-support.patch b/recipes-phosphor/sensors/dbus-sensors/0011-LTC2991-PSUSensor-support.patch
new file mode 100644
index 0000000..0b14e5c
--- /dev/null
+++ b/recipes-phosphor/sensors/dbus-sensors/0011-LTC2991-PSUSensor-support.patch
@@ -0,0 +1,49 @@
+From b1f61f02a93410566ed7cdb78db6c54da33e7dc4 Mon Sep 17 00:00:00 2001
+From: Justin Stokes <stokesjustin@google.com>
+Date: Thu, 20 Jun 2024 23:18:05 +0000
+Subject: [PATCH] LTC2991 PSUSensor support
+
+Signed-off-by: Justin Stokes <stokesjustin@google.com>
+```
+Patch Tracking Bug: b/348648982
+Upstream info / review: https://gerrit.openbmc.org/c/openbmc/dbus-sensors/+/72280
+Upstream-Status: Submitted
+Justification:
+
+Feature enablement
+```
+
+---
+ src/PSUSensorMain.cpp | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/PSUSensorMain.cpp b/src/PSUSensorMain.cpp
+index 33ff91a..a47ba36 100644
+--- a/src/PSUSensorMain.cpp
++++ b/src/PSUSensorMain.cpp
+@@ -82,6 +82,7 @@ static const I2CDeviceTypeMap sensorTypes{
+ {"ISL69260", I2CDeviceType{"isl69260", true}},
+ {"LM25066", I2CDeviceType{"lm25066", true}},
+ {"LTC2945", I2CDeviceType{"ltc2945", true}},
++ {"LTC2991", I2CDeviceType{"ltc2991", true}},
+ {"LTC4286", I2CDeviceType{"ltc4286", true}},
+ {"LTC4287", I2CDeviceType{"ltc4287", true}},
+ {"MAX5970", I2CDeviceType{"max5970", true}},
+@@ -1122,6 +1123,14 @@ void propertyInitialize(void)
+ {"vout30", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+ {"vout31", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+ {"vout32", PSUProperty("Output Voltage", 255, 0, 3, 0)},
++ {"voltage1", PSUProperty("Output Voltage", 255, 0, 3, 0)},
++ {"voltage2", PSUProperty("Output Voltage", 255, 0, 3, 0)},
++ {"voltage3", PSUProperty("Output Voltage", 255, 0, 3, 0)},
++ {"voltage4", PSUProperty("Output Voltage", 255, 0, 3, 0)},
++ {"voltage5", PSUProperty("Output Voltage", 255, 0, 3, 0)},
++ {"voltage6", PSUProperty("Output Voltage", 255, 0, 3, 0)},
++ {"voltage7", PSUProperty("Output Voltage", 255, 0, 3, 0)},
++ {"voltage8", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+ {"vmon", PSUProperty("Auxiliary Input Voltage", 255, 0, 3, 0)},
+ {"in0", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+ {"in1", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+--
+2.45.2.741.gdbec12cfda-goog
+
diff --git a/recipes-phosphor/sensors/dbus-sensors/0012-TDA38740-PSUSensor-support.patch b/recipes-phosphor/sensors/dbus-sensors/0012-TDA38740-PSUSensor-support.patch
new file mode 100644
index 0000000..728f118
--- /dev/null
+++ b/recipes-phosphor/sensors/dbus-sensors/0012-TDA38740-PSUSensor-support.patch
@@ -0,0 +1,31 @@
+From 909910e7e14a05c7b0d4ac9553ef472452f92279 Mon Sep 17 00:00:00 2001
+From: Zac Schleich <zschleich@google.com>
+Date: Thu, 10 Oct 2024 19:09:06 +0000
+Subject: [PATCH] TDA38740-PSUSensor-support
+
+Patch Tracking Bug: b/366056155
+Upstream info / review: N/A
+Upstream-Status: Pending
+Justification: Provides support for Infineon driver - may be upstreamed if driver is
+
+Signed-off-by: Zac Schleich <zschleich@google.com>
+---
+ src/PSUSensorMain.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/PSUSensorMain.cpp b/src/PSUSensorMain.cpp
+index a47ba36..5420142 100644
+--- a/src/PSUSensorMain.cpp
++++ b/src/PSUSensorMain.cpp
+@@ -111,6 +111,8 @@ static const I2CDeviceTypeMap sensorTypes{
+ {"RAA229004", I2CDeviceType{"raa229004", true}},
+ {"RAA229126", I2CDeviceType{"raa229126", true}},
+ {"TDA38640", I2CDeviceType{"tda38640", true}},
++ {"TDA38725", I2CDeviceType{"tda38725", true}},
++ {"TDA38740", I2CDeviceType{"tda38740", true}},
+ {"TPS53679", I2CDeviceType{"tps53679", true}},
+ {"TPS546D24", I2CDeviceType{"tps546d24", true}},
+ {"XDPE11280", I2CDeviceType{"xdpe11280", true}},
+--
+2.47.0.rc1.288.g06298d1525-goog
+
diff --git a/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/recipes-phosphor/sensors/dbus-sensors_%.bbappend
index 0484a53..1620c88 100644
--- a/recipes-phosphor/sensors/dbus-sensors_%.bbappend
+++ b/recipes-phosphor/sensors/dbus-sensors_%.bbappend
@@ -14,6 +14,8 @@
file://0010-dbus-sensors-Creating-association-between-inventory-.patch \
file://0001-intrusionsensor-Add-Assosication-interfaces-for-cabl.patch \
file://0001-adcsensor-Add-optional-battery-status-interface.patch \
+ file://0011-LTC2991-PSUSensor-support.patch \
+ file://0012-TDA38740-PSUSensor-support.patch \
"
# TODO(linchuyuan@google.com): remove the following section once the upstream has the change
