From b31a5f0db9c2cf04319607ba54d62f0bedf75e36 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Mon, 25 Mar 2019 11:13:54 -0700 Subject: meta-ingrasys: zaius: 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-ingrasys rev: 0736d99758250742a563bb416c4f7be3394fb206) Tested: Verified paths visually, but not tested on hardware. Signed-off-by: Patrick Venture Change-Id: Ifb89b0f62b787a19281304d0cbbdf3556f25842e Signed-off-by: Brad Bishop --- .../pca9541a@70/i2c-arb/hotswap@54.conf | 7 ++++++ .../apb/bus@1e78a000/i2c-bus@40/ucd90160@64.conf | 25 ++++++++++++++++++++++ .../pca9541a@70/i2c-arb/hotswap@54.conf | 7 ------ .../apb/i2c@1e78a000/i2c-bus@40/ucd90160@64.conf | 25 ---------------------- .../sensors/phosphor-hwmon_%.bbappend | 4 ++-- 5 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@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/bus@1e78a000/i2c-bus@40/ucd90160@64.conf 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 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@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/bus@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/bus@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/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 new file mode 100644 index 000000000..92be7fed3 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@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/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_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 3e6b72964..31825e20d 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,7 +1,7 @@ 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 = "bus@1e78a000/i2c-bus@40/ucd90160@64" +ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/pca9541a@70/i2c-arb/hotswap@54" ZAIUS_CHIPS += " pwm-tacho-controller@1e786000" ZAIUS_ITEMSFMT = "ahb/apb/{0}.conf" -- cgit v1.2.1