Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update

40 files changed, 941 insertions, 152 deletions

diff --git a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf
index 81d808a7b..628a45a22 100644
--- a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf
+++ b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf
@@ -1,7 +1,6 @@
 KERNEL_DEVICETREE = "aspeed-bmc-ibm-rainier.dtb"
 UBOOT_MACHINE = "evb-ast2600_defconfig"
 
-MACHINEOVERRIDES =. "ibm-ac-server:witherspoon:"
 require conf/machine/include/ast2600.inc
 require conf/machine/include/obmc-bsp-common.inc
 require conf/machine/include/openpower.inc
@@ -22,3 +21,4 @@ PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \
     "phosphor-fan-presence-config"
 
 FLASH_SIZE = "131072"
+SKIP_BROKEN_MRW = "1"
diff --git a/meta-ibm/meta-witherspoon/conf/machine/swift.conf b/meta-ibm/meta-witherspoon/conf/machine/swift.conf
index 3915e2b98..4c0abb57d 100644
--- a/meta-ibm/meta-witherspoon/conf/machine/swift.conf
+++ b/meta-ibm/meta-witherspoon/conf/machine/swift.conf
@@ -1,6 +1,6 @@
 require conf/machine/witherspoon.conf
 
-IMAGE_FSTYPES += "ext4"
+IMAGE_FSTYPES += "ext4 mmc-ext4-tar"
 
 KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 
diff --git a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend
index a40f61873..500c91df5 100644
--- a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend
@@ -3,12 +3,25 @@ SRC_URI_append_ibm-ac-server = " file://journald-storage-policy.conf"
 SRC_URI_append_ibm-ac-server = " file://systemd-journald-override.conf"
 SRC_URI_append_ibm-ac-server = " file://journald-size-policy.conf"
 
+SRC_URI_append_rainier = " file://journald-storage-policy.conf"
+SRC_URI_append_rainier = " file://systemd-journald-override.conf"
+SRC_URI_append_rainier = " file://journald-size-policy.conf"
+
 FILES_${PN}_append_ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf"
 FILES_${PN}_append_ibm-ac-server = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf"
 FILES_${PN}_append_ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf"
 
