From 7888d88131042910335eef5d35d704740b672214 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Thu, 4 Oct 2018 08:40:43 -0700 Subject: meta-ingrasys: zaius: rename phosphor-hwmon Rename phosphor-hwmon%.bbappend to phosphor-hwmon_%.bbappend. Tested: Verified phosphor-hwmon confs were found in rootfs. (From meta-ingrasys rev: 7be24a88b9edcfb59929bbc7ec4f904b386a41d9) Change-Id: I96dda86c65ce599ea34ae444d955987f11953b0b Signed-off-by: Patrick Venture Signed-off-by: Brad Bishop --- .../sensors/phosphor-hwmon%.bbappend | 25 ------- .../pca9541a@70/i2c-arb/hotswap@54.conf | 7 -- .../apb/i2c@1e78a000/i2c-bus@40/ucd90160@64.conf | 25 ------- .../ahb/apb/pwm-tacho-controller@1e786000.conf | 4 -- .../00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf | 83 ---------------------- .../01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf | 83 ---------------------- .../obmc/hwmon/iio-hwmon-battery.conf | 7 -- .../phosphor-hwmon%/obmc/hwmon/iio-hwmon.conf | 24 ------- .../phosphor-hwmon%/obmc/hwmon/onewire0.conf | 1 - .../phosphor-hwmon%/obmc/hwmon/onewire1.conf | 1 - .../phosphor-hwmon%/obmc/hwmon/onewire2.conf | 1 - .../phosphor-hwmon%/obmc/hwmon/onewire3.conf | 1 - .../pca9541a@70/i2c-arb/hotswap@54.conf | 7 ++ .../apb/i2c@1e78a000/i2c-bus@40/ucd90160@64.conf | 25 +++++++ .../ahb/apb/pwm-tacho-controller@1e786000.conf | 4 ++ .../00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf | 83 ++++++++++++++++++++++ .../01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf | 83 ++++++++++++++++++++++ .../obmc/hwmon/iio-hwmon-battery.conf | 7 ++ .../phosphor-hwmon/obmc/hwmon/iio-hwmon.conf | 24 +++++++ .../phosphor-hwmon/obmc/hwmon/onewire0.conf | 1 + .../phosphor-hwmon/obmc/hwmon/onewire1.conf | 1 + .../phosphor-hwmon/obmc/hwmon/onewire2.conf | 1 + .../phosphor-hwmon/obmc/hwmon/onewire3.conf | 1 + .../sensors/phosphor-hwmon_%.bbappend | 25 +++++++ 24 files changed, 262 insertions(+), 262 deletions(-) delete mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%.bbappend delete mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/pca9541a@70/i2c-arb/hotswap@54.conf delete mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/ucd90160@64.conf delete mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf delete mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf delete mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/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 delete mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/iio-hwmon-battery.conf delete mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/iio-hwmon.conf delete mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire0.conf delete mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire1.conf delete mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire2.conf delete mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire3.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/pca9541a@70/i2c-arb/hotswap@54.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/ucd90160@64.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/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 create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon-battery.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire0.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire1.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire2.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire3.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend (limited to 'meta-ingrasys') diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%.bbappend deleted file mode 100644 index 3e6b72964..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%.bbappend +++ /dev/null @@ -1,25 +0,0 @@ -FILESEXTRAPATHS_prepend_zaius := "${THISDIR}/${PN}:" - -ZAIUS_CHIPS = "i2c@1e78a000/i2c-bus@40/ucd90160@64" -ZAIUS_CHIPS += " i2c@1e78a000/i2c-bus@300/pca9541a@70/i2c-arb/hotswap@54" -ZAIUS_CHIPS += " pwm-tacho-controller@1e786000" -ZAIUS_ITEMSFMT = "ahb/apb/{0}.conf" - -ZAIUS_ITEMS = "${@compose_list(d, 'ZAIUS_ITEMSFMT', 'ZAIUS_CHIPS')}" -ZAIUS_ITEMS += "iio-hwmon.conf iio-hwmon-battery.conf" -ZAIUS_ITEMS += " onewire0.conf" -ZAIUS_ITEMS += " onewire1.conf" -ZAIUS_ITEMS += " onewire2.conf" -ZAIUS_ITEMS += " onewire3.conf" - -ZAIUS_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 \ - " -ZAIUS_OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" -ZAIUS_OCCITEMS = "${@compose_list(d, 'ZAIUS_OCCSFMT', 'ZAIUS_OCCS')}" - -ENVS = "obmc/hwmon/{0}" -# compose_list is not defined immediately so don't use := -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_zaius = " ${@compose_list(d, 'ENVS', 'ZAIUS_ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_zaius = " ${@compose_list(d, 'ENVS', 'ZAIUS_OCCITEMS')}" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/pca9541a@70/i2c-arb/hotswap@54.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/pca9541a@70/i2c-arb/hotswap@54.conf deleted file mode 100644 index 8e27a12b1..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/pca9541a@70/i2c-arb/hotswap@54.conf +++ /dev/null @@ -1,7 +0,0 @@ -LABEL_curr1=hotswap_iin -GAIN_curr1=2.0 -LABEL_in1=hotswap_vin -LABEL_in3=hotswap_vout -LABEL_power1=hotswap_power -GAIN_power1=2.0 -LABEL_temp1=hotswap_temp diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/ucd90160@64.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/ucd90160@64.conf deleted file mode 100644 index 92be7fed3..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/ucd90160@64.conf +++ /dev/null @@ -1,25 +0,0 @@ -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 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf deleted file mode 100644 index 3765a6cf4..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf +++ /dev/null @@ -1,4 +0,0 @@ -LABEL_fan1=fan0 -LABEL_fan2=fan1 -LABEL_fan3=fan2 -LABEL_fan4=fan3 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf deleted file mode 100644 index 650415131..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf +++ /dev/null @@ -1,83 +0,0 @@ -MODE_temp1 = "label" -MODE_temp2 = "label" -MODE_temp3 = "label" -MODE_temp4 = "label" -MODE_temp5 = "label" -MODE_temp6 = "label" -MODE_temp7 = "label" -MODE_temp8 = "label" -MODE_temp9 = "label" -MODE_temp10 = "label" -MODE_temp11 = "label" -MODE_temp12 = "label" -MODE_temp13 = "label" -MODE_temp14 = "label" -MODE_temp15 = "label" -MODE_temp16 = "label" -MODE_temp17 = "label" -MODE_temp18 = "label" -MODE_temp19 = "label" -MODE_temp20 = "label" -MODE_temp21 = "label" -MODE_temp22 = "label" -MODE_temp23 = "label" -MODE_temp24 = "label" -MODE_temp25 = "label" -MODE_temp26 = "label" -MODE_temp27 = "label" -MODE_temp28 = "label" -MODE_temp29 = "label" -MODE_temp30 = "label" -MODE_temp31 = "label" -MODE_temp32 = "label" -MODE_temp33 = "label" -MODE_temp34 = "label" -MODE_temp35 = "label" -MODE_temp36 = "label" -MODE_temp37 = "label" -MODE_temp38 = "label" -MODE_temp39 = "label" -MODE_temp40 = "label" -LABEL_temp34 = "p0_core0_temp" -LABEL_temp37 = "p0_core1_temp" -LABEL_temp40 = "p0_core2_temp" -LABEL_temp43 = "p0_core3_temp" -LABEL_temp46 = "p0_core4_temp" -LABEL_temp49 = "p0_core5_temp" -LABEL_temp52 = "p0_core6_temp" -LABEL_temp55 = "p0_core7_temp" -LABEL_temp58 = "p0_core8_temp" -LABEL_temp61 = "p0_core9_temp" -LABEL_temp64 = "p0_core10_temp" -LABEL_temp67 = "p0_core11_temp" -LABEL_temp70 = "p0_core12_temp" -LABEL_temp73 = "p0_core13_temp" -LABEL_temp76 = "p0_core14_temp" -LABEL_temp79 = "p0_core15_temp" -LABEL_temp82 = "p0_core16_temp" -LABEL_temp85 = "p0_core17_temp" -LABEL_temp88 = "p0_core18_temp" -LABEL_temp91 = "p0_core19_temp" -LABEL_temp94 = "p0_core20_temp" -LABEL_temp97 = "p0_core21_temp" -LABEL_temp100 = "p0_core22_temp" -LABEL_temp103 = "p0_core23_temp" -LABEL_temp224 = "dimm0_temp" -LABEL_temp226 = "dimm1_temp" -LABEL_temp228 = "dimm2_temp" -LABEL_temp230 = "dimm3_temp" -LABEL_temp232 = "dimm4_temp" -LABEL_temp234 = "dimm5_temp" -LABEL_temp236 = "dimm6_temp" -LABEL_temp238 = "dimm7_temp" -LABEL_temp240 = "dimm8_temp" -LABEL_temp242 = "dimm9_temp" -LABEL_temp244 = "dimm10_temp" -LABEL_temp246 = "dimm11_temp" -LABEL_temp248 = "dimm12_temp" -LABEL_temp250 = "dimm13_temp" -LABEL_temp252 = "dimm14_temp" -LABEL_temp254 = "dimm15_temp" -LABEL_power2 = "p0_power" -LABEL_power3 = "p0_vdd_power" -LABEL_power4 = "p0_vdn_power" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/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-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/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 deleted file mode 100644 index ba615812a..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/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 +++ /dev/null @@ -1,83 +0,0 @@ -MODE_temp1 = "label" -MODE_temp2 = "label" -MODE_temp3 = "label" -MODE_temp4 = "label" -MODE_temp5 = "label" -MODE_temp6 = "label" -MODE_temp7 = "label" -MODE_temp8 = "label" -MODE_temp9 = "label" -MODE_temp10 = "label" -MODE_temp11 = "label" -MODE_temp12 = "label" -MODE_temp13 = "label" -MODE_temp14 = "label" -MODE_temp15 = "label" -MODE_temp16 = "label" -MODE_temp17 = "label" -MODE_temp18 = "label" -MODE_temp19 = "label" -MODE_temp20 = "label" -MODE_temp21 = "label" -MODE_temp22 = "label" -MODE_temp23 = "label" -MODE_temp24 = "label" -MODE_temp25 = "label" -MODE_temp26 = "label" -MODE_temp27 = "label" -MODE_temp28 = "label" -MODE_temp29 = "label" -MODE_temp30 = "label" -MODE_temp31 = "label" -MODE_temp32 = "label" -MODE_temp33 = "label" -MODE_temp34 = "label" -MODE_temp35 = "label" -MODE_temp36 = "label" -MODE_temp37 = "label" -MODE_temp38 = "label" -MODE_temp39 = "label" -MODE_temp40 = "label" -LABEL_temp114 = "p1_core0_temp" -LABEL_temp117 = "p1_core1_temp" -LABEL_temp120 = "p1_core2_temp" -LABEL_temp123 = "p1_core3_temp" -LABEL_temp126 = "p1_core4_temp" -LABEL_temp129 = "p1_core5_temp" -LABEL_temp132 = "p1_core6_temp" -LABEL_temp135 = "p1_core7_temp" -LABEL_temp138 = "p1_core8_temp" -LABEL_temp141 = "p1_core9_temp" -LABEL_temp144 = "p1_core10_temp" -LABEL_temp147 = "p1_core11_temp" -LABEL_temp150 = "p1_core12_temp" -LABEL_temp153 = "p1_core13_temp" -LABEL_temp156 = "p1_core14_temp" -LABEL_temp159 = "p1_core15_temp" -LABEL_temp162 = "p1_core16_temp" -LABEL_temp165 = "p1_core17_temp" -LABEL_temp168 = "p1_core18_temp" -LABEL_temp171 = "p1_core19_temp" -LABEL_temp174 = "p1_core20_temp" -LABEL_temp177 = "p1_core21_temp" -LABEL_temp180 = "p1_core22_temp" -LABEL_temp183 = "p1_core23_temp" -LABEL_temp192 = "dimm16_temp" -LABEL_temp194 = "dimm17_temp" -LABEL_temp196 = "dimm18_temp" -LABEL_temp198 = "dimm19_temp" -LABEL_temp200 = "dimm20_temp" -LABEL_temp202 = "dimm21_temp" -LABEL_temp204 = "dimm22_temp" -LABEL_temp206 = "dimm23_temp" -LABEL_temp208 = "dimm24_temp" -LABEL_temp210 = "dimm25_temp" -LABEL_temp212 = "dimm26_temp" -LABEL_temp224 = "dimm27_temp" -LABEL_temp216 = "dimm28_temp" -LABEL_temp218 = "dimm29_temp" -LABEL_temp220 = "dimm30_temp" -LABEL_temp222 = "dimm31_temp" -LABEL_power2 = "p1_power" -LABEL_power3 = "p1_vdd_power" -LABEL_power4 = "p1_vdn_power" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/iio-hwmon-battery.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/iio-hwmon-battery.conf deleted file mode 100644 index 172fb20fd..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/iio-hwmon-battery.conf +++ /dev/null @@ -1,7 +0,0 @@ -LABEL_in1=vbat -GAIN_in1=2.30 -# The battery read is controlled by P2 -GPIOCHIP_in1=0 -GPIO_in1=122 -# Sleep in microseconds (stored into a uint64_t) -INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/iio-hwmon.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/iio-hwmon.conf deleted file mode 100644 index c7e2eed1d..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/iio-hwmon.conf +++ /dev/null @@ -1,24 +0,0 @@ -LABEL_in1=p5v_aux -GAIN_in1=4.30 -LABEL_in2=p2v5_aux -GAIN_in2=2.00 -LABEL_in3=p3v3_aux -GAIN_in3=2.47 -LABEL_in4=p1v1_aux -LABEL_in5=cpu0_vpp1 -GAIN_in5=2.00 -LABEL_in6=cpu0_vpp2 -GAIN_in6=2.00 -LABEL_in7=cpu1_vpp1 -GAIN_in7=2.00 -LABEL_in8=cpu1_vpp2 -GAIN_in8=2.00 -LABEL_in9=cpu0_vddq1 -LABEL_in10=cpu0_vddq2 -LABEL_in11=cpu1_vddq1 -LABEL_in12=cpu1_vddq2 -LABEL_in13=p1v2_aux -LABEL_in14=vendor_id -LABEL_in15=board_id -# Sleep in microseconds (stored into a uint64_t) -INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire0.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire0.conf deleted file mode 100644 index 3edc2fa52..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire0.conf +++ /dev/null @@ -1 +0,0 @@ -LABEL_temp1=w1_inlet diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire1.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire1.conf deleted file mode 100644 index 790f97bbf..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire1.conf +++ /dev/null @@ -1 +0,0 @@ -LABEL_temp1=w1_exhaust_left diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire2.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire2.conf deleted file mode 100644 index 6add8052c..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire2.conf +++ /dev/null @@ -1 +0,0 @@ -LABEL_temp1=w1_exhaust_right diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire3.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire3.conf deleted file mode 100644 index 70f982655..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire3.conf +++ /dev/null @@ -1 +0,0 @@ -LABEL_temp1=w1_exhaust_mid diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/pca9541a@70/i2c-arb/hotswap@54.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/pca9541a@70/i2c-arb/hotswap@54.conf new file mode 100644 index 000000000..8e27a12b1 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/pca9541a@70/i2c-arb/hotswap@54.conf @@ -0,0 +1,7 @@ +LABEL_curr1=hotswap_iin +GAIN_curr1=2.0 +LABEL_in1=hotswap_vin +LABEL_in3=hotswap_vout +LABEL_power1=hotswap_power +GAIN_power1=2.0 +LABEL_temp1=hotswap_temp diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/ucd90160@64.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/ucd90160@64.conf new file mode 100644 index 000000000..92be7fed3 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/ucd90160@64.conf @@ -0,0 +1,25 @@ +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 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf new file mode 100644 index 000000000..3765a6cf4 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf @@ -0,0 +1,4 @@ +LABEL_fan1=fan0 +LABEL_fan2=fan1 +LABEL_fan3=fan2 +LABEL_fan4=fan3 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf new file mode 100644 index 000000000..650415131 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf @@ -0,0 +1,83 @@ +MODE_temp1 = "label" +MODE_temp2 = "label" +MODE_temp3 = "label" +MODE_temp4 = "label" +MODE_temp5 = "label" +MODE_temp6 = "label" +MODE_temp7 = "label" +MODE_temp8 = "label" +MODE_temp9 = "label" +MODE_temp10 = "label" +MODE_temp11 = "label" +MODE_temp12 = "label" +MODE_temp13 = "label" +MODE_temp14 = "label" +MODE_temp15 = "label" +MODE_temp16 = "label" +MODE_temp17 = "label" +MODE_temp18 = "label" +MODE_temp19 = "label" +MODE_temp20 = "label" +MODE_temp21 = "label" +MODE_temp22 = "label" +MODE_temp23 = "label" +MODE_temp24 = "label" +MODE_temp25 = "label" +MODE_temp26 = "label" +MODE_temp27 = "label" +MODE_temp28 = "label" +MODE_temp29 = "label" +MODE_temp30 = "label" +MODE_temp31 = "label" +MODE_temp32 = "label" +MODE_temp33 = "label" +MODE_temp34 = "label" +MODE_temp35 = "label" +MODE_temp36 = "label" +MODE_temp37 = "label" +MODE_temp38 = "label" +MODE_temp39 = "label" +MODE_temp40 = "label" +LABEL_temp34 = "p0_core0_temp" +LABEL_temp37 = "p0_core1_temp" +LABEL_temp40 = "p0_core2_temp" +LABEL_temp43 = "p0_core3_temp" +LABEL_temp46 = "p0_core4_temp" +LABEL_temp49 = "p0_core5_temp" +LABEL_temp52 = "p0_core6_temp" +LABEL_temp55 = "p0_core7_temp" +LABEL_temp58 = "p0_core8_temp" +LABEL_temp61 = "p0_core9_temp" +LABEL_temp64 = "p0_core10_temp" +LABEL_temp67 = "p0_core11_temp" +LABEL_temp70 = "p0_core12_temp" +LABEL_temp73 = "p0_core13_temp" +LABEL_temp76 = "p0_core14_temp" +LABEL_temp79 = "p0_core15_temp" +LABEL_temp82 = "p0_core16_temp" +LABEL_temp85 = "p0_core17_temp" +LABEL_temp88 = "p0_core18_temp" +LABEL_temp91 = "p0_core19_temp" +LABEL_temp94 = "p0_core20_temp" +LABEL_temp97 = "p0_core21_temp" +LABEL_temp100 = "p0_core22_temp" +LABEL_temp103 = "p0_core23_temp" +LABEL_temp224 = "dimm0_temp" +LABEL_temp226 = "dimm1_temp" +LABEL_temp228 = "dimm2_temp" +LABEL_temp230 = "dimm3_temp" +LABEL_temp232 = "dimm4_temp" +LABEL_temp234 = "dimm5_temp" +LABEL_temp236 = "dimm6_temp" +LABEL_temp238 = "dimm7_temp" +LABEL_temp240 = "dimm8_temp" +LABEL_temp242 = "dimm9_temp" +LABEL_temp244 = "dimm10_temp" +LABEL_temp246 = "dimm11_temp" +LABEL_temp248 = "dimm12_temp" +LABEL_temp250 = "dimm13_temp" +LABEL_temp252 = "dimm14_temp" +LABEL_temp254 = "dimm15_temp" +LABEL_power2 = "p0_power" +LABEL_power3 = "p0_vdd_power" +LABEL_power4 = "p0_vdn_power" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/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-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/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 new file mode 100644 index 000000000..ba615812a --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/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 @@ -0,0 +1,83 @@ +MODE_temp1 = "label" +MODE_temp2 = "label" +MODE_temp3 = "label" +MODE_temp4 = "label" +MODE_temp5 = "label" +MODE_temp6 = "label" +MODE_temp7 = "label" +MODE_temp8 = "label" +MODE_temp9 = "label" +MODE_temp10 = "label" +MODE_temp11 = "label" +MODE_temp12 = "label" +MODE_temp13 = "label" +MODE_temp14 = "label" +MODE_temp15 = "label" +MODE_temp16 = "label" +MODE_temp17 = "label" +MODE_temp18 = "label" +MODE_temp19 = "label" +MODE_temp20 = "label" +MODE_temp21 = "label" +MODE_temp22 = "label" +MODE_temp23 = "label" +MODE_temp24 = "label" +MODE_temp25 = "label" +MODE_temp26 = "label" +MODE_temp27 = "label" +MODE_temp28 = "label" +MODE_temp29 = "label" +MODE_temp30 = "label" +MODE_temp31 = "label" +MODE_temp32 = "label" +MODE_temp33 = "label" +MODE_temp34 = "label" +MODE_temp35 = "label" +MODE_temp36 = "label" +MODE_temp37 = "label" +MODE_temp38 = "label" +MODE_temp39 = "label" +MODE_temp40 = "label" +LABEL_temp114 = "p1_core0_temp" +LABEL_temp117 = "p1_core1_temp" +LABEL_temp120 = "p1_core2_temp" +LABEL_temp123 = "p1_core3_temp" +LABEL_temp126 = "p1_core4_temp" +LABEL_temp129 = "p1_core5_temp" +LABEL_temp132 = "p1_core6_temp" +LABEL_temp135 = "p1_core7_temp" +LABEL_temp138 = "p1_core8_temp" +LABEL_temp141 = "p1_core9_temp" +LABEL_temp144 = "p1_core10_temp" +LABEL_temp147 = "p1_core11_temp" +LABEL_temp150 = "p1_core12_temp" +LABEL_temp153 = "p1_core13_temp" +LABEL_temp156 = "p1_core14_temp" +LABEL_temp159 = "p1_core15_temp" +LABEL_temp162 = "p1_core16_temp" +LABEL_temp165 = "p1_core17_temp" +LABEL_temp168 = "p1_core18_temp" +LABEL_temp171 = "p1_core19_temp" +LABEL_temp174 = "p1_core20_temp" +LABEL_temp177 = "p1_core21_temp" +LABEL_temp180 = "p1_core22_temp" +LABEL_temp183 = "p1_core23_temp" +LABEL_temp192 = "dimm16_temp" +LABEL_temp194 = "dimm17_temp" +LABEL_temp196 = "dimm18_temp" +LABEL_temp198 = "dimm19_temp" +LABEL_temp200 = "dimm20_temp" +LABEL_temp202 = "dimm21_temp" +LABEL_temp204 = "dimm22_temp" +LABEL_temp206 = "dimm23_temp" +LABEL_temp208 = "dimm24_temp" +LABEL_temp210 = "dimm25_temp" +LABEL_temp212 = "dimm26_temp" +LABEL_temp224 = "dimm27_temp" +LABEL_temp216 = "dimm28_temp" +LABEL_temp218 = "dimm29_temp" +LABEL_temp220 = "dimm30_temp" +LABEL_temp222 = "dimm31_temp" +LABEL_power2 = "p1_power" +LABEL_power3 = "p1_vdd_power" +LABEL_power4 = "p1_vdn_power" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon-battery.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon-battery.conf new file mode 100644 index 000000000..172fb20fd --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon-battery.conf @@ -0,0 +1,7 @@ +LABEL_in1=vbat +GAIN_in1=2.30 +# The battery read is controlled by P2 +GPIOCHIP_in1=0 +GPIO_in1=122 +# Sleep in microseconds (stored into a uint64_t) +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf new file mode 100644 index 000000000..c7e2eed1d --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf @@ -0,0 +1,24 @@ +LABEL_in1=p5v_aux +GAIN_in1=4.30 +LABEL_in2=p2v5_aux +GAIN_in2=2.00 +LABEL_in3=p3v3_aux +GAIN_in3=2.47 +LABEL_in4=p1v1_aux +LABEL_in5=cpu0_vpp1 +GAIN_in5=2.00 +LABEL_in6=cpu0_vpp2 +GAIN_in6=2.00 +LABEL_in7=cpu1_vpp1 +GAIN_in7=2.00 +LABEL_in8=cpu1_vpp2 +GAIN_in8=2.00 +LABEL_in9=cpu0_vddq1 +LABEL_in10=cpu0_vddq2 +LABEL_in11=cpu1_vddq1 +LABEL_in12=cpu1_vddq2 +LABEL_in13=p1v2_aux +LABEL_in14=vendor_id +LABEL_in15=board_id +# Sleep in microseconds (stored into a uint64_t) +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire0.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire0.conf new file mode 100644 index 000000000..3edc2fa52 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire0.conf @@ -0,0 +1 @@ +LABEL_temp1=w1_inlet diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire1.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire1.conf new file mode 100644 index 000000000..790f97bbf --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire1.conf @@ -0,0 +1 @@ +LABEL_temp1=w1_exhaust_left diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire2.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire2.conf new file mode 100644 index 000000000..6add8052c --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire2.conf @@ -0,0 +1 @@ +LABEL_temp1=w1_exhaust_right diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire3.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire3.conf new file mode 100644 index 000000000..70f982655 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire3.conf @@ -0,0 +1 @@ +LABEL_temp1=w1_exhaust_mid diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend new file mode 100644 index 000000000..3e6b72964 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -0,0 +1,25 @@ +FILESEXTRAPATHS_prepend_zaius := "${THISDIR}/${PN}:" + +ZAIUS_CHIPS = "i2c@1e78a000/i2c-bus@40/ucd90160@64" +ZAIUS_CHIPS += " i2c@1e78a000/i2c-bus@300/pca9541a@70/i2c-arb/hotswap@54" +ZAIUS_CHIPS += " pwm-tacho-controller@1e786000" +ZAIUS_ITEMSFMT = "ahb/apb/{0}.conf" + +ZAIUS_ITEMS = "${@compose_list(d, 'ZAIUS_ITEMSFMT', 'ZAIUS_CHIPS')}" +ZAIUS_ITEMS += "iio-hwmon.conf iio-hwmon-battery.conf" +ZAIUS_ITEMS += " onewire0.conf" +ZAIUS_ITEMS += " onewire1.conf" +ZAIUS_ITEMS += " onewire2.conf" +ZAIUS_ITEMS += " onewire3.conf" + +ZAIUS_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 \ + " +ZAIUS_OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" +ZAIUS_OCCITEMS = "${@compose_list(d, 'ZAIUS_OCCSFMT', 'ZAIUS_OCCS')}" + +ENVS = "obmc/hwmon/{0}" +# compose_list is not defined immediately so don't use := +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_zaius = " ${@compose_list(d, 'ENVS', 'ZAIUS_ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_zaius = " ${@compose_list(d, 'ENVS', 'ZAIUS_OCCITEMS')}" -- cgit v1.2.3