From e161514219e0dc8a957dabbb8529fb9fcac4e115 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 22 Apr 2020 14:06:02 -0400 Subject: meta-ibm: move all meta-witherspoon metadata The metadata common to all IBM systems is confusingly split between meta-ibm and meta-witherspoon. Move everything to meta-ibm. The meta-ibm README is re-written to more accurately reflect the scope of the layer. Allow the configuration samples (bblayers.conf.sample, local.conf.sample) to be sourced from either meta-ibm or meta-witherspoon until such a time that any workflows and tooling have had the opportunity to move to meta-ibm. (From meta-ibm rev: 6e05ef2e90b214eaf4e43ee7027bbbb1d8d09442) Change-Id: I3ec890d5300f9649c974ea6b9dca93a2e8a889ab Signed-off-by: Brad Bishop Signed-off-by: Andrew Geissler --- .../apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf | 6 ++ .../apb/bus@1e78a000/i2c-bus@200/dps310@76.conf | 6 ++ .../bus@1e78a000/i2c-bus@200/max31785@52_air.conf | 17 ++++++ .../i2c-bus@200/max31785@52_water.conf | 13 +++++ .../bus@1e78a000/i2c-bus@200/power-supply@68.conf | 23 ++++++++ .../bus@1e78a000/i2c-bus@200/power-supply@69.conf | 23 ++++++++ .../apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf | 65 ++++++++++++++++++++++ .../apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf | 65 ++++++++++++++++++++++ .../apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf | 65 ++++++++++++++++++++++ .../apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf | 65 ++++++++++++++++++++++ .../apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf | 5 ++ 11 files changed, 353 insertions(+) create mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf create mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf create mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf create mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf create mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf create mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf create mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf create mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf create mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf create mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf create mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf (limited to 'meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma') diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf b/meta-ibm/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/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/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf b/meta-ibm/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/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/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf b/meta-ibm/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/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/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf b/meta-ibm/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/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/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf b/meta-ibm/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/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/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf b/meta-ibm/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/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/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf b/meta-ibm/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/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/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf b/meta-ibm/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/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/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf b/meta-ibm/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/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/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf b/meta-ibm/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/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/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf b/meta-ibm/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/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" -- cgit v1.2.3