From a0ace842eeeec6b88e4906034dac032b56fbaa0a Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Mon, 25 Mar 2019 11:35:32 -0700 Subject: meta-inspur: on5263m5: 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-inspur rev: 92609a93bf06ff5f71983595cf7edc4523676043) Tested: Verified paths visually, but not tested on hardware. Signed-off-by: Patrick Venture Change-Id: I37efb06fe1b59a69939560c7aba71e17354b2b81 Signed-off-by: Brad Bishop --- .../obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp112@48.conf | 5 +++++ .../obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp421@4e.conf | 7 +++++++ .../obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/adm1278@11.conf | 4 ++++ .../obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp112@48.conf | 5 ----- .../obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4e.conf | 7 ------- .../obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@11.conf | 4 ---- .../recipes-phosphor/sensors/phosphor-hwmon_%.bbappend | 6 +++--- 7 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp112@48.conf create mode 100644 meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp421@4e.conf create mode 100644 meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/adm1278@11.conf delete mode 100644 meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp112@48.conf delete mode 100644 meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4e.conf delete mode 100644 meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@11.conf diff --git a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp112@48.conf b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp112@48.conf new file mode 100644 index 0000000000..eebfaedf54 --- /dev/null +++ b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp112@48.conf @@ -0,0 +1,5 @@ +LABEL_temp1 = "inlet" +WARNHI_temp1 = "60000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "70000" +CRITLO_temp1 = "0" diff --git a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp421@4e.conf b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp421@4e.conf new file mode 100644 index 0000000000..f2bf06d5ba --- /dev/null +++ b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp421@4e.conf @@ -0,0 +1,7 @@ +LABEL_temp1 = "outlet" +CRITLO_temp1 = "0" +CRITHI_temp1 = "100000" + +LABEL_temp2 = "outlet2" +CRITLO_temp2 = "0" +CRITHI_temp2 = "100000" diff --git a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/adm1278@11.conf b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/adm1278@11.conf new file mode 100644 index 0000000000..b6da9d7cd1 --- /dev/null +++ b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/adm1278@11.conf @@ -0,0 +1,4 @@ +LABEL_in1 = "vin" +LABEL_in2 = "vout" +LABEL_curr1 = "iout1" +LABEL_power1 = "pin" diff --git a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp112@48.conf b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp112@48.conf deleted file mode 100644 index eebfaedf54..0000000000 --- a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp112@48.conf +++ /dev/null @@ -1,5 +0,0 @@ -LABEL_temp1 = "inlet" -WARNHI_temp1 = "60000" -WARNLO_temp1 = "0" -CRITHI_temp1 = "70000" -CRITLO_temp1 = "0" diff --git a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4e.conf b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4e.conf deleted file mode 100644 index f2bf06d5ba..0000000000 --- a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4e.conf +++ /dev/null @@ -1,7 +0,0 @@ -LABEL_temp1 = "outlet" -CRITLO_temp1 = "0" -CRITHI_temp1 = "100000" - -LABEL_temp2 = "outlet2" -CRITLO_temp2 = "0" -CRITHI_temp2 = "100000" diff --git a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@11.conf b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@11.conf deleted file mode 100644 index b6da9d7cd1..0000000000 --- a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@11.conf +++ /dev/null @@ -1,4 +0,0 @@ -LABEL_in1 = "vin" -LABEL_in2 = "vout" -LABEL_curr1 = "iout1" -LABEL_power1 = "pin" diff --git a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 74695bf2c4..780ffb746c 100644 --- a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -3,9 +3,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" EXTRA_OECONF_append_on5263m5= " --enable-negative-errno-on-fail" CHIPS = " \ - i2c@1e78a000/i2c-bus@1c0/tmp112@48 \ - i2c@1e78a000/i2c-bus@1c0/tmp421@4e \ - i2c@1e78a000/i2c-bus@300/adm1278@11 \ + bus@1e78a000/i2c-bus@1c0/tmp112@48 \ + bus@1e78a000/i2c-bus@1c0/tmp421@4e \ + bus@1e78a000/i2c-bus@300/adm1278@11 \ pwm-tacho-controller@1e786000 \ " ITEMSFMT = "ahb/apb/{0}.conf" -- cgit v1.2.3