From e368179c364e704ffe9fb11687bae4124ef96dfc Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Fri, 1 Feb 2019 10:55:40 -0800 Subject: meta-quanta: q71l: move pwm-tacho to new location Move the pwm-tacho sensor list to new location based on device-tree changes. (From meta-quanta rev: 1d43ee5096218aa4f42aebe5a8b3db434dcc5953) Change-Id: Ia4515b92e178d19b1105bba2c063c693bc39ef74 Signed-off-by: Patrick Venture Signed-off-by: Brad Bishop --- .../obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf | 9 +++++++++ .../phosphor-hwmon/obmc/hwmon/pwm-tacho-controller@1e786000.conf | 9 --------- .../meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend | 4 +++- 3 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf delete mode 100644 meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/pwm-tacho-controller@1e786000.conf (limited to 'meta-quanta') diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf new file mode 100644 index 000000000..dfdecb40d --- /dev/null +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf @@ -0,0 +1,9 @@ +LABEL_fan1=fan1 +LABEL_fan2=fan2 +LABEL_fan3=fan3 +LABEL_fan4=fan4 +LABEL_fan5=fan5 +LABEL_fan6=fan6 +LABEL_fan7=fan7 +LABEL_fan8=fan8 + diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/pwm-tacho-controller@1e786000.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/pwm-tacho-controller@1e786000.conf deleted file mode 100644 index dfdecb40d..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/pwm-tacho-controller@1e786000.conf +++ /dev/null @@ -1,9 +0,0 @@ -LABEL_fan1=fan1 -LABEL_fan2=fan2 -LABEL_fan3=fan3 -LABEL_fan4=fan4 -LABEL_fan5=fan5 -LABEL_fan6=fan6 -LABEL_fan7=fan7 -LABEL_fan8=fan8 - 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 6da5ccb90..8632f9767 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -4,7 +4,9 @@ FILESEXTRAPATHS_prepend_quanta-q71l := "${THISDIR}/${PN}:" # More conf files can be added as sensors are added. -Q71L_ITEMS = "pwm-tacho-controller@1e786000.conf" +Q71L_PWM = "pwm-tacho-controller@1e786000" +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" -- cgit v1.2.3