From 9584fd6d2e5db11a8b2d01e8711bbaa7da75fce1 Mon Sep 17 00:00:00 2001
From: George Hung <george.hung@quantatw.com>
Date: Thu, 27 Aug 2020 22:28:52 +0800
Subject: meta-quanta: gbs: fix non-cable presence sensor type and sata/pe_slot
 entity id

1. nvme/sata/pe_slot presence sensor type -> entity presence (0x25)
2. sata0_prsnt entity id -> Disk Drive Bay (26)
3. pe_slot0/1_prsnt entity id -> Add-in Card (11)

(From meta-quanta rev: a2d6c58e23c3a0c985530a5cf8ae2e861a842141)

Signed-off-by: George Hung <george.hung@quantatw.com>
Change-Id: Id450a85dbf1a1f0ea3b22380af6face47c6821a5
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
---
 .../gbs-yaml-config/gbs-ipmi-sensors.yaml          | 60 +++++++++++++++++-----
 1 file changed, 47 insertions(+), 13 deletions(-)

diff --git a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml
index ee556b4a77..7c334132cf 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml
+++ b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml
@@ -787,7 +787,7 @@
 0xB0: &present
   entityID: 0x04
   entityInstance: 0x30
-  sensorType: 0x0D
+  sensorType: 0x25
   path: /xyz/openbmc_project/inventory/system/chassis/motherboard/nvme0
   sensorReadingType: 0x6F
   mutability: Mutability::Write|Mutability::Read
@@ -799,9 +799,11 @@
       Present:
         Offsets:
           0x00:
-            type: bool
             assert: true
-            deassert: false
+            type: bool
+          0x01:
+            assert: false
+            type: bool
 
 0xB1:
   <<: *present
@@ -1114,31 +1116,63 @@
   path: /xyz/openbmc_project/inventory/system/chassis/gpios/ss_cab3_prsnt
 
 0xF5:
-  <<: *gpio_prsnt
-  entityInstance: 4
+  entityID: 0x1A
+  entityInstance: 0
+  interfaces:
+    xyz.openbmc_project.Inventory.Item:
+      Present:
+        Offsets:
+          0x00:
+            assert: true
+            type: bool
+          0x01:
+            assert: false
+            type: bool
+  mutability: Mutability::Write|Mutability::Read
   path: /xyz/openbmc_project/inventory/system/chassis/gpios/sata0_prsnt
+  readingType: assertion
+  sensorNamePattern: nameLeaf
+  sensorReadingType: 0x6f
+  sensorType: 0x25
+  serviceInterface: org.freedesktop.DBus.Properties
 
 0xF6:
   <<: *gpio_prsnt
-  entityInstance: 5
+  entityInstance: 4
   path: /xyz/openbmc_project/inventory/system/chassis/gpios/hsbp_cab_prsnt
 
 0xF7:
   <<: *gpio_prsnt
-  entityInstance: 6
+  entityInstance: 5
   path: /xyz/openbmc_project/inventory/system/chassis/gpios/fanbd_cab_prsnt
 
 0xF8:
   <<: *gpio_prsnt
-  entityInstance: 7
+  entityInstance: 6
   path: /xyz/openbmc_project/inventory/system/chassis/gpios/bp12v_cab_prsnt
 
-0xF9:
-  <<: *gpio_prsnt
-  entityInstance: 8
+0xF9: &card_prsnt
+  entityID: 0x0B
+  entityInstance: 0
+  interfaces:
+    xyz.openbmc_project.Inventory.Item:
+      Present:
+        Offsets:
+          0x00:
+            assert: true
+            type: bool
+          0x01:
+            assert: false
+            type: bool
+  mutability: Mutability::Write|Mutability::Read
   path: /xyz/openbmc_project/inventory/system/chassis/gpios/pe_slot0_prsnt
+  readingType: assertion
+  sensorNamePattern: nameLeaf
+  sensorReadingType: 0x6f
+  sensorType: 0x25
+  serviceInterface: org.freedesktop.DBus.Properties
 
 0xFA:
-  <<: *gpio_prsnt
-  entityInstance: 9
+  <<: *card_prsnt
+  entityInstance: 1
   path: /xyz/openbmc_project/inventory/system/chassis/gpios/pe_slot1_prsnt
-- 
cgit v1.2.3