diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-20 16:59:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-20 16:59:53 +0300 |
commit | addb1466f22c9d8435ad4cfebbf01106314dee74 (patch) | |
tree | ada183c317421099791077749f1ec4c87d838d98 /meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc | |
parent | 839c37546efc859282e3d1302639a5e1cffeea3c (diff) | |
download | openbmc-addb1466f22c9d8435ad4cfebbf01106314dee74.tar.xz |
subtree updates
meta-aspeed: c8d791ede6..35a494ecb3:
Andrew Jeffery (1):
linux-aspeed: OCC, ISL68137, ASPEED spi-nor updates
meta-ingrasys: 67bcaf389f..71846afdc6:
Patrick Venture (5):
meta-ingrasys: zaius: hwmon: udc90160 specify informative names
meta-ingrasys: zaius: enable isl68137 and ir38064
meta-ingrasys: zaius: phosphor-hwmon: add vrm nodes
meta-ingrasys: zaius: phosphor-hwmon: add power-brick nodes
meta-ingrasys: zaius: update ipmi sensor inventory
Robert Lippert (3):
meta-ingrasys: zaius: remove reflock fixup recipe
meta-ingrasys: zaius: avsbus-control: use linux driver instead of raw I2C commands
meta-ingrasys: zaius: no longer need to set VDN VOUT_MAX during host boot
Change-Id: I5dbcfae6f937e0f01e5fca4c1f686be0e82b7ee1
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc')
13 files changed, 107 insertions, 25 deletions
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/power-brick@30.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/power-brick@30.conf new file mode 100644 index 000000000..4416f54a1 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/power-brick@30.conf @@ -0,0 +1,5 @@ +LABEL_curr1=brick_p12v_iout +LABEL_in1=brick_p12v_vin +LABEL_in2=brick_p12v_vout +LABEL_temp1=brick_p12v +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/power-brick@6a.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/power-brick@6a.conf new file mode 100644 index 000000000..4416f54a1 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/power-brick@6a.conf @@ -0,0 +1,5 @@ +LABEL_curr1=brick_p12v_iout +LABEL_in1=brick_p12v_vin +LABEL_in2=brick_p12v_vout +LABEL_temp1=brick_p12v +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@40.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@40.conf new file mode 100644 index 000000000..f46a59d8b --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@40.conf @@ -0,0 +1,8 @@ +LABEL_curr1=vr0_p1v2_03_iin +LABEL_curr3=vr0_p1v2_03_iout +LABEL_in1=vr0_p1v2_03_vin +LABEL_in3=vr0_p1v2_03_vout +LABEL_power1=vr0_p1v2_03_pin +LABEL_power3=vr0_p1v2_03_pout +LABEL_temp3=vr0_p1v2_03 +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@41.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@41.conf new file mode 100644 index 000000000..f6efffb80 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@41.conf @@ -0,0 +1,8 @@ +LABEL_curr1=vr0_p1v2_47_iin +LABEL_curr3=vr0_p1v2_47_iout +LABEL_in1=vr0_p1v2_47_vin +LABEL_in3=vr0_p1v2_47_vout +LABEL_power1=vr0_p1v2_47_pin +LABEL_power3=vr0_p1v2_47_pout +LABEL_temp3=vr0_p1v2_47 +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@43.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@43.conf new file mode 100644 index 000000000..d446403ae --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@43.conf @@ -0,0 +1,6 @@ +LABEL_curr1=vr0_vio_iout +LABEL_in1=vr0_vio_vin +LABEL_in2=vr0_vio_vout +LABEL_power1=vr0_vio_pout +LABEL_temp1=vr0_vio +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@60.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@60.conf new file mode 100644 index 000000000..f928e6a0f --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@60.conf @@ -0,0 +1,8 @@ +LABEL_curr1=vr0_vdd_iin +LABEL_curr3=vr0_vdd_iout +LABEL_in1=vr0_vdd_vin +LABEL_in3=vr0_vdd_vout +LABEL_power1=vr0_vdd_pin +LABEL_power3=vr0_vdd_pout +LABEL_temp3=vr0_vdd +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@64.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@64.conf new file mode 100644 index 000000000..4f93e4425 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@64.conf @@ -0,0 +1,11 @@ +LABEL_curr1=vr0_vdnvcs_iin +LABEL_curr2=vr0_vcs_iout +LABEL_curr3=vr0_vdn_iout +LABEL_in1=vr0_vdnvcs_vin +LABEL_in2=vr0_vcs_vout +LABEL_in3=vr0_vdn_vout +LABEL_power1=vr0_vdnvcs_pin +LABEL_power2=vr0_vcs_pout +LABEL_power3=vr0_vdn_pout +LABEL_temp3=vr0_vdncvs +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@40.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@40.conf new file mode 100644 index 000000000..3524508d3 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@40.conf @@ -0,0 +1,8 @@ +LABEL_curr1=vr1_p1v2_03_iin +LABEL_curr3=vr1_p1v2_03_iout +LABEL_in1=vr1_p1v2_03_vin +LABEL_in3=vr1_p1v2_03_vout +LABEL_power1=vr1_p1v2_03_pin +LABEL_power3=vr1_p1v2_03_pout +LABEL_temp3=vr1_p1v2_03 +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@41.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@41.conf new file mode 100644 index 000000000..9d244ba3d --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@41.conf @@ -0,0 +1,8 @@ +LABEL_curr1=vr1_p1v2_47_iin +LABEL_curr3=vr1_p1v2_47_iout +LABEL_in1=vr1_p1v2_47_vin +LABEL_in3=vr1_p1v2_47_vout +LABEL_power1=vr1_p1v2_47_pin +LABEL_power3=vr1_p1v2_47_pout +LABEL_temp3=vr1_p1v2_47 +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@42.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@42.conf new file mode 100644 index 000000000..b40901a88 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@42.conf @@ -0,0 +1,6 @@ +LABEL_curr1=vr1_vio_iout +LABEL_in1=vr1_vio_vin +LABEL_in2=vr1_vio_vout +LABEL_power1=vr1_vio_pout +LABEL_temp1=vr1_vio +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@60.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@60.conf new file mode 100644 index 000000000..67b09ba36 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@60.conf @@ -0,0 +1,8 @@ +LABEL_curr1=vr1_vdd_iin +LABEL_curr3=vr1_vdd_iout +LABEL_in1=vr1_vdd_vin +LABEL_in3=vr1_vdd_vout +LABEL_power1=vr1_vdd_pin +LABEL_power3=vr1_vdd_pout +LABEL_temp3=vr1_vdd +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@64.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@64.conf new file mode 100644 index 000000000..b9c76dc54 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@64.conf @@ -0,0 +1,11 @@ +LABEL_curr1=vr1_vdnvcs_iin +LABEL_curr2=vr1_vcs_iout +LABEL_curr3=vr1_vdn_iout +LABEL_in1=vr1_vdnvcs_vin +LABEL_in2=vr1_vcs_vout +LABEL_in3=vr1_vdn_vout +LABEL_power1=vr1_vdnvcs_pin +LABEL_power2=vr1_vcs_pout +LABEL_power3=vr1_vdn_pout +LABEL_temp3=vr1_vdncvs +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/ucd90160@64.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/ucd90160@64.conf index 92be7fed3..58a9a9170 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/ucd90160@64.conf +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/ucd90160@64.conf @@ -1,25 +1,15 @@ -LABEL_in1=vout1 - -LABEL_in2=vout2 - -LABEL_in3=vout3 - -LABEL_in4=vout4 - -LABEL_in5=vout5 - -LABEL_in6=vout6 - -LABEL_in7=vout7 - -LABEL_in8=vout8 - -LABEL_in9=vout9 - -LABEL_in10=vout10 - -LABEL_in11=vout11 - -LABEL_in12=vout12 - -LABEL_in13=vout13 +LABEL_in1=p12v +LABEL_in2=p5v +LABEL_in3=p3v3 +LABEL_in4=p1v8 +LABEL_in5=p1v05 +LABEL_in6=p1v0_sata +LABEL_in7=cpu0_vdn +LABEL_in8=cpu1_vdn +LABEL_in9=p1v5 +LABEL_in10=cpu0_vio +LABEL_in11=cpu1_vio +LABEL_in12=cpu0_vdd +LABEL_in13=cpu1_vdd +LABEL_in14=cpu0_vcs +LABEL_in15=cpu1_vcs |