ibm: tacoma: Fix I2C hwmon conf files paths
The AST2600 device tree paths for the I2C buses are different than on
the AST2500, so add a new set of hwmon conf files for the tacoma system
that are the same as witherspoon but just in a different directory.
Stopped doing CHIPS_append in the recipe since witherspoon-tacoma
inherits from witherspoon it was getting all of witherspoon's conf files
as well.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: If9ac0febc8a77dec35820dc4501bc4a3b2c79db5
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf b/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 0000000..cdf8b47
--- /dev/null
+++ b/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-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf b/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 0000000..cdf8b47
--- /dev/null
+++ b/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-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf b/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 0000000..d3df215
--- /dev/null
+++ b/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-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf b/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 0000000..c96bfa7
--- /dev/null
+++ b/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-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf b/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 0000000..e463b51
--- /dev/null
+++ b/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-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf b/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 0000000..2fadbde
--- /dev/null
+++ b/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"