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
new file mode 100644
index 0000000..721c54f
--- /dev/null
+++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@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-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
new file mode 100644
index 0000000..9adca0b
--- /dev/null
+++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@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-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
new file mode 100644
index 0000000..80f2eb3
--- /dev/null
+++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@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-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
new file mode 100644
index 0000000..b586914
--- /dev/null
+++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@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-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
new file mode 100644
index 0000000..5241409
--- /dev/null
+++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@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-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
new file mode 100644
index 0000000..3f7d908
--- /dev/null
+++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@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/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf
new file mode 100644
index 0000000..48f8c26
--- /dev/null
+++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf
@@ -0,0 +1,59 @@
+LABEL_fan1= "Fan0_0_RPM"
+TARGET_fan1= "Fan0_0_RPM"
+WARNHI_fan1= "21000"
+WARNLO_fan1= "250"
+CRITHI_fan1= "23000"
+CRITLO_fan1= "250"
+MINVALUE_fan1 = "0"
+MAXVALUE_fan1 = "25500"
+EVENT_fan1= "WARNHI,WARNLO,CRITHI,CRITLO"
+
+LABEL_fan2= "Fan0_1_RPM"
+TARGET_fan2= "Fan0_1_RPM"
+WARNHI_fan2= "21000"
+WARNLO_fan2= "250"
+CRITHI_fan2= "23000"
+CRITLO_fan2= "250"
+MINVALUE_fan2 = "0"
+MAXVALUE_fan2 = "25500"
+EVENT_fan2= "WARNHI,WARNLO,CRITHI,CRITLO"
+
+LABEL_fan3= "Fan1_0_RPM"
+TARGET_fan3= "Fan1_0_RPM"
+WARNHI_fan3= "21000"
+WARNLO_fan3= "250"
+CRITHI_fan3= "23000"
+CRITLO_fan3= "250"
+MINVALUE_fan3 = "0"
+MAXVALUE_fan3 = "25500"
+EVENT_fan3= "WARNHI,WARNLO,CRITHI,CRITLO"
+
+LABEL_fan4= "Fan1_1_RPM"
+TARGET_fan4= "Fan1_1_RPM"
+WARNHI_fan4= "21000"
+WARNLO_fan4= "250"
+CRITHI_fan4= "23000"
+CRITLO_fan4= "250"
+MINVALUE_fan4 = "0"
+MAXVALUE_fan4 = "25500"
+EVENT_fan4= "WARNHI,WARNLO,CRITHI,CRITLO"
+
+LABEL_fan5= "Fan2_0_RPM"
+TARGET_fan5= "Fan2_0_RPM"
+WARNHI_fan5= "21000"
+WARNLO_fan5= "250"
+CRITHI_fan5= "23000"
+CRITLO_fan5= "250"
+MINVALUE_fan5 = "0"
+MAXVALUE_fan5 = "25500"
+EVENT_fan5= "WARNHI,WARNLO,CRITHI,CRITLO"
+
+LABEL_fan6= "Fan2_1_RPM"
+TARGET_fan6= "Fan2_1_RPM"
+WARNHI_fan6= "21000"
+WARNLO_fan6= "250"
+CRITHI_fan6= "23000"
+CRITLO_fan6= "250"
+MINVALUE_fan6 = "0"
+MAXVALUE_fan6 = "25500"
+EVENT_fan6= "WARNHI,WARNLO,CRITHI,CRITLO"
\ No newline at end of file
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
new file mode 100644
index 0000000..57ec7a3
--- /dev/null
+++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -0,0 +1,22 @@
+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 \
+        "
+ITEMSFMT = "ahb/apb/{0}.conf"
+
+ITEMS += "${@compose_list(d, 'ITEMSFMT', 'NAMES')}"
+
+ENVS = "obmc/hwmon/{0}"
+SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}"
+
+# Fan sensors
+FITEMS = "pwm-fan-controller@103000.conf"
+FENVS = "obmc/hwmon/ahb/apb/{0}"
+SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'FENVS', 'FITEMS')}"