diff options
4 files changed, 16 insertions, 16 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config%/fans.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config%/fans.yaml index 8ad72d89d..a70ac85a3 100755 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config%/fans.yaml +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config%/fans.yaml @@ -3,19 +3,19 @@ fans: cooling_zone: 0 cooling_profile: all sensors: - - fan2 + - fan2_0 - inventory: /system/chassis/motherboard/fan0 cooling_zone: 0 cooling_profile: all sensors: - - fan0 + - fan0_0 - inventory: /system/chassis/motherboard/fan1 cooling_zone: 0 cooling_profile: air sensors: - - fan1 + - fan1_0 - inventory: /system/chassis/motherboard/fan3 cooling_zone: 0 cooling_profile: all sensors: - - fan3 + - fan3_0 diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config/monitor.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config/monitor.yaml index 3459e6371..8c7bbb85d 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config/monitor.yaml +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config/monitor.yaml @@ -3,7 +3,7 @@ deviation: 15 num_sensors_nonfunc_for_fan_nonfunc: 1 sensors: - - name: fan0 + - name: fan0_0 has_target: true - inventory: /system/chassis/motherboard/fan1 @@ -11,7 +11,7 @@ deviation: 15 num_sensors_nonfunc_for_fan_nonfunc: 1 sensors: - - name: fan1 + - name: fan1_0 has_target: true - inventory: /system/chassis/motherboard/fan2 @@ -19,7 +19,7 @@ deviation: 15 num_sensors_nonfunc_for_fan_nonfunc: 1 sensors: - - name: fan2 + - name: fan2_0 has_target: true - inventory: /system/chassis/motherboard/fan3 @@ -27,5 +27,5 @@ deviation: 15 num_sensors_nonfunc_for_fan_nonfunc: 1 sensors: - - name: fan3 + - name: fan3_0 has_target: true diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config%/config.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config%/config.yaml index 53e0f5eba..e4922f392 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config%/config.yaml +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config%/config.yaml @@ -3,19 +3,19 @@ Inventory: /system/chassis/motherboard/fan2 Description: Sensors: - - fan2 + - fan2_0 - PrettyName: fan0 Inventory: /system/chassis/motherboard/fan0 Description: Sensors: - - fan0 + - fan0_0 - PrettyName: fan1 Inventory: /system/chassis/motherboard/fan1 Description: Sensors: - - fan1 + - fan1_0 - PrettyName: fan3 Inventory: /system/chassis/motherboard/fan3 Description: Sensors: - - fan3 + - fan3_0 diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52.conf index 1e8698cbf..8a4b89818 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52.conf @@ -1,4 +1,4 @@ -LABEL_fan1 = "fan0" -LABEL_fan2 = "fan1" -LABEL_fan3 = "fan2" -LABEL_fan4 = "fan3" +LABEL_fan1 = "fan0_0" +LABEL_fan2 = "fan1_0" +LABEL_fan3 = "fan2_0" +LABEL_fan4 = "fan3_0" |