Revert "meta-ampere: mtjade: support PSU present detection via GPIO"
By replacing phosphor-hwmon by dbus-sensor, PSU presence detection via
GPIO does not work anymore and it causes confiction with dbus-sensor's
PSUSensor.
Revert the commit to avoid the confliction
Change-Id: Idfd54325c122921a3c5df062bce1b6909b643999
Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
diff --git a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb
index ede8d9d..9f14619 100644
--- a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb
+++ b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb
@@ -26,7 +26,6 @@
phosphor-hostlogger \
phosphor-sel-logger \
phosphor-logging \
- virtual/obmc-gpio-presence \
"
SUMMARY:${PN}-system = "Ampere System"
diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf
index 642e746..40bd0f8 100644
--- a/meta-ampere/meta-jade/conf/machine/mtjade.conf
+++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf
@@ -14,8 +14,6 @@
FLASH_ROFS_OFFSET = "10240"
FLASH_RWFS_OFFSET = "43008"
-OBMC_POWER_SUPPLY_INSTANCES = "0 1"
-
MACHINE_FEATURES += "\
obmc-phosphor-chassis-mgmt \
obmc-phosphor-flash-mgmt \
diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf
deleted file mode 100644
index c5fc23a..0000000
--- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-INVENTORY=/system/chassis/motherboard/powersupply0
-DEVPATH=/dev/input/by-path/platform-gpio-keys-event
-KEY=64
-NAME=powersupply0
-DRIVERS=/sys/bus/i2c/drivers/pmbus,6-0058
-EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply
diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf
deleted file mode 100644
index e591227..0000000
--- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-INVENTORY=/system/chassis/motherboard/powersupply1
-DEVPATH=/dev/input/by-path/platform-gpio-keys-event
-KEY=65
-NAME=powersupply1
-DRIVERS=/sys/bus/i2c/drivers/pmbus,6-0059
-EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply
diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
deleted file mode 100644
index 527cbbd..0000000
--- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-TMPL_POWERSUPPLY = "phosphor-gpio-presence@.service"
-INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service"
-POWERSUPPLY_TGT = "multi-user.target"
-FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_POWERSUPPLY}"
-
-SYSTEMD_LINK:${PN}-presence:append:mtjade = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}"
-
-POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf"
-
-SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:mtjade = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"