From ecb46640f39d91d073e572172d3a3b7c0f279895 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Mon, 25 Mar 2019 10:51:05 -0700 Subject: meta-quanta: q-71l: Update I2C hwmon paths for the 5.0 kernel In the 5.0 Linux kernel, an I2C device path segment changed: i2c@1e78a000 -> bus@1e78a000 (From meta-quanta rev: 55e686fb453abeb4fa72e4e58e79faca35be7429) Tested: Verified paths visually, but not tested on hardware. Signed-off-by: Patrick Venture Change-Id: I7f0d2752cc2a28df8d8c8e1a63e40df6153b2db8 Signed-off-by: Brad Bishop --- .../i2c-bus@300/i2c-switch@70/i2c@0/psu@59.conf | 15 +++++++++++++++ .../i2c-bus@300/i2c-switch@70/i2c@1/psu@58.conf | 15 +++++++++++++++ .../i2c-bus@300/i2c-switch@70/i2c@2/psu@58.conf | 15 +++++++++++++++ .../i2c-bus@300/i2c-switch@70/i2c@3/psu@59.conf | 15 +++++++++++++++ .../hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4c.conf | 1 + .../hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4e.conf | 1 + .../hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4f.conf | 1 + .../i2c-bus@300/i2c-switch@70/i2c@0/psu@59.conf | 15 --------------- .../i2c-bus@300/i2c-switch@70/i2c@1/psu@58.conf | 15 --------------- .../i2c-bus@300/i2c-switch@70/i2c@2/psu@58.conf | 15 --------------- .../i2c-bus@300/i2c-switch@70/i2c@3/psu@59.conf | 15 --------------- .../hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4c.conf | 1 - .../hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4e.conf | 1 - .../hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4f.conf | 1 - .../recipes-phosphor/sensors/phosphor-hwmon_%.bbappend | 4 ++-- 15 files changed, 65 insertions(+), 65 deletions(-) create mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@0/psu@59.conf create mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@1/psu@58.conf create mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@2/psu@58.conf create mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@3/psu@59.conf create mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4c.conf create mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4e.conf create mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4f.conf delete mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@0/psu@59.conf delete mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@1/psu@58.conf delete mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@2/psu@58.conf delete mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@3/psu@59.conf delete mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4c.conf delete mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4e.conf delete mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4f.conf (limited to 'meta-quanta/meta-q71l') diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@0/psu@59.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@0/psu@59.conf new file mode 100644 index 000000000..3416d3224 --- /dev/null +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@0/psu@59.conf @@ -0,0 +1,15 @@ +# PSU4 +LABEL_in1=psu4_vin +LABEL_curr1=psu4_iin +LABEL_power1=psu4_pin +LABEL_in2=psu4_vout +#GAIN_in2=0.001953125 +#GAIN is only required for AC PSUs. +LABEL_curr2=psu4_iout +LABEL_power2=psu4_pout +LABEL_temp1=psu4_temp1 +LABEL_temp2=psu4_temp2 +LABEL_temp3=psu4_temp3 +LABEL_fan1=psu4_fan +# 1 minute interval +INTERVAL=60000000 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@1/psu@58.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@1/psu@58.conf new file mode 100644 index 000000000..261a0b036 --- /dev/null +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@1/psu@58.conf @@ -0,0 +1,15 @@ +# PSU1 +LABEL_in1=psu1_vin +LABEL_curr1=psu1_iin +LABEL_power1=psu1_pin +LABEL_in2=psu1_vout +#GAIN_in2=0.001953125 +#GAIN only required for AC PSUs. +LABEL_curr2=psu1_iout +LABEL_power2=psu1_pout +LABEL_temp1=psu1_temp1 +LABEL_temp2=psu1_temp2 +LABEL_temp3=psu1_temp3 +LABEL_fan1=psu1_fan +# 1 minute interval +INTERVAL=60000000 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@2/psu@58.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@2/psu@58.conf new file mode 100644 index 000000000..8749d4a24 --- /dev/null +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@2/psu@58.conf @@ -0,0 +1,15 @@ +# PSU3 +LABEL_in1=psu3_vin +LABEL_curr1=psu3_iin +LABEL_power1=psu3_pin +LABEL_in2=psu3_vout +#GAIN_in2=0.001953125 +#GAIN only required for AC PSUs +LABEL_curr2=psu3_iout +LABEL_power2=psu3_pout +LABEL_temp1=psu3_temp1 +LABEL_temp2=psu3_temp2 +LABEL_temp3=psu3_temp3 +LABEL_fan1=psu3_fan +# 1 minute interval +INTERVAL=60000000 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@3/psu@59.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@3/psu@59.conf new file mode 100644 index 000000000..9a314f77a --- /dev/null +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@3/psu@59.conf @@ -0,0 +1,15 @@ +# PSU2 +LABEL_in1=psu2_vin +LABEL_curr1=psu2_iin +LABEL_power1=psu2_pin +LABEL_in2=psu2_vout +#GAIN_in2=0.001953125 +#GAIN is only required for AC PSUs. +LABEL_curr2=psu2_iout +LABEL_power2=psu2_pout +LABEL_temp1=psu2_temp1 +LABEL_temp2=psu2_temp2 +LABEL_temp3=psu2_temp3 +LABEL_fan1=psu2_fan +# 1 minute interval +INTERVAL=60000000 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4c.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4c.conf new file mode 100644 index 000000000..4ac0ebfc9 --- /dev/null +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4c.conf @@ -0,0 +1 @@ +LABEL_temp1=temp2_inlet diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4e.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4e.conf new file mode 100644 index 000000000..504e4cfeb --- /dev/null +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4e.conf @@ -0,0 +1 @@ +LABEL_temp1=temp3 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4f.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4f.conf new file mode 100644 index 000000000..10ec2653b --- /dev/null +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4f.conf @@ -0,0 +1 @@ +LABEL_temp1=temp1 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@0/psu@59.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@0/psu@59.conf deleted file mode 100644 index 3416d3224..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@0/psu@59.conf +++ /dev/null @@ -1,15 +0,0 @@ -# PSU4 -LABEL_in1=psu4_vin -LABEL_curr1=psu4_iin -LABEL_power1=psu4_pin -LABEL_in2=psu4_vout -#GAIN_in2=0.001953125 -#GAIN is only required for AC PSUs. -LABEL_curr2=psu4_iout -LABEL_power2=psu4_pout -LABEL_temp1=psu4_temp1 -LABEL_temp2=psu4_temp2 -LABEL_temp3=psu4_temp3 -LABEL_fan1=psu4_fan -# 1 minute interval -INTERVAL=60000000 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@1/psu@58.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@1/psu@58.conf deleted file mode 100644 index 261a0b036..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@1/psu@58.conf +++ /dev/null @@ -1,15 +0,0 @@ -# PSU1 -LABEL_in1=psu1_vin -LABEL_curr1=psu1_iin -LABEL_power1=psu1_pin -LABEL_in2=psu1_vout -#GAIN_in2=0.001953125 -#GAIN only required for AC PSUs. -LABEL_curr2=psu1_iout -LABEL_power2=psu1_pout -LABEL_temp1=psu1_temp1 -LABEL_temp2=psu1_temp2 -LABEL_temp3=psu1_temp3 -LABEL_fan1=psu1_fan -# 1 minute interval -INTERVAL=60000000 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@2/psu@58.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@2/psu@58.conf deleted file mode 100644 index 8749d4a24..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@2/psu@58.conf +++ /dev/null @@ -1,15 +0,0 @@ -# PSU3 -LABEL_in1=psu3_vin -LABEL_curr1=psu3_iin -LABEL_power1=psu3_pin -LABEL_in2=psu3_vout -#GAIN_in2=0.001953125 -#GAIN only required for AC PSUs -LABEL_curr2=psu3_iout -LABEL_power2=psu3_pout -LABEL_temp1=psu3_temp1 -LABEL_temp2=psu3_temp2 -LABEL_temp3=psu3_temp3 -LABEL_fan1=psu3_fan -# 1 minute interval -INTERVAL=60000000 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@3/psu@59.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@3/psu@59.conf deleted file mode 100644 index 9a314f77a..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@3/psu@59.conf +++ /dev/null @@ -1,15 +0,0 @@ -# PSU2 -LABEL_in1=psu2_vin -LABEL_curr1=psu2_iin -LABEL_power1=psu2_pin -LABEL_in2=psu2_vout -#GAIN_in2=0.001953125 -#GAIN is only required for AC PSUs. -LABEL_curr2=psu2_iout -LABEL_power2=psu2_pout -LABEL_temp1=psu2_temp1 -LABEL_temp2=psu2_temp2 -LABEL_temp3=psu2_temp3 -LABEL_fan1=psu2_fan -# 1 minute interval -INTERVAL=60000000 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4c.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4c.conf deleted file mode 100644 index 4ac0ebfc9..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4c.conf +++ /dev/null @@ -1 +0,0 @@ -LABEL_temp1=temp2_inlet diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4e.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4e.conf deleted file mode 100644 index 504e4cfeb..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4e.conf +++ /dev/null @@ -1 +0,0 @@ -LABEL_temp1=temp3 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4f.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4f.conf deleted file mode 100644 index 10ec2653b..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4f.conf +++ /dev/null @@ -1 +0,0 @@ -LABEL_temp1=temp1 diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 577fa6406..cc05c010a 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -9,7 +9,7 @@ Q71L_PWM_BASE = "ahb/apb/{0}.conf" Q71L_ITEMS += "${@compose_list(d, 'Q71L_PWM_BASE', 'Q71L_PWM')}" Q71L_TEMPS = "tmp75@4c tmp75@4e tmp75@4f" -Q71L_TEMPBASE = "ahb/apb/i2c@1e78a000/i2c-bus@80/{0}.conf" +Q71L_TEMPBASE = "ahb/apb/bus@1e78a000/i2c-bus@80/{0}.conf" Q71L_ITEMS += "${@compose_list(d, 'Q71L_TEMPBASE', 'Q71L_TEMPS')}" @@ -17,7 +17,7 @@ Q71L_ITEMS += "iio-hwmon.conf" Q71L_ITEMS += "iio-hwmon-battery.conf" Q71L_PSUS = "0/psu@59 1/psu@58 2/psu@58 3/psu@59" -Q71L_PSUBASE = "ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@{0}.conf" +Q71L_PSUBASE = "ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@{0}.conf" Q71L_ITEMS += "${@compose_list(d, 'Q71L_PSUBASE', 'Q71L_PSUS')}" ENVS = "obmc/hwmon/{0}" -- cgit v1.2.3