From c70b51d74ed27e7ff83278331f6be256a78e03bc Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sat, 23 Mar 2019 22:21:40 -0400 Subject: palmetto: 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-ibm rev: bf1862a9b9bc82683d12036edc247f9f4ea4d13c) Change-Id: I909073424a7b0a5c677307fe3b4ab25cab051cc9 Signed-off-by: Brad Bishop --- .../apb/bus@1e78a000/i2c-bus@100/occ-hwmon@50.conf | 40 ++++++++++++++++++++++ .../ahb/apb/bus@1e78a000/i2c-bus@40/rtc@68.conf | 3 ++ .../ahb/apb/bus@1e78a000/i2c-bus@c0/tmp423@4c.conf | 7 ++++ .../apb/i2c@1e78a000/i2c-bus@100/occ-hwmon@50.conf | 40 ---------------------- .../ahb/apb/i2c@1e78a000/i2c-bus@40/rtc@68.conf | 3 -- .../ahb/apb/i2c@1e78a000/i2c-bus@c0/tmp423@4c.conf | 7 ---- .../sensors/phosphor-hwmon_%.bbappend | 6 ++-- 7 files changed, 53 insertions(+), 53 deletions(-) create mode 100644 meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/occ-hwmon@50.conf create mode 100644 meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/rtc@68.conf create mode 100644 meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/tmp423@4c.conf delete mode 100644 meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/occ-hwmon@50.conf delete mode 100644 meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/rtc@68.conf delete mode 100644 meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@c0/tmp423@4c.conf (limited to 'meta-ibm/meta-palmetto/recipes-phosphor/sensors') diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/occ-hwmon@50.conf b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/occ-hwmon@50.conf new file mode 100644 index 000000000..d8faf2f15 --- /dev/null +++ b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/occ-hwmon@50.conf @@ -0,0 +1,40 @@ +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" +LABEL_temp13 = "cpu0_temp" +LABEL_temp101 = "centaur0_temp" +LABEL_temp102 = "dimm0_temp" +LABEL_temp103 = "dimm1_temp" +LABEL_temp104 = "dimm2_temp" +LABEL_temp105 = "dimm3_temp" +LABEL_temp106 = "core0_temp" +LABEL_temp107 = "core1_temp" +LABEL_temp108 = "core2_temp" +LABEL_temp109 = "core3_temp" +LABEL_temp110 = "core4_temp" +LABEL_temp111 = "core5_temp" +LABEL_temp112 = "core6_temp" +LABEL_temp113 = "core7_temp" +LABEL_temp114 = "core8_temp" +LABEL_temp115 = "core9_temp" +LABEL_temp116 = "core10_temp" +LABEL_temp117 = "core11_temp" +LABEL_power1 = "p0_power" +LABEL_power2 = "p0_pcie_power" +LABEL_power3 = "p0_io_power" +LABEL_power4 = "centaur0_power" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/rtc@68.conf b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/rtc@68.conf new file mode 100644 index 000000000..8b6053e33 --- /dev/null +++ b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/rtc@68.conf @@ -0,0 +1,3 @@ +LABEL_temp1=rtc +WARNLO_temp1=10000 +WARNHI_temp1=35000 diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/tmp423@4c.conf b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/tmp423@4c.conf new file mode 100644 index 000000000..3166f32f1 --- /dev/null +++ b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/tmp423@4c.conf @@ -0,0 +1,7 @@ +LABEL_temp1=ambient +WARNLO_temp1=10000 +WARNHI_temp1=40000 + +LABEL_temp2=cpu +WARNLO_temp2=10000 +WARNHI_temp2=80000 diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/occ-hwmon@50.conf b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/occ-hwmon@50.conf deleted file mode 100644 index d8faf2f15..000000000 --- a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/occ-hwmon@50.conf +++ /dev/null @@ -1,40 +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" -LABEL_temp13 = "cpu0_temp" -LABEL_temp101 = "centaur0_temp" -LABEL_temp102 = "dimm0_temp" -LABEL_temp103 = "dimm1_temp" -LABEL_temp104 = "dimm2_temp" -LABEL_temp105 = "dimm3_temp" -LABEL_temp106 = "core0_temp" -LABEL_temp107 = "core1_temp" -LABEL_temp108 = "core2_temp" -LABEL_temp109 = "core3_temp" -LABEL_temp110 = "core4_temp" -LABEL_temp111 = "core5_temp" -LABEL_temp112 = "core6_temp" -LABEL_temp113 = "core7_temp" -LABEL_temp114 = "core8_temp" -LABEL_temp115 = "core9_temp" -LABEL_temp116 = "core10_temp" -LABEL_temp117 = "core11_temp" -LABEL_power1 = "p0_power" -LABEL_power2 = "p0_pcie_power" -LABEL_power3 = "p0_io_power" -LABEL_power4 = "centaur0_power" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/rtc@68.conf b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/rtc@68.conf deleted file mode 100644 index 8b6053e33..000000000 --- a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/rtc@68.conf +++ /dev/null @@ -1,3 +0,0 @@ -LABEL_temp1=rtc -WARNLO_temp1=10000 -WARNHI_temp1=35000 diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@c0/tmp423@4c.conf b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@c0/tmp423@4c.conf deleted file mode 100644 index 3166f32f1..000000000 --- a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@c0/tmp423@4c.conf +++ /dev/null @@ -1,7 +0,0 @@ -LABEL_temp1=ambient -WARNLO_temp1=10000 -WARNHI_temp1=40000 - -LABEL_temp2=cpu -WARNLO_temp2=10000 -WARNHI_temp2=80000 diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index e904dc0e1..c3650f468 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,9 +1,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" NAMES = " \ - i2c@1e78a000/i2c-bus@40/rtc@68 \ - i2c@1e78a000/i2c-bus@c0/tmp423@4c \ - i2c@1e78a000/i2c-bus@100/occ-hwmon@50 \ + bus@1e78a000/i2c-bus@40/rtc@68 \ + bus@1e78a000/i2c-bus@c0/tmp423@4c \ + bus@1e78a000/i2c-bus@100/occ-hwmon@50 \ " ITEMSFMT = "ahb/apb/{0}.conf" -- cgit v1.2.3