meta-ibm: Fix fanx can't get the correct pwm
Although 6 fanx_1 pwm targets are deleted, but fan0_1 fan1_1 and fan2_1
will have a default value that causes the issue to remain unresolved.
In this way, two Fans control the same pwm, but I think that our
current fan control event is controlled at the same time, so it does
not affect the fan control.
(From meta-ibm rev: c4ec0f10a091fe74f075d2033fe055b5bbd7d498)
Change-Id: I42647c92ffe5e20430cee28de6fd26e2716153d9
Signed-off-by: Ben Pai <Ben_Pai@wistron.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/mihawk/fans.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/mihawk/fans.yaml
index 9133fa1..d0a0900 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/mihawk/fans.yaml
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/mihawk/fans.yaml
@@ -3,29 +3,35 @@
cooling_zone: 0
sensors:
- fan0_0
+ - fan0_1
target_interface: xyz.openbmc_project.Control.FanPwm
- inventory: /system/chassis/motherboard/fan1
cooling_zone: 0
sensors:
- fan1_0
+ - fan1_1
target_interface: xyz.openbmc_project.Control.FanPwm
- inventory: /system/chassis/motherboard/fan2
cooling_zone: 0
sensors:
- fan2_0
+ - fan2_1
target_interface: xyz.openbmc_project.Control.FanPwm
- inventory: /system/chassis/motherboard/fan3
cooling_zone: 0
sensors:
- fan3_0
+ - fan3_1
target_interface: xyz.openbmc_project.Control.FanPwm
- inventory: /system/chassis/motherboard/fan4
cooling_zone: 0
sensors:
- fan4_0
+ - fan4_1
target_interface: xyz.openbmc_project.Control.FanPwm
- inventory: /system/chassis/motherboard/fan5
cooling_zone: 0
sensors:
- fan5_0
+ - fan5_1
target_interface: xyz.openbmc_project.Control.FanPwm
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf
index bb569f7..066ebf6 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf
@@ -12,8 +12,14 @@
LABEL_fan12 = "fan5_1"
PWM_TARGET_fan1 = "1"
+PWM_TARGET_fan2 = "1"
PWM_TARGET_fan3 = "2"
+PWM_TARGET_fan4 = "2"
PWM_TARGET_fan5 = "3"
+PWM_TARGET_fan6 = "3"
PWM_TARGET_fan7 = "4"
+PWM_TARGET_fan8 = "4"
PWM_TARGET_fan9 = "5"
+PWM_TARGET_fan10 = "5"
PWM_TARGET_fan11 = "6"
+PWM_TARGET_fan12 = "6"