From 71ec5cd67553d31f4ece3f2462b289a8bdcebfa4 Mon Sep 17 00:00:00 2001 From: Benjamin Fair Date: Fri, 12 Apr 2019 11:46:55 -0700 Subject: meta-quanta: gsj: rename sensor paths to match dts The names of the i2c bus nodes in the device tree changed from i2c-bus@xxxx to just i2c@xxx. Update the phosphor-hwmon sensor configuration paths to match. (From meta-quanta rev: 50c57e091989c4d3078147bfb42146ea22d273c5) Signed-off-by: Benjamin Fair Change-Id: I8bded436fc9707c063d15794f182bb9024f98889 Signed-off-by: Brad Bishop --- .../obmc/hwmon/ahb/apb/i2c-bus@81000/lm75@5c.conf | 8 ----- .../obmc/hwmon/ahb/apb/i2c-bus@82000/lm75@5c.conf | 8 ----- .../obmc/hwmon/ahb/apb/i2c-bus@83000/lm75@5c.conf | 8 ----- .../obmc/hwmon/ahb/apb/i2c-bus@84000/lm75@5c.conf | 8 ----- .../hwmon/ahb/apb/i2c-bus@8b000/hotswap@15.conf | 35 ---------------------- .../ahb/apb/i2c-bus@8b000/power-brick@36.conf | 27 ----------------- .../obmc/hwmon/ahb/apb/i2c@81000/lm75@5c.conf | 8 +++++ .../obmc/hwmon/ahb/apb/i2c@82000/lm75@5c.conf | 8 +++++ .../obmc/hwmon/ahb/apb/i2c@83000/lm75@5c.conf | 8 +++++ .../obmc/hwmon/ahb/apb/i2c@84000/lm75@5c.conf | 8 +++++ .../obmc/hwmon/ahb/apb/i2c@8b000/hotswap@15.conf | 35 ++++++++++++++++++++++ .../hwmon/ahb/apb/i2c@8b000/power-brick@36.conf | 27 +++++++++++++++++ .../sensors/phosphor-hwmon_%.bbappend | 12 ++++---- 13 files changed, 100 insertions(+), 100 deletions(-) delete mode 100644 meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@81000/lm75@5c.conf delete mode 100644 meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@82000/lm75@5c.conf delete mode 100644 meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@83000/lm75@5c.conf delete mode 100644 meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@84000/lm75@5c.conf delete mode 100644 meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@8b000/hotswap@15.conf delete mode 100644 meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@8b000/power-brick@36.conf create mode 100644 meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@81000/lm75@5c.conf create mode 100644 meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/lm75@5c.conf create mode 100644 meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@83000/lm75@5c.conf create mode 100644 meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@84000/lm75@5c.conf create mode 100644 meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/hotswap@15.conf create mode 100644 meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/power-brick@36.conf (limited to 'meta-quanta/meta-gsj') diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@81000/lm75@5c.conf b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@81000/lm75@5c.conf deleted file mode 100644 index 721c54fda..000000000 --- a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@81000/lm75@5c.conf +++ /dev/null @@ -1,8 +0,0 @@ -LABEL_temp1= "KL0" -WARNLO_temp1= "5000" -WARNHI_temp1= "38000" -CRITHI_temp1 = "40000" -CRITLO_temp1 = "0" -MINVALUE_temp1 = "-128" -MAXVALUE_temp1 = "127" -EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@82000/lm75@5c.conf b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@82000/lm75@5c.conf deleted file mode 100644 index 9adca0b72..000000000 --- a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@82000/lm75@5c.conf +++ /dev/null @@ -1,8 +0,0 @@ -LABEL_temp1= "KL1" -WARNLO_temp1= "5000" -WARNHI_temp1= "58000" -CRITHI_temp1 = "60000" -CRITLO_temp1 = "0" -MINVALUE_temp1 = "-128" -MAXVALUE_temp1 = "127" -EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@83000/lm75@5c.conf b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@83000/lm75@5c.conf deleted file mode 100644 index 80f2eb30b..000000000 --- a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@83000/lm75@5c.conf +++ /dev/null @@ -1,8 +0,0 @@ -LABEL_temp1= "KL2" -WARNLO_temp1= "5000" -WARNHI_temp1= "58000" -CRITHI_temp1 = "60000" -CRITLO_temp1 = "0" -MINVALUE_temp1 = "-128" -MAXVALUE_temp1 = "127" -EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@84000/lm75@5c.conf b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@84000/lm75@5c.conf deleted file mode 100644 index b58691493..000000000 --- a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@84000/lm75@5c.conf +++ /dev/null @@ -1,8 +0,0 @@ -LABEL_temp1= "KL3" -WARNLO_temp1= "5000" -WARNHI_temp1= "68000" -CRITHI_temp1 = "75000" -CRITLO_temp1 = "0" -MINVALUE_temp1 = "-128" -MAXVALUE_temp1 = "127" -EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@8b000/hotswap@15.conf b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@8b000/hotswap@15.conf deleted file mode 100644 index 5241409dd..000000000 --- a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@8b000/hotswap@15.conf +++ /dev/null @@ -1,35 +0,0 @@ -LABEL_temp1= "P48V_HSC_Temp" -WARNHI_temp1= "95000" -WARNLO_temp1= "5000" -CRITHI_temp1= "105000" -CRITLO_temp1= "0" -MINVALUE_temp1 = "-128" -MAXVALUE_temp1 = "127" -EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" - -LABEL_curr1= "P48V_HSC_Current" -WARNLO_curr1= "3" -CRITLO_curr1= "0" -WARNHI_curr1= "13750" -CRITHI_curr1= "15000" -MINVALUE_curr1 = "0" -MAXVALUE_curr1 = "23" -EVENT_curr1= "WARNHI,WARNLO,CRITHI,CRITLO" - -LABEL_in3= "P48V_HSC_Vol" -WARNLO_in3= "39500" -CRITLO_in3= "38500" -WARNHI_in3= "60500" -CRITHI_in3= "61500" -MINVALUE_in3 = "0" -MAXVALUE_in3 = "62" -EVENT_in3= "WARNHI,WARNLO,CRITHI,CRITLO" - -LABEL_power1= "P48V_HSC_Power" -WARNLO_power1= "100000" -CRITLO_power1= "0" -WARNHI_power1= "550000000" -CRITHI_power1= "600000000" -MINVALUE_power1 = "0" -MAXVALUE_power1 = "795" -EVENT_power1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@8b000/power-brick@36.conf b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@8b000/power-brick@36.conf deleted file mode 100644 index 3f7d908ef..000000000 --- a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@8b000/power-brick@36.conf +++ /dev/null @@ -1,27 +0,0 @@ -LABEL_temp1= "P12V_BRIC_Temp" -WARNHI_temp1= "110000" -WARNLO_temp1= "5000" -CRITHI_temp1= "120000" -CRITLO_temp1= "0" -MINVALUE_temp1 = "-128" -MAXVALUE_temp1 = "127" -EVENT_temp1 = "WARNHI,WARNLO,CRITHI,CRITLO" - -LABEL_curr1= "P12V_BRIC_Current" -WARNLO_curr1= "9" -CRITLO_curr1= "0" -WARNHI_curr1= "45800" -CRITHI_curr1= "50000" -MINVALUE_curr1 = "0" -MAXVALUE_curr1 = "51" -EVENT_curr1 = "WARNHI,WARNLO,CRITHI,CRITLO" - -LABEL_in2= "P12V_BRIC_Vol" -WARNLO_in2= "11400" -CRITLO_in2= "11040" -WARNHI_in2= "12600" -CRITHI_in2= "12960" -MINVALUE_in2= "0" -MAXVALUE_in2= "13" -EVENT_in2= "WARNHI,WARNLO,CRITHI,CRITLO" - diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@81000/lm75@5c.conf b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@81000/lm75@5c.conf new file mode 100644 index 000000000..721c54fda --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@81000/lm75@5c.conf @@ -0,0 +1,8 @@ +LABEL_temp1= "KL0" +WARNLO_temp1= "5000" +WARNHI_temp1= "38000" +CRITHI_temp1 = "40000" +CRITLO_temp1 = "0" +MINVALUE_temp1 = "-128" +MAXVALUE_temp1 = "127" +EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/lm75@5c.conf b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/lm75@5c.conf new file mode 100644 index 000000000..9adca0b72 --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/lm75@5c.conf @@ -0,0 +1,8 @@ +LABEL_temp1= "KL1" +WARNLO_temp1= "5000" +WARNHI_temp1= "58000" +CRITHI_temp1 = "60000" +CRITLO_temp1 = "0" +MINVALUE_temp1 = "-128" +MAXVALUE_temp1 = "127" +EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@83000/lm75@5c.conf b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@83000/lm75@5c.conf new file mode 100644 index 000000000..80f2eb30b --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@83000/lm75@5c.conf @@ -0,0 +1,8 @@ +LABEL_temp1= "KL2" +WARNLO_temp1= "5000" +WARNHI_temp1= "58000" +CRITHI_temp1 = "60000" +CRITLO_temp1 = "0" +MINVALUE_temp1 = "-128" +MAXVALUE_temp1 = "127" +EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@84000/lm75@5c.conf b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@84000/lm75@5c.conf new file mode 100644 index 000000000..b58691493 --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@84000/lm75@5c.conf @@ -0,0 +1,8 @@ +LABEL_temp1= "KL3" +WARNLO_temp1= "5000" +WARNHI_temp1= "68000" +CRITHI_temp1 = "75000" +CRITLO_temp1 = "0" +MINVALUE_temp1 = "-128" +MAXVALUE_temp1 = "127" +EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/hotswap@15.conf b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/hotswap@15.conf new file mode 100644 index 000000000..5241409dd --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/hotswap@15.conf @@ -0,0 +1,35 @@ +LABEL_temp1= "P48V_HSC_Temp" +WARNHI_temp1= "95000" +WARNLO_temp1= "5000" +CRITHI_temp1= "105000" +CRITLO_temp1= "0" +MINVALUE_temp1 = "-128" +MAXVALUE_temp1 = "127" +EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" + +LABEL_curr1= "P48V_HSC_Current" +WARNLO_curr1= "3" +CRITLO_curr1= "0" +WARNHI_curr1= "13750" +CRITHI_curr1= "15000" +MINVALUE_curr1 = "0" +MAXVALUE_curr1 = "23" +EVENT_curr1= "WARNHI,WARNLO,CRITHI,CRITLO" + +LABEL_in3= "P48V_HSC_Vol" +WARNLO_in3= "39500" +CRITLO_in3= "38500" +WARNHI_in3= "60500" +CRITHI_in3= "61500" +MINVALUE_in3 = "0" +MAXVALUE_in3 = "62" +EVENT_in3= "WARNHI,WARNLO,CRITHI,CRITLO" + +LABEL_power1= "P48V_HSC_Power" +WARNLO_power1= "100000" +CRITLO_power1= "0" +WARNHI_power1= "550000000" +CRITHI_power1= "600000000" +MINVALUE_power1 = "0" +MAXVALUE_power1 = "795" +EVENT_power1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/power-brick@36.conf b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/power-brick@36.conf new file mode 100644 index 000000000..3f7d908ef --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/power-brick@36.conf @@ -0,0 +1,27 @@ +LABEL_temp1= "P12V_BRIC_Temp" +WARNHI_temp1= "110000" +WARNLO_temp1= "5000" +CRITHI_temp1= "120000" +CRITLO_temp1= "0" +MINVALUE_temp1 = "-128" +MAXVALUE_temp1 = "127" +EVENT_temp1 = "WARNHI,WARNLO,CRITHI,CRITLO" + +LABEL_curr1= "P12V_BRIC_Current" +WARNLO_curr1= "9" +CRITLO_curr1= "0" +WARNHI_curr1= "45800" +CRITHI_curr1= "50000" +MINVALUE_curr1 = "0" +MAXVALUE_curr1 = "51" +EVENT_curr1 = "WARNHI,WARNLO,CRITHI,CRITLO" + +LABEL_in2= "P12V_BRIC_Vol" +WARNLO_in2= "11400" +CRITLO_in2= "11040" +WARNHI_in2= "12600" +CRITHI_in2= "12960" +MINVALUE_in2= "0" +MAXVALUE_in2= "13" +EVENT_in2= "WARNHI,WARNLO,CRITHI,CRITLO" + diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 57ec7a3a9..bebe0626b 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -2,12 +2,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" NAMES = " \ - i2c-bus@81000/lm75@5c \ - i2c-bus@82000/lm75@5c \ - i2c-bus@83000/lm75@5c \ - i2c-bus@84000/lm75@5c \ - i2c-bus@8b000/hotswap@15 \ - i2c-bus@8b000/power-brick@36 \ + i2c@81000/lm75@5c \ + i2c@82000/lm75@5c \ + i2c@83000/lm75@5c \ + i2c@84000/lm75@5c \ + i2c@8b000/hotswap@15 \ + i2c@8b000/power-brick@36 \ " ITEMSFMT = "ahb/apb/{0}.conf" -- cgit v1.2.1