+FILES_${PN}_append_rainier = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf"
+FILES_${PN}_append_rainier = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf"
+FILES_${PN}_append_rainier = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf"
+
 do_install_append_ibm-ac-server() {
         install -m 644 -D ${WORKDIR}/journald-storage-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf
         install -m 644 -D ${WORKDIR}/systemd-journald-override.conf ${D}${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf
         install -m 644 -D ${WORKDIR}/journald-size-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.conf
 }
+do_install_append_rainier() {
+        install -m 644 -D ${WORKDIR}/journald-storage-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf
+        install -m 644 -D ${WORKDIR}/systemd-journald-override.conf ${D}${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf
+        install -m 644 -D ${WORKDIR}/journald-size-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.conf
+}
diff --git a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/rainier.cfg b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/rainier.cfg
new file mode 100644
index 000000000..dc41d5834
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/rainier.cfg
@@ -0,0 +1,7 @@
+CONFIG_SENSORS_IIO_HWMON=y
+CONFIG_SENSORS_TMP421=y
+CONFIG_SENSORS_MAX31785=y
+CONFIG_SENSORS_UCD9000=y
+CONFIG_RTC_DRV_RV8803=y
+CONFIG_IIO=y
+CONFIG_BMP280=y
diff --git a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend
index 6f9a382ac..30df8a8a3 100644
--- a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -1,4 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI_append_ibm-ac-server = " file://witherspoon.cfg"
+SRC_URI_append_rainier = " file://rainier.cfg"
 SRC_URI_append_mihawk = " file://mihawk.cfg"
 SRC_URI_append_witherspoon-128 = " file://0001-ARM-dts-Aspeed-Add-witherspoon-128-machine.patch"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config.bb
index 5371c3a09..5ec7d4565 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config.bb
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config.bb
@@ -50,18 +50,19 @@ do_install() {
     # generate extra-properties.yaml from the MRW for ipmi-fru-parser
     $perlbin $scriptpath/gen_fru_properties.pl -m $mrw \
         -c $op_configpath/ipmi-fru-properties-mrw.yaml \
-        -o extra-properties.yaml
+        -o extra-properties.yaml ${EXTRA_MRW_SCRIPT_ARGS}
 
     # generate fru-read.yaml from the MRW, for ipmid and ipmi-fru-parser
     $perlbin $scriptpath/gen_ipmi_fru.pl -i $mrw \
         -m $op_configpath/ipmi-hostboot-fru-mrw.yaml \
-        -o fru-read-partial.yaml
+        -o fru-read-partial.yaml ${EXTRA_MRW_SCRIPT_ARGS}
     cat fru-read-partial.yaml ${ACx22_IPMI_EXTRA_FRU_READ_YAMLS} \
         > fru-read.yaml
 
     # generate inventory-sensors.yaml from the MRW, for ipmid
     $perlbin $scriptpath/gen_ipmi_sel.pl -i $mrw \
-        -m acx22-ipmi-inventory-sensors.yaml -o inventory-sensors.yaml
+        -m acx22-ipmi-inventory-sensors.yaml -o inventory-sensors.yaml \
+        ${EXTRA_MRW_SCRIPT_ARGS}
 
     # generate sensors.yaml from the MRW, for ipmid
     cat acx22-ipmi-sensors-mrw.yaml \
@@ -69,7 +70,7 @@ do_install() {
         $op_configpath/ipmi-occ-active-sensor-mrw.yaml \
         > sensors-mrw.yaml
     $perlbin $scriptpath/gen_ipmi_sensor.pl -i $mrw -m sensors-mrw.yaml \
-        -o sensors-partial.yaml
+        -o sensors-partial.yaml ${EXTRA_MRW_SCRIPT_ARGS}
     cat sensors-partial.yaml ${ACx22_IPMI_EXTRA_SENSOR_YAMLS} \
         > sensors.yaml
 
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml
index 5534cb6cd..c1902d02b 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml
@@ -297,6 +297,19 @@ actions:
           - property
           - defevents
           - altevents
+    - name: update_default_floor
+      description: >
+          Update the default fan floor to the given speed
+      parameters:
+          - property
+          - speed
+    - name: use_events_on_state
+      description: >
+          Use a set of events when all the group properties are at a given
+          state, otherwise remove the events
+      parameters:
+          - property
+          - events
 
 events:
     - name: default_fan_floor_on_service_fail
@@ -358,6 +371,222 @@ events:
                   speed:
                       value: 10500
                       type: uint64_t
+    - name: set_speed_boundaries_based_on_ambient
+      groups:
+          - name: zone0_control_mode
+            interface: xyz.openbmc_project.Control.ThermalMode
+            property:
+                name: Current
+                type: std::string
+      triggers:
+          - name: init
+            method: getProperties
+            handler: setProperty
+          - name: signal
+            signal: propertiesChanged
+            handler: setProperty
+      actions:
+          - name: update_default_floor
+            property:
+                value: DEFAULT
+                type: std::string
+            speed:
+                value: 8000
+                type: uint64_t
+          - name: update_default_floor
+            property:
+                value: CUSTOM
+                type: std::string
+            speed:
+                value: 8000
+                type: uint64_t
+          - name: update_default_floor
+            property:
+                value: HEAVY_IO
+                type: std::string
+            speed:
+                value: 10500
+                type: uint64_t
+          - name: update_default_floor
+            property:
+                value: MAX_BASE_FAN_FLOOR
+                type: std::string
+            speed:
+                value: 10500
+                type: uint64_t
+          - name: use_events_on_state
+            property:
+                value: DEFAULT
+                type: std::string
+            events:
+                - name: default_fan_speed_boundaries
+                  groups:
+                      - name: zone0_ambient
+                        zone_conditions:
+                            - name: air_cooled_chassis
+                              zones:
+                                  - 0
+                        interface: xyz.openbmc_project.Sensor.Value
+                        property:
+                            name: Value
+                            type: int64_t
+                  triggers:
+                      - name: init
+                        method: getProperties
+                        handler: setProperty
+                      - name: signal
+                        signal: propertiesChanged
+                        handler: setProperty
+                  actions:
+                      - name: set_floor_from_average_sensor_value
+                        map:
+                            value:
+                                - 27000: 3500
+                                - 32000: 4600
+                                - 37000: 5200
+                                - 40000: 5800
+                            type: std::map<int64_t, uint64_t>
+                      - name: set_ceiling_from_average_sensor_value
+                        map:
+                            value:
+                                - 25000: 7200
+                                - 27000: 10500
+                            type: std::map<int64_t, uint64_t>
+                - name: default_fan_speed_boundaries
+                  groups:
+                      - name: zone0_ambient
+                        zone_conditions:
+                            - name: water_and_air_cooled_chassis
+                              zones:
+                                  - 0
+                        interface: xyz.openbmc_project.Sensor.Value
+                        property:
+                            name: Value
+                            type: int64_t
+                  triggers:
+                      - name: init
+                        method: getProperties
+                        handler: setProperty
+                      - name: signal
+                        signal: propertiesChanged
+                        handler: setProperty
+                  actions:
+                      - name: set_floor_from_average_sensor_value
+                        map:
+                            value:
+                                - 27000: 3000
+                                - 32000: 4300
+                                - 37000: 5000
+                                - 40000: 5800
+                            type: std::map<int64_t, uint64_t>
+                      - name: set_ceiling_from_average_sensor_value
+                        map:
+                            value:
+                                - 25000: 7200
+                                - 27000: 10500
+                            type: std::map<int64_t, uint64_t>
+          - name: use_events_on_state
+            property:
+                value: CUSTOM
+                type: std::string
+            events:
+                - name: custom_fan_speed_boundaries
+                  groups:
+                      - name: zone0_ambient
+                        interface: xyz.openbmc_project.Sensor.Value
+                        property:
+                            name: Value
+                            type: int64_t
+                  triggers:
+                      - name: init
+                        method: getProperties
+                        handler: setProperty
+                      - name: signal
+                        signal: propertiesChanged
+                        handler: setProperty
+                  actions:
+                      - name: set_floor_from_average_sensor_value
+                        map:
+                            value:
+                                - 27000: 4600
+                                - 32000: 5000
+                                - 37000: 5400
+                                - 40000: 5800
+                            type: std::map<int64_t, uint64_t>
+                      - name: set_ceiling_from_average_sensor_value
+                        map:
+                            value:
+                                - 25000: 7200
+                                - 27000: 10500
+                            type: std::map<int64_t, uint64_t>
+          - name: use_events_on_state
+            property:
+                value: HEAVY_IO
+                type: std::string
+            events:
+                - name: heavy_io_fan_speed_boundaries
+                  groups:
+                      - name: zone0_ambient
+                        interface: xyz.openbmc_project.Sensor.Value
+                        property:
+                            name: Value
+                            type: int64_t
+                  triggers:
+                      - name: init
+                        method: getProperties
+                        handler: setProperty
+                      - name: signal
+                        signal: propertiesChanged
+                        handler: setProperty
+                  actions:
+                      - name: set_floor_from_average_sensor_value
+                        map:
+                            value:
+                                - 27000: 5900
+                                - 32000: 6800
+                                - 37000: 7500
+                                - 40000: 8200
+                            type: std::map<int64_t, uint64_t>
+                      - name: set_ceiling_from_average_sensor_value
+                        map:
+                            value:
+                                - 25000: 7200
+                                - 27000: 10500
+                            type: std::map<int64_t, uint64_t>
+          - name: use_events_on_state
+            property:
+                value: MAX_BASE_FAN_FLOOR
+                type: std::string
+            events:
+                - name: max_base_fan_floor_fan_speed_boundaries
+                  groups:
+                      - name: zone0_ambient
+                        interface: xyz.openbmc_project.Sensor.Value
+                        property:
+                            name: Value
+                            type: int64_t
+                  triggers:
+                      - name: init
+                        method: getProperties
+                        handler: setProperty
+                      - name: signal
+                        signal: propertiesChanged
+                        handler: setProperty
+                  actions:
+                      - name: set_floor_from_average_sensor_value
+                        map:
+                            value:
+                                - 27000: 7200
+                                - 32000: 8800
+                                - 37000: 9600
+                                - 40000: 10500
+                            type: std::map<int64_t, uint64_t>
+                      - name: set_ceiling_from_average_sensor_value
+                        map:
+                            value:
+                                - 25000: 7200
+                                - 27000: 10500
+                            type: std::map<int64_t, uint64_t>
     - name: full_speed_at_power_on
       precondition:
           name: property_states_match
@@ -448,130 +677,6 @@ events:
                     speed:
                         value: 10500
                         type: uint64_t
-            - name: set_air_cooled_speed_boundaries_based_on_ambient
-              groups:
-                  - name: zone0_control_mode
-                    zone_conditions:
-                        - name: air_cooled_chassis
-                          zones:
-                              - 0
-                    interface: xyz.openbmc_project.Control.ThermalMode
-                    property:
-                        name: Current
-                        type: std::string
-              triggers:
-                  - name: init
-                    method: getProperties
-                    handler: setProperty
-                  - name: signal
-                    signal: propertiesChanged
-                    handler: setProperty
-              actions:
-                  - name: use_alternate_events_on_state
-                    property:
-                        value: CUSTOM
-                        type: std::string
-                    defevents:
-                        - name: default_floor_boundary
-                          groups:
-                              - name: zone0_ambient
-                                zone_conditions:
-                                    - name: air_cooled_chassis
-                                      zones:
-                                          - 0
-                                interface: xyz.openbmc_project.Sensor.Value
-                                property:
-                                    name: Value
-                                    type: int64_t
-                          triggers:
-                              - name: init
-                                method: getProperties
-                                handler: setProperty
-                              - name: signal
-                                signal: propertiesChanged
-                                handler: setProperty
-                          actions:
-                              - name: set_floor_from_average_sensor_value
-                                map:
-                                    value:
-                                        - 27000: 3500
-                                        - 32000: 4600
-                                        - 37000: 5200
-                                        - 40000: 5800
-                                    type: std::map<int64_t, uint64_t>
-                              - name: set_ceiling_from_average_sensor_value
-                                map:
-                                    value:
-                                        - 25000: 7200
-                                        - 27000: 10500
-                                    type: std::map<int64_t, uint64_t>
-                    altevents:
-                        - name: alternate_floor_boundary
-                          groups:
-                              - name: zone0_ambient
-                                zone_conditions:
-                                    - name: air_cooled_chassis
-                                      zones:
-                                          - 0
-                                interface: xyz.openbmc_project.Sensor.Value
-                                property:
-                                    name: Value
-                                    type: int64_t
-                          triggers:
-                              - name: init
-                                method: getProperties
-                                handler: setProperty
-                              - name: signal
-                                signal: propertiesChanged
-                                handler: setProperty
-                          actions:
-                              - name: set_floor_from_average_sensor_value
-                                map:
-                                    value:
-                                        - 27000: 4600
-                                        - 32000: 5000
-                                        - 37000: 5400
-                                        - 40000: 5800
-                                    type: std::map<int64_t, uint64_t>
-                              - name: set_ceiling_from_average_sensor_value
-                                map:
-                                    value:
-                                        - 25000: 7200
-                                        - 27000: 10500
-                                    type: std::map<int64_t, uint64_t>
-            - name: set_water_cooled_speed_boundaries_based_on_ambient
-              groups:
-                  - name: zone0_ambient
-                    zone_conditions:
-                        - name: water_and_air_cooled_chassis
-                          zones:
-                              - 0
-                    interface: xyz.openbmc_project.Sensor.Value
-                    property:
-                        name: Value
-                        type: int64_t
-              triggers:
-                  - name: init
-                    method: getProperties
-                    handler: setProperty
-                  - name: signal
-                    signal: propertiesChanged
-                    handler: setProperty
-              actions:
-                  - name: set_floor_from_average_sensor_value
-                    map:
-                        value:
-                            - 27000: 3000
-                            - 32000: 4300
-                            - 37000: 5000
-                            - 40000: 5800
-                        type: std::map<int64_t, uint64_t>
-                  - name: set_ceiling_from_average_sensor_value
-                    map:
-                        value:
-                            - 25000: 7200
-                            - 27000: 10500
-                        type: std::map<int64_t, uint64_t>
     - name: occ_active_speed_changes
       precondition:
           name: property_states_match
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/witherspoon/zones.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/witherspoon/zones.yaml
index d31b30445..63303d7c0 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/witherspoon/zones.yaml
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/witherspoon/zones.yaml
@@ -28,9 +28,19 @@ zone_configuration:
                       - value: CUSTOM
                         description: >
                             Custom thermal control mode for handling the use of
-                            optical cables located behind the GPU exhaust that
-                            could produce overtemp warnings without this mode
-                            enabled.
+                            PCI cards located behind the GPU exhaust that
+                            could overtemp where the default mode is not
+                            sufficient enough.
+                      - value: HEAVY_IO
+                        description: >
+                            Heavy IO thermal control mode for handling the use
+                            of PCI cards that produce heavy IO utilization and
+                            could overtemp.
+                      - value: MAX_BASE_FAN_FLOOR
+                        description: >
+                            Maximum base fan floor mode is for handling the
+                            use of any hardware that requires the highest
+                            amount of cooling even when the system may be idle.
                 - name: Current
                   type: string
                   persist: true
@@ -63,11 +73,28 @@ zone_configuration:
                       - value: DEFAULT
                         description: >
                             Default thermal control mode
+                      - value: CUSTOM
+                        description: >
+                            Custom thermal control mode for handling the use of
+                            PCI cards located behind the GPU exhaust that
+                            could overtemp where the default mode is not
+                            sufficient enough.
+                      - value: HEAVY_IO
+                        description: >
+                            Heavy IO thermal control mode for handling the use
+                            of PCI cards that produce heavy IO utilization and
+                            could overtemp.
+                      - value: MAX_BASE_FAN_FLOOR
+                        description: >
+                            Maximum base fan floor mode is for handling the
+                            use of any hardware that requires the highest
+                            amount of cooling even when the system may be idle.
                 - name: Current
                   type: string
                   persist: true
                   values:
-                      - value: DEFAULT
-                        description: >
-                            Set current thermal control mode to the
-                            default. No other modes are supported.
+                     - value: DEFAULT
+                       description: >
+                           Set current thermal control mode to the
+                           default which will be replaced on startup if
+                           another selected mode was persisted.
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
index 61a99fd1a..61297c12c 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
@@ -1,12 +1,16 @@
 BMC_RW_MTD_ibm-ac-server = "bmc"
+BMC_RW_MTD_rainier = "bmc"
 BMC_RW_MTD_mihawk = "bmc"
 BMC_RO_MTD_ibm-ac-server = "alt-bmc+bmc"
+BMC_RO_MTD_rainier = "bmc"
 BMC_RO_MTD_mihawk = "alt-bmc+bmc"
 BMC_KERNEL_MTD_ibm-ac-server = "bmc"
+BMC_KERNEL_MTD_rainier = "bmc"
 BMC_KERNEL_MTD_mihawk = "bmc"
 
 # Enable signature verification
 PACKAGECONFIG_append_ibm-ac-server = " verify_signature"
+PACKAGECONFIG_append_rainier = " verify_signature"
 PACKAGECONFIG_append_mihawk = " verify_signature"
 
 # Enable sync of persistent files to the alternate BMC chip
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend
index a698b06ad..423a9e4a1 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend
@@ -5,4 +5,5 @@ RDEPENDS_${PN}_remove_ibm-ac-server = "p9-vcs-workaround"
 RDEPENDS_${PN}_append_mihawk = " avsbus-control"
 RDEPENDS_${PN}_append_mihawk = " vrm-control"
 RDEPENDS_${PN}_remove_mihawk = "p9-vcs-workaround"
+RDEPENDS_${PN}_remove_rainier = "p9-vcs-workaround"
 
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend
index c66cc4efc..562679222 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -1,2 +1,3 @@
 OBMC_IMAGE_EXTRA_INSTALL_append_ibm-ac-server = " mboxd max31785-msl phosphor-msl-verify liberation-fonts uart-render-controller first-boot-set-mac first-boot-set-hostname"
+OBMC_IMAGE_EXTRA_INSTALL_append_rainier = " mboxd"
 OBMC_IMAGE_EXTRA_INSTALL_append_mihawk = " mboxd liberation-fonts uart-render-controller first-boot-set-mac"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/channel_config.json b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/channel_config.json
new file mode 100644
index 000000000..7f26c247e
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/channel_config.json
@@ -0,0 +1,178 @@
+{
+  "0" : {
+    "name" : "IPMB",
+    "is_valid" : true,
+    "active_sessions" : 0,
+    "channel_info" : {
+      "medium_type" : "ipmb",
+      "protocol_type" : "ipmb-1.0",
+      "session_supported" : "session-less",
+      "is_ipmi" : true
+    }
+  },
+  "1" : {
+    "name" : "eth0",
+    "is_valid" : true,
+    "active_sessions" : 0,
+    "channel_info" : {
+      "medium_type" : "lan-802.3",
+      "protocol_type" : "ipmb-1.0",
+      "session_supported" : "multi-session",
+      "is_ipmi" : true
+    }
+  },
+  "2" : {
+    "name" : "eth1",
+    "is_valid" : true,
+    "active_sessions" : 0,
+    "channel_info" : {
+      "medium_type" : "lan-802.3",
+      "protocol_type" : "ipmb-1.0",
+      "session_supported" : "multi-session",
+      "is_ipmi" : true
+    }
+  },
+  "3" : {
+    "name" : "RESERVED",
+    "is_valid" : false,
+    "active_sessions" : 0,
+    "channel_info" : {
+      "medium_type" : "reserved",
+      "protocol_type" : "na",
+      "session_supported" : "session-less",
+      "is_ipmi" : true
+    }
+  },
+  "4" : {
+    "name" : "RESERVED",
+    "is_valid" : false,
+    "active_sessions" : 0,
+    "channel_info" : {
+      "medium_type" : "reserved",
+      "protocol_type" : "na",
+      "session_supported" : "session-less",
+      "is_ipmi" : true
+    }
+  },
+  "5" : {
+    "name" : "RESERVED",
+    "is_valid" : false,
+    "active_sessions" : 0,
+    "channel_info" : {
+      "medium_type" : "reserved",
+      "protocol_type" : "na",
+      "session_supported" : "session-less",
+      "is_ipmi" : true
+    }
+  },
+  "6" : {
+    "name" : "RESERVED",
+    "is_valid" : false,
+    "active_sessions" : 0,
+    "channel_info" : {
+      "medium_type" : "reserved",
+      "protocol_type" : "na",
+      "session_supported" : "session-less",
+      "is_ipmi" : true
+    }
+  },
+  "7" : {
+    "name" : "RESERVED",
+    "is_valid" : false,
+    "active_sessions" : 0,
+    "channel_info" : {
+      "medium_type" : "reserved",
+      "protocol_type" : "na",
+      "session_supported" : "session-less",
+      "is_ipmi" : true
+    }
+  },
+  "8" : {
+    "name" : "INTRABMC",
+    "is_valid" : true,
+    "active_sessions" : 0,
+    "channel_info" : {
+      "medium_type" : "oem",
+      "protocol_type" : "oem",
+      "session_supported" : "session-less",
+      "is_ipmi" : true
+    }
+  },
+  "9" : {
+    "name" : "RESERVED",
+    "is_valid" : false,
+    "active_sessions" : 0,
+    "channel_info" : {
+      "medium_type" : "reserved",
+      "protocol_type" : "na",
+      "session_supported" : "session-less",
+      "is_ipmi" : true
+    }
+  },
+  "10" : {
+    "name" : "RESERVED",
+    "is_valid" : false,
+    "active_sessions" : 0,
+    "channel_info" : {
+      "medium_type" : "reserved",
+      "protocol_type" : "na",
+      "session_supported" : "session-less",
+      "is_ipmi" : true
+    }
+  },
+  "11" : {
+    "name" : "RESERVED",
+    "is_valid" : false,
+    "active_sessions" : 0,
+    "channel_info" : {
+      "medium_type" : "reserved",
+      "protocol_type" : "na",
+      "session_supported" : "session-less",
+      "is_ipmi" : true
+    }
+  },
+  "12" : {
+    "name" : "RESERVED",
+    "is_valid" : false,
+    "active_sessions" : 0,
+    "channel_info" : {
+      "medium_type" : "reserved",
+      "protocol_type" : "na",
+      "session_supported" : "session-less",
+      "is_ipmi" : true
+    }
+  },
+  "13" : {
+    "name" : "RESERVED",
+    "is_valid" : false,
+    "active_sessions" : 0,
+    "channel_info" : {
+      "medium_type" : "reserved",
+      "protocol_type" : "na",
+      "session_supported" : "session-less",
+      "is_ipmi" : true
+    }
+  },
+  "14" : {
+    "name" : "SELF",
+    "is_valid" : false,
+    "active_sessions" : 0,
+    "channel_info" : {
+      "medium_type" : "ipmb",
+      "protocol_type" : "ipmb-1.0",
+      "session_supported" : "session-less",
+      "is_ipmi" : true
+    }
+  },
+  "15" : {
+    "name" : "SMS",
+    "is_valid" : true,
+    "active_sessions" : 0,
+    "channel_info" : {
+      "medium_type" : "system-interface",
+      "protocol_type" : "kcs",
+      "session_supported" : "session-less",
+      "is_ipmi" : true
+    }
+  }
+}
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json
new file mode 100644
index 000000000..cd72656e2
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json
@@ -0,0 +1,59 @@
+{
+    "inlet": [
+        {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/ambient_temp", "record_id": 255}
+    ],
+    "baseboard": [
+        {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_pcie_temp", "record_id": 253}
+        {"instance": 2, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_pcie_temp", "record_id": 254}
+    ],
+    "cpu": [
+        {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core0_temp", "record_id": 17},
+        {"instance": 2, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core1_temp", "record_id": 20},
+        {"instance": 3, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core2_temp", "record_id": 23},
+        {"instance": 4, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core3_temp", "record_id": 26},
+        {"instance": 5, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core4_temp", "record_id": 29},
+        {"instance": 6, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core5_temp", "record_id": 32},
+        {"instance": 7, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core6_temp", "record_id": 35},
+        {"instance": 8, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core7_temp", "record_id": 38},
+        {"instance": 9, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core8_temp", "record_id": 41},
+        {"instance": 10, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core9_temp", "record_id": 44},
+        {"instance": 11, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core10_temp", "record_id": 47},
+        {"instance": 12, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core11_temp", "record_id": 50},
+        {"instance": 13, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core12_temp", "record_id": 53},
+        {"instance": 14, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core13_temp", "record_id": 56},
+        {"instance": 15, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core14_temp", "record_id": 59},
+        {"instance": 16, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core15_temp", "record_id": 62},
+        {"instance": 17, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core16_temp", "record_id": 65},
+        {"instance": 18, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core17_temp", "record_id": 68},
+        {"instance": 19, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core18_temp", "record_id": 71},
+        {"instance": 20, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core19_temp", "record_id": 74},
+        {"instance": 21, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core20_temp", "record_id": 77},
+        {"instance": 22, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core21_temp", "record_id": 80},
+        {"instance": 23, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core22_temp", "record_id": 83},
+        {"instance": 24, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core23_temp", "record_id": 86},
+        {"instance": 25, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core0_temp", "record_id": 91},
+        {"instance": 26, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core1_temp", "record_id": 94},
+        {"instance": 27, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core2_temp", "record_id": 97},
+        {"instance": 28, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core3_temp", "record_id": 100},
+        {"instance": 29, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core4_temp", "record_id": 103},
+        {"instance": 30, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core5_temp", "record_id": 106},
+        {"instance": 31, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core6_temp", "record_id": 109},
+        {"instance": 32, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core7_temp", "record_id": 112},
+        {"instance": 33, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core8_temp", "record_id": 115},
+        {"instance": 34, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core9_temp", "record_id": 118},
+        {"instance": 35, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core10_temp", "record_id": 121},
+        {"instance": 36, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core11_temp", "record_id": 124},
+        {"instance": 37, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core12_temp", "record_id": 127},
+        {"instance": 38, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core13_temp", "record_id": 130},
+        {"instance": 39, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core14_temp", "record_id": 133},
+        {"instance": 40, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core15_temp", "record_id": 136},
+        {"instance": 41, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core16_temp", "record_id": 139},
+        {"instance": 42, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core17_temp", "record_id": 142},
+        {"instance": 43, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core18_temp", "record_id": 145},
+        {"instance": 44, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core19_temp", "record_id": 148},
+        {"instance": 45, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core20_temp", "record_id": 151},
+        {"instance": 46, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core21_temp", "record_id": 154},
+        {"instance": 47, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core22_temp", "record_id": 157},
+        {"instance": 48, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core23_temp", "record_id": 160}
+    ]
+}
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/power_reading.json b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/power_reading.json
new file mode 100644
index 000000000..97e8f32b5
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/power_reading.json
@@ -0,0 +1,3 @@
+{
+  "path": "/xyz/openbmc_project/sensors/power/total_power"
+}
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/logging/phosphor-logging_%.bbappend
index 5e2dc6c20..9dff37d10 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/phosphor-logging_%.bbappend
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/logging/phosphor-logging_%.bbappend
@@ -1 +1,2 @@
 PACKAGECONFIG_append_witherspoon-128 = " openpower-pels"
+PACKAGECONFIG_append_rainier = " openpower-pels"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend
index 9ead95927..e23d8fa45 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend
@@ -1,5 +1,6 @@
 MBOXD_FLASH_SIZE_ibm-ac-server = "64M"
 MBOXD_FLASH_SIZE_mihawk = "64M"
+MBOXD_FLASH_SIZE_rainier = "64M"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service b/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service
index 44b34195e..890551e7a 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service
@@ -1,7 +1,6 @@
 [Unit]
 Description=Stop the ethernet link failover
-Wants=xyz.openbmc_project.Network.service
-After=xyz.openbmc_project.Network.service
+After=network.service
 
 [Service]
 Restart=no
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend
index ba6e393bb..bcb2d0136 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend
@@ -1,8 +1,15 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/network:"
 SRC_URI_append_ibm-ac-server = " file://ncsi-netlink.service"
+SRC_URI_append_mihawk = " file://ncsi-netlink.service"
+
 SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " ncsi-netlink.service"
+SYSTEMD_SERVICE_${PN}_append_mihawk = " ncsi-netlink.service"
 
 do_install_append_ibm-ac-server() {
     install -d ${D}${systemd_system_unitdir}
     install -m 0644 ${WORKDIR}/ncsi-netlink.service ${D}${systemd_system_unitdir}
 }
+do_install_append_mihawk() {
+    install -d ${D}${systemd_system_unitdir}
+    install -m 0644 ${WORKDIR}/ncsi-netlink.service ${D}${systemd_system_unitdir}
+}
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index c75c7d0f9..005dd0c66 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1,9 +1,11 @@
 RDEPENDS_${PN}-inventory_append_ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence"
+RDEPENDS_${PN}-inventory_append_rainier = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence"
 RDEPENDS_${PN}-inventory_append_mihawk = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence id-button phosphor-cooling-type"
 RDEPENDS_${PN}-fan-control_append_ibm-ac-server = " witherspoon-fan-watchdog"
 RDEPENDS_${PN}-extras_append_ibm-ac-server = " witherspoon-pfault-analysis witherspoon-power-supply-sync phosphor-webui"
+RDEPENDS_${PN}-extras_append_rainier = " phosphor-webui"
 RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing"
 RDEPENDS_${PN}-extras_remove_rainier = "obmc-ikvm liberation-fonts uart-render-controller"
 RDEPENDS_${PN}-extras_remove_witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller"
-
+RDEPENDS_${PN}-logging_remove_rainier = "ibm-logging"
 ${PN}-software-extras_append_ibm-ac-server = " phosphor-software-manager-sync"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml
index d23ce58fb..e40e8dd7c 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml
@@ -198,3 +198,13 @@
         pinID:           83
         poll:            false
         analysis:        none
+  GPIOAnalysis:
+      - type:            none
+        path:            ""
+        gpio_value:      low
+        error_function:  memGoodError
+        option_flags:    none
+        GPIODefinitions:
+            - GPIODefinition: none
+              gpio:      0
+              callout:   ""
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc
index 0612d62af..c3ef3e460 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc
@@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 SRC_URI += "git://github.com/openbmc/phosphor-power"
-SRCREV = "b3853e2d3ac295a961e08927d177b40ddd683914"
+SRCREV = "bd4b86d3982cd5592e0417a5e45be6d3083f4c81"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb
index 0645eb7a7..49fe344dc 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb
@@ -19,9 +19,10 @@ DEPENDS += " \
          sdbus++-native \
          sdeventplus \
          power-sequencer \
+         nlohmann-json \
          "
 
-EXTRA_OECONF = "UCD90160_DEF_YAML_FILE=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml"
+EXTRA_OEMESON += "-Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml"
 
 CHASSIS_ON_TGT = "obmc-chassis-poweron@0.target"
 SEQ_MONITOR_SVC = "pseq-monitor.service"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
index 5b347c10c..5b347c10c 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
index ba53cd95d..ba53cd95d 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
index 5582e9dbf..5582e9dbf 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
index 1cc4afb71..1cc4afb71 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf
new file mode 100644
index 000000000..cdf8b4726
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf
@@ -0,0 +1,6 @@
+LABEL_temp1 = "ambient"
+WARNHI_temp1 = "25000"
+WARNLO_temp1 = "0"
+CRITHI_temp1 = "35000"
+CRITLO_temp1 = "0"
+OFFSET_temp1 = "-2000"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf
new file mode 100644
index 000000000..cdf8b4726
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf
@@ -0,0 +1,6 @@
+LABEL_temp1 = "ambient"
+WARNHI_temp1 = "25000"
+WARNLO_temp1 = "0"
+CRITHI_temp1 = "35000"
+CRITLO_temp1 = "0"
+OFFSET_temp1 = "-2000"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf
new file mode 100644
index 000000000..d3df21599
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf
@@ -0,0 +1,17 @@
+LABEL_fan1 = "fan0_0"
+
+LABEL_fan2 = "fan1_0"
+
+LABEL_fan3 = "fan2_0"
+
+LABEL_fan4 = "fan3_0"
+
+LABEL_fan5 = "fan0_1"
+
+LABEL_fan6 = "fan1_1"
+
+LABEL_fan7 = "fan2_1"
+
+LABEL_fan8 = "fan3_1"
+
+TARGET_MODE = "RPM"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf
new file mode 100644
index 000000000..c96bfa76b
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf
@@ -0,0 +1,13 @@
+LABEL_fan1 = "fan0_0"
+
+LABEL_fan3 = "fan2_0"
+
+LABEL_fan4 = "fan3_0"
+
+LABEL_fan5 = "fan0_1"
+
+LABEL_fan7 = "fan2_1"
+
+LABEL_fan8 = "fan3_1"
+
+TARGET_MODE = "RPM"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf
new file mode 100644
index 000000000..e463b517c
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf
@@ -0,0 +1,23 @@
+LABEL_in1="ps1_input_voltage"
+WARNHI_in1="290000"
+WARNLO_in1="200000"
+CRITHI_in1="300000"
+CRITLO_in1="180000"
+
+LABEL_in2="ps1_output_voltage"
+WARNHI_in2="12700"
+WARNLO_in2="0"
+CRITHI_in2="13000"
+CRITLO_in2="0"
+
+LABEL_curr1="ps1_output_current"
+WARNHI_curr1="170000"
+WARNLO_curr1="0"
+CRITHI_curr1="180000"
+CRITLO_curr1="0"
+
+LABEL_power1="ps1_input_power"
+WARNHI_power1="2350000000"
+WARNLO_power1="0"
+CRITHI_power1="2500000000"
+CRITLO_power1="0"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf
new file mode 100644
index 000000000..2fadbdec0
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf
@@ -0,0 +1,23 @@
+LABEL_in1="ps0_input_voltage"
+WARNHI_in1="290000"
+WARNLO_in1="200000"
+CRITHI_in1="300000"
+CRITLO_in1="180000"
+
+LABEL_in2="ps0_output_voltage"
+WARNHI_in2="12700"
+WARNLO_in2="0"
+CRITHI_in2="13000"
+CRITLO_in2="0"
+
+LABEL_curr1="ps0_output_current"
+WARNHI_curr1="170000"
+WARNLO_curr1="0"
+CRITHI_curr1="180000"
+CRITLO_curr1="0"
+
+LABEL_power1="ps0_input_power"
+WARNHI_power1="2350000000"
+WARNLO_power1="0"
+CRITHI_power1="2500000000"
+CRITLO_power1="0"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf
new file mode 100644
index 000000000..c5344aeb6
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf
@@ -0,0 +1,65 @@
+#4-0070
+#VDD then VCS
+
+MODE_in1 = "label"
+MODE_in2 = "label"
+MODE_in3 = "label"
+MODE_in4 = "label"
+
+MODE_curr1 = "label"
+MODE_curr2 = "label"
+MODE_curr3 = "label"
+MODE_curr4 = "label"
+
+MODE_power1 = "label"
+MODE_power2 = "label"
+MODE_power3 = "label"
+MODE_power4 = "label"
+
+LABEL_temp1 = "p0_vdd_temp"
+WARNHI_temp1 = "80000"
+WARNLO_temp1 = "0"
+CRITHI_temp1 = "85000"
+CRITLO_temp1 = "0"
+
+LABEL_curriout1 = "p0_vdd_current"
+WARNLO_curriout1 = "0"
+CRITLO_curriout1 = "0"
+WARNHI_curriout1 = "320000"
+CRITHI_curriout1 = "360000"
+
+LABEL_invout1 = "p0_vdd_voltage"
+WARNLO_invout1 = "0"
+CRITLO_invout1 = "0"
+WARNHI_invout1 = "1150"
+CRITHI_invout1 = "1300"
+
+LABEL_powerpout1 = "p0_vdd_power"
+WARNLO_powerpout1 = "0"
+CRITLO_powerpout1 = "0"
+WARNHI_powerpout1 = "270000000"
+CRITHI_powerpout1 = "290000000"
+
+LABEL_temp2 = "p0_vcs_temp"
+WARNHI_temp2 = "80000"
+WARNLO_temp2 = "0"
+CRITHI_temp2 = "85000"
+CRITLO_temp2 = "0"
+
+LABEL_curriout2 = "p0_vcs_current"
+WARNLO_curriout2 = "0"
+CRITLO_curriout2 = "0"
+WARNHI_curriout2 = "20000"
+CRITHI_curriout2 = "25000"
+
+LABEL_invout2 = "p0_vcs_voltage"
+WARNLO_invout2 = "0"
+CRITLO_invout2 = "0"
+WARNHI_invout2 = "1150"
+CRITHI_invout2 = "1300"
+
+LABEL_powerpout2 = "p0_vcs_power"
+WARNLO_powerpout2 = "0"
+CRITLO_powerpout2 = "0"
+WARNHI_powerpout2 = "20000000"
+CRITHI_powerpout2 = "25000000"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf
new file mode 100644
index 000000000..23746aa11
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf
@@ -0,0 +1,65 @@
+#4-0071
+#VDN then VDDR
+
+MODE_in1 = "label"
+MODE_in2 = "label"
+MODE_in3 = "label"
+MODE_in4 = "label"
+
+MODE_curr1 = "label"
+MODE_curr2 = "label"
+MODE_curr3 = "label"
+MODE_curr4 = "label"
+
+MODE_power1 = "label"
+MODE_power2 = "label"
+MODE_power3 = "label"
+MODE_power4 = "label"
+
+LABEL_temp1 = "p0_vdn_temp"
+WARNHI_temp1 = "80000"
+WARNLO_temp1 = "0"
+CRITHI_temp1 = "85000"
+CRITLO_temp1 = "0"
+
+LABEL_curriout1 = "p0_vdn_current"
+WARNLO_curriout1 = "0"
+CRITLO_curriout1 = "0"
+WARNHI_curriout1 = "80000"
+CRITHI_curriout1 = "110000"
+
+LABEL_invout1 = "p0_vdn_voltage"
+WARNLO_invout1 = "0"
+CRITLO_invout1 = "0"
+WARNHI_invout1 = "1100"
+CRITHI_invout1 = "1300"
+
+LABEL_powerpout1 = "p0_vdn_power"
+WARNLO_powerpout1 = "0"
+CRITLO_powerpout1 = "0"
+WARNHI_powerpout1 = "88000000"
+CRITHI_powerpout1 = "121000000"
+
+LABEL_temp2 = "p0_vddr_temp"
+WARNHI_temp2 = "80000"
+WARNLO_temp2 = "0"
+CRITHI_temp2 = "85000"
+CRITLO_temp2 = "0"
+
+LABEL_curriout2 = "p0_vddr_current"
+WARNLO_curriout2 = "0"
+CRITLO_curriout2 = "0"
+WARNHI_curriout2 = "115000"
+CRITHI_curriout2 = "130000"
+
+LABEL_invout2 = "p0_vddr_voltage"
+WARNLO_invout2 = "0"
+CRITLO_invout2 = "0"
+WARNHI_invout2 = "1280"
+CRITHI_invout2 = "1350"
+
+LABEL_powerpout2 = "p0_vddr_power"
+WARNLO_powerpout2 = "0"
+CRITLO_powerpout2 = "0"
+WARNHI_powerpout2 = "139150000"
+CRITHI_powerpout2 = "159900000"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf
new file mode 100644
index 000000000..e7d8aaf23
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf
@@ -0,0 +1,65 @@
+#5-0070
+#VDD then VCS
+
+MODE_in1 = "label"
+MODE_in2 = "label"
+MODE_in3 = "label"
+MODE_in4 = "label"
+
+MODE_curr1 = "label"
+MODE_curr2 = "label"
+MODE_curr3 = "label"
+MODE_curr4 = "label"
+
+MODE_power1 = "label"
+MODE_power2 = "label"
+MODE_power3 = "label"
+MODE_power4 = "label"
+
+LABEL_temp1 = "p1_vdd_temp"
+WARNHI_temp1 = "80000"
+WARNLO_temp1 = "0"
+CRITHI_temp1 = "85000"
+CRITLO_temp1 = "0"
+
+LABEL_curriout1 = "p1_vdd_current"
+WARNLO_curriout1 = "0"
+CRITLO_curriout1 = "0"
+WARNHI_curriout1 = "320000"
+CRITHI_curriout1 = "360000"
+
+LABEL_invout1 = "p1_vdd_voltage"
+WARNLO_invout1 = "0"
+CRITLO_invout1 = "0"
+WARNHI_invout1 = "1150"
+CRITHI_invout1 = "1300"
+
+LABEL_powerpout1 = "p1_vdd_power"
+WARNLO_powerpout1 = "0"
+CRITLO_powerpout1 = "0"
+WARNHI_powerpout1 = "270000000"
+CRITHI_powerpout1 = "290000000"
+
+LABEL_temp2 = "p1_vcs_temp"
+WARNHI_temp2 = "80000"
+WARNLO_temp2 = "0"
+CRITHI_temp2 = "85000"
+CRITLO_temp2 = "0"
+
+LABEL_curriout2 = "p1_vcs_current"
+WARNLO_curriout2 = "0"
+CRITLO_curriout2 = "0"
+WARNHI_curriout2 = "20000"
+CRITHI_curriout2 = "25000"
+
+LABEL_invout2 = "p1_vcs_voltage"
+WARNLO_invout2 = "0"
+CRITLO_invout2 = "0"
+WARNHI_invout2 = "1150"
+CRITHI_invout2 = "1300"
+
+LABEL_powerpout2 = "p1_vcs_power"
+WARNLO_powerpout2 = "0"
+CRITLO_powerpout2 = "0"
+WARNHI_powerpout2 = "20000000"
+CRITHI_powerpout2 = "25000000"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf
new file mode 100644
index 000000000..30ec05dbb
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf
@@ -0,0 +1,65 @@
+#5-0071
+#VDN then VDDR
+
+MODE_in1 = "label"
+MODE_in2 = "label"
+MODE_in3 = "label"
+MODE_in4 = "label"
+
+MODE_curr1 = "label"
+MODE_curr2 = "label"
+MODE_curr3 = "label"
+MODE_curr4 = "label"
+
+MODE_power1 = "label"
+MODE_power2 = "label"
+MODE_power3 = "label"
+MODE_power4 = "label"
+
+LABEL_temp1 = "p1_vdn_temp"
+WARNHI_temp1 = "80000"
+WARNLO_temp1 = "0"
+CRITHI_temp1 = "85000"
+CRITLO_temp1 = "0"
+
+LABEL_curriout1 = "p1_vdn_current"
+WARNLO_curriout1 = "0"
+CRITLO_curriout1 = "0"
+WARNHI_curriout1 = "80000"
+CRITHI_curriout1 = "110000"
+
+LABEL_invout1 = "p1_vdn_voltage"
+WARNLO_invout1 = "0"
+CRITLO_invout1 = "0"
+WARNHI_invout1 = "1100"
+CRITHI_invout1 = "1300"
+
+LABEL_powerpout1 = "p1_vdn_power"
+WARNLO_powerpout1 = "0"
+CRITLO_powerpout1 = "0"
+WARNHI_powerpout1 = "88000000"
+CRITHI_powerpout1 = "121000000"
+
+LABEL_temp2 = "p1_vddr_temp"
+WARNHI_temp2 = "80000"
+WARNLO_temp2 = "0"
+CRITHI_temp2 = "85000"
+CRITLO_temp2 = "0"
+
+LABEL_curriout2 = "p1_vddr_current"
+WARNLO_curriout2 = "0"
+CRITLO_curriout2 = "0"
+WARNHI_curriout2 = "115000"
+CRITHI_curriout2 = "130000"
+
+LABEL_invout2 = "p1_vddr_voltage"
+WARNLO_invout2 = "0"
+CRITLO_invout2 = "0"
+WARNHI_invout2 = "1280"
+CRITHI_invout2 = "1350"
+
+LABEL_powerpout2 = "p1_vddr_power"
+WARNLO_powerpout2 = "0"
+CRITLO_powerpout2 = "0"
+WARNHI_powerpout2 = "139150000"
+CRITHI_powerpout2 = "159900000"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf
new file mode 100644
index 000000000..3af092867
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf
@@ -0,0 +1,5 @@
+LABEL_temp1 = "pcie"
+WARNHI_temp1 = "60000"
+WARNLO_temp1 = "0"
+CRITHI_temp1 = "70000"
+CRITLO_temp1 = "0"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
index c5fa56f65..c5fa56f65 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
index 55b72fc2a..55b72fc2a 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 4d60a74c2..36029dd72 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -8,13 +8,11 @@ SRC_URI_append_ibm-ac-server = " \
            file://start_max31785_hwmon.sh \
            "
 
-CHIPS = " \
-        bus@1e78a000/i2c-bus@100/max31785@52_air \
-        bus@1e78a000/i2c-bus@100/max31785@52_water \
-        bus@1e78a000/i2c-bus@100/power-supply@68 \
-        bus@1e78a000/i2c-bus@100/power-supply@69 \
-        "
-CHIPS_append_witherspoon = " \
+CHIPS_witherspoon = " \
+               bus@1e78a000/i2c-bus@100/max31785@52_air \
+               bus@1e78a000/i2c-bus@100/max31785@52_water \
+               bus@1e78a000/i2c-bus@100/power-supply@68 \
+               bus@1e78a000/i2c-bus@100/power-supply@69 \
                bus@1e78a000/i2c-bus@100/bmp280@77 \
                bus@1e78a000/i2c-bus@100/dps310@76 \
                bus@1e78a000/i2c-bus@140/ir35221@70 \
@@ -23,7 +21,11 @@ CHIPS_append_witherspoon = " \
                bus@1e78a000/i2c-bus@180/ir35221@71 \
                bus@1e78a000/i2c-bus@380/tmp275@4a \
                "
-CHIPS_append_swift = " \
+CHIPS_swift = " \
+               bus@1e78a000/i2c-bus@100/max31785@52_air \
+               bus@1e78a000/i2c-bus@100/max31785@52_water \
+               bus@1e78a000/i2c-bus@100/power-supply@68 \
+               bus@1e78a000/i2c-bus@100/power-supply@69 \
                bus@1e78a000/i2c-bus@440/tmp275@4a \
                bus@1e78a000/i2c-bus@440/tmp275@48 \
                bus@1e78a000/i2c-bus@300/tmp275@48 \
@@ -50,6 +52,19 @@ CHIPS_mihawk = " \
                bus@1e78a000/i2c-bus@440/pca9545@70/i2c@3/tmp275@48 \
                "
 
+CHIPS_witherspoon-tacoma = " \
+               bus@1e78a000/i2c-bus@200/max31785@52_air \
+               bus@1e78a000/i2c-bus@200/max31785@52_water \
+               bus@1e78a000/i2c-bus@200/power-supply@68 \
+               bus@1e78a000/i2c-bus@200/power-supply@69 \
+               bus@1e78a000/i2c-bus@200/bmp280@77 \
+               bus@1e78a000/i2c-bus@200/dps310@76 \
+               bus@1e78a000/i2c-bus@280/ir35221@70 \
+               bus@1e78a000/i2c-bus@280/ir35221@71 \
+               bus@1e78a000/i2c-bus@300/ir35221@70 \
+               bus@1e78a000/i2c-bus@300/ir35221@71 \
+               bus@1e78a000/i2c-bus@500/tmp275@4a \
+               "
 ITEMSFMT = "ahb/apb/{0}.conf"
 ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}"
 ITEMS_append_mihawk += " iio-hwmon-vdd0.conf"
@@ -71,9 +86,9 @@ ITEMS_append_mihawk += " iio-hwmon-battery.conf"
 
 OCCS = " \
         00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \
-        00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \
+        00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \
         "
-OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf"
+OCCSFMT = "devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/{0}.conf"
 OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}"
 
 ENVS = "obmc/hwmon/{0}"