From 6e7584f932e8808fdd804650fa90ede8808a7480 Mon Sep 17 00:00:00 2001 From: Ben Pai Date: Tue, 29 Sep 2020 20:01:12 +0800 Subject: meta-ibm: mihawk: Solve the issue of cannot reading 250 soc temperature Mihawk cannot read the 250 soc sensor on the riser, this is because dts defines pca9545riser@70 instead of pca9545@70. (From meta-ibm rev: 731297ebde0eb4272d39260a30cd5f5b1f4e6f1a) Change-Id: Ibcb72ef6be7c953cc35cc216e8cc45e283949e61 Signed-off-by: Ben Pai Signed-off-by: Andrew Geissler --- .../apb/bus@1e78a000/i2c-bus@380/pca9545@70/i2c@0/tmp431@4c.conf | 5 ----- .../apb/bus@1e78a000/i2c-bus@380/pca9545@70/i2c@1/tmp431@4c.conf | 5 ----- .../bus@1e78a000/i2c-bus@380/pca9545riser@70/i2c@0/tmp431@4c.conf | 5 +++++ .../bus@1e78a000/i2c-bus@380/pca9545riser@70/i2c@1/tmp431@4c.conf | 5 +++++ .../apb/bus@1e78a000/i2c-bus@3c0/pca9545@70/i2c@0/tmp431@4c.conf | 5 ----- .../apb/bus@1e78a000/i2c-bus@3c0/pca9545@70/i2c@1/tmp431@4c.conf | 5 ----- .../bus@1e78a000/i2c-bus@3c0/pca9545riser@70/i2c@0/tmp431@4c.conf | 5 +++++ .../bus@1e78a000/i2c-bus@3c0/pca9545riser@70/i2c@1/tmp431@4c.conf | 5 +++++ meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend | 8 ++++---- 9 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545@70/i2c@0/tmp431@4c.conf delete mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545@70/i2c@1/tmp431@4c.conf create mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545riser@70/i2c@0/tmp431@4c.conf create mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545riser@70/i2c@1/tmp431@4c.conf delete mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545@70/i2c@0/tmp431@4c.conf delete mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545@70/i2c@1/tmp431@4c.conf create mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545riser@70/i2c@0/tmp431@4c.conf create mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545riser@70/i2c@1/tmp431@4c.conf (limited to 'meta-ibm/recipes-phosphor/sensors') diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545@70/i2c@0/tmp431@4c.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545@70/i2c@0/tmp431@4c.conf deleted file mode 100644 index 1cad7deb8..000000000 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545@70/i2c@0/tmp431@4c.conf +++ /dev/null @@ -1,5 +0,0 @@ -LABEL_temp2 = "250_soc2" -WARNHI_temp2 = "95000" -WARNLO_temp2 = "0" -CRITHI_temp2 = "100000" -CRITLO_temp2 = "0" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545@70/i2c@1/tmp431@4c.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545@70/i2c@1/tmp431@4c.conf deleted file mode 100644 index cd28bd793..000000000 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545@70/i2c@1/tmp431@4c.conf +++ /dev/null @@ -1,5 +0,0 @@ -LABEL_temp2 = "250_soc3" -WARNHI_temp2 = "95000" -WARNLO_temp2 = "0" -CRITHI_temp2 = "100000" -CRITLO_temp2 = "0" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545riser@70/i2c@0/tmp431@4c.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545riser@70/i2c@0/tmp431@4c.conf new file mode 100644 index 000000000..1cad7deb8 --- /dev/null +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545riser@70/i2c@0/tmp431@4c.conf @@ -0,0 +1,5 @@ +LABEL_temp2 = "250_soc2" +WARNHI_temp2 = "95000" +WARNLO_temp2 = "0" +CRITHI_temp2 = "100000" +CRITLO_temp2 = "0" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545riser@70/i2c@1/tmp431@4c.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545riser@70/i2c@1/tmp431@4c.conf new file mode 100644 index 000000000..cd28bd793 --- /dev/null +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545riser@70/i2c@1/tmp431@4c.conf @@ -0,0 +1,5 @@ +LABEL_temp2 = "250_soc3" +WARNHI_temp2 = "95000" +WARNLO_temp2 = "0" +CRITHI_temp2 = "100000" +CRITLO_temp2 = "0" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545@70/i2c@0/tmp431@4c.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545@70/i2c@0/tmp431@4c.conf deleted file mode 100644 index d8f95b047..000000000 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545@70/i2c@0/tmp431@4c.conf +++ /dev/null @@ -1,5 +0,0 @@ -LABEL_temp2 = "250_soc6" -WARNHI_temp2 = "95000" -WARNLO_temp2 = "0" -CRITHI_temp2 = "100000" -CRITLO_temp2 = "0" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545@70/i2c@1/tmp431@4c.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545@70/i2c@1/tmp431@4c.conf deleted file mode 100644 index 1b075b30f..000000000 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545@70/i2c@1/tmp431@4c.conf +++ /dev/null @@ -1,5 +0,0 @@ -LABEL_temp2 = "250_soc7" -WARNHI_temp2 = "95000" -WARNLO_temp2 = "0" -CRITHI_temp2 = "100000" -CRITLO_temp2 = "0" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545riser@70/i2c@0/tmp431@4c.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545riser@70/i2c@0/tmp431@4c.conf new file mode 100644 index 000000000..d8f95b047 --- /dev/null +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545riser@70/i2c@0/tmp431@4c.conf @@ -0,0 +1,5 @@ +LABEL_temp2 = "250_soc6" +WARNHI_temp2 = "95000" +WARNLO_temp2 = "0" +CRITHI_temp2 = "100000" +CRITLO_temp2 = "0" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545riser@70/i2c@1/tmp431@4c.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545riser@70/i2c@1/tmp431@4c.conf new file mode 100644 index 000000000..1b075b30f --- /dev/null +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545riser@70/i2c@1/tmp431@4c.conf @@ -0,0 +1,5 @@ +LABEL_temp2 = "250_soc7" +WARNHI_temp2 = "95000" +WARNLO_temp2 = "0" +CRITHI_temp2 = "100000" +CRITLO_temp2 = "0" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index e2e8402c4..4886ca772 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -45,12 +45,12 @@ CHIPS_mihawk = " \ bus@1e78a000/i2c-bus@140/ir35221@72 \ bus@1e78a000/i2c-bus@180/ir35221@70 \ bus@1e78a000/i2c-bus@180/ir35221@72 \ - bus@1e78a000/i2c-bus@380/pca9545@70/i2c@0/tmp431@4c \ - bus@1e78a000/i2c-bus@380/pca9545@70/i2c@1/tmp431@4c \ + bus@1e78a000/i2c-bus@380/pca9545riser@70/i2c@0/tmp431@4c \ + bus@1e78a000/i2c-bus@380/pca9545riser@70/i2c@1/tmp431@4c \ bus@1e78a000/i2c-bus@380/pca9545@71/i2c@0/tmp431@4c \ bus@1e78a000/i2c-bus@380/pca9545@71/i2c@1/tmp431@4c \ - bus@1e78a000/i2c-bus@3c0/pca9545@70/i2c@0/tmp431@4c \ - bus@1e78a000/i2c-bus@3c0/pca9545@70/i2c@1/tmp431@4c \ + bus@1e78a000/i2c-bus@3c0/pca9545riser@70/i2c@0/tmp431@4c \ + bus@1e78a000/i2c-bus@3c0/pca9545riser@70/i2c@1/tmp431@4c \ bus@1e78a000/i2c-bus@3c0/pca9545@71/i2c@0/tmp431@4c \ bus@1e78a000/i2c-bus@3c0/pca9545@71/i2c@1/tmp431@4c \ bus@1e78a000/i2c-bus@400/tmp275@48 \ -- cgit v1.2.3