meta-quanta: gbs: update thermal config to R04
Add the fleeting2 sensor for the hda temperature
Signed-off-by: George Hung <george.hung@quantatw.com>
Change-Id: I5dd3ebfcedc07df15677bacdf0f029e009213adf
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 746956e..e0eb0e1 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
@@ -543,6 +543,12 @@
entityInstance: 0x2e
path: /xyz/openbmc_project/sensors/temperature/hotswap
+0x2E:
+ <<: *temperature
+ entityID: 0x1E
+ entityInstance: 0x02
+ path: /xyz/openbmc_project/extsensors/margin/fleeting2
+
# fan/pwm mapping
# fan0/1 on Mobo, fb_fan0/1/2 on fan board
# PWM0 => fan tach 0
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config-sku.json b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config-sku.json
index f2997ef..e5040ca 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config-sku.json
+++ b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config-sku.json
@@ -1,5 +1,5 @@
{
- "version": "R03",
+ "version": "R04",
"sensors": [
{
"name": "fan0",
@@ -62,6 +62,16 @@
"timeout": 0
},
{
+ "name": "fleeting2",
+ "type": "margin",
+ "readPath": "/xyz/openbmc_project/extsensors/margin/fleeting2",
+ "writePath": "",
+ "min": 0,
+ "max": 0,
+ "ignoreDbusMinMax": true,
+ "timeout": 0
+ },
+ {
"name": "cputemp",
"type": "margin",
"readPath": "/xyz/openbmc_project/extsensors/margin/cputemp",
@@ -241,6 +251,29 @@
"positiveHysteresis": 0.0,
"negativeHysteresis": 0.0
}
+ },
+ {
+ "name": "fleeting2",
+ "type": "margin",
+ "inputs": [
+ "fleeting2"
+ ],
+ "setpoint": 10.0,
+ "pid": {
+ "samplePeriod": 1.0,
+ "proportionalCoeff": 536.0,
+ "integralCoeff": 18.0,
+ "feedFwdOffsetCoeff": 0.0,
+ "feedFwdGainCoeff": 0.0,
+ "integralLimit_min": 2679.0,
+ "integralLimit_max": 18000.0,
+ "outLim_min": 2679.0,
+ "outLim_max": 18000.0,
+ "slewNeg": 0.0,
+ "slewPos": 0.0,
+ "positiveHysteresis": 0.0,
+ "negativeHysteresis": 0.0
+ }
}
]
},