Modify SN offset and include path

sonic-net · Dec 29, 2021 · 68c392d · 68c392d
1 parent 07faed4
commit 68c392d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/platform/broadcom/sonic-platform-modules-accton/as7726-32x/modules/Makefile b/platform/broadcom/sonic-platform-modules-accton/as7726-32x/modules/Makefile
@@ -1,8 +1,11 @@
 ifneq ($(KERNELRELEASE),)
 obj-m:= accton_as7726_32x_cpld.o accton_as7726_32x_fan.o  \
 	    accton_as7726_32x_leds.o accton_as7726_32x_psu.o ym2651y.o \
-        pddf_custom_psu.o
-
+	    pddf_custom_psu.o
+
+CFLAGS_pddf_custom_psu.o := -I$(M)/../../../../pddf/i2c/modules/include
+KBUILD_EXTRA_SYMBOLS := $(M)/../../../../pddf/i2c/Module.symvers.PDDF
+
 else
 ifeq (,$(KERNEL_SRC))
 #$(error KERNEL_SRC is not defined)

diff --git a/platform/broadcom/sonic-platform-modules-accton/as7726-32x/modules/pddf_custom_psu.c b/platform/broadcom/sonic-platform-modules-accton/as7726-32x/modules/pddf_custom_psu.c
@@ -9,7 +9,7 @@
 #include <linux/sysfs.h>
 #include <linux/slab.h>
 #include <linux/dmi.h>
-#include "../../../../pddf/i2c/modules/include/pddf_psu_defs.h"
+#include "pddf_psu_defs.h"
 
 ssize_t pddf_get_custom_psu_model_name(struct device *dev, struct device_attribute *da, char *buf);
 ssize_t pddf_get_custom_psu_serial_num(struct device *dev, struct device_attribute *da, char *buf);
@@ -23,7 +23,8 @@ enum psu_type {
     PSU_TYPE_AC_110V,
     PSU_TYPE_DC_48V,
     PSU_TYPE_DC_12V,
-    PSU_TYPE_AC_ACBEL_FSF019
+    PSU_TYPE_AC_ACBEL_FSF019,
+    PSU_TYPE_AC_ACBEL_FSF045
 };
 
 struct model_name_info {
@@ -46,15 +47,17 @@ struct model_name_info models[] = {
 {PSU_TYPE_AC_110V, 0x20, 8, 8,  "YM-2651Y"},
 {PSU_TYPE_DC_48V,  0x20, 8, 8,  "YM-2651V"},
 {PSU_TYPE_DC_12V,  0x00, 11, 11, "PSU-12V-750"},
-{PSU_TYPE_AC_ACBEL_FSF019, 0x15, 10, 7, "FSF019-"}
+{PSU_TYPE_AC_ACBEL_FSF019, 0x15, 10, 7, "FSF019-"},
+{PSU_TYPE_AC_ACBEL_FSF045, 0x15, 10, 7, "FSF045-"}
 
 };
 
 struct serial_number_info serials[] = {
 {PSU_TYPE_AC_110V, 0x2e, 18, 18,  "YM-2651Y"},
 {PSU_TYPE_DC_48V,  0x2e, 18, 18,  "YM-2651V"},
 {PSU_TYPE_DC_12V,  0x2e, 18, 18,  "PSU-12V-750"},
-{PSU_TYPE_AC_ACBEL_FSF019, 0x2e, 16, 16, "FSF019-"}
+{PSU_TYPE_AC_ACBEL_FSF019, 0x2e, 16, 16, "FSF019-"},
+{PSU_TYPE_AC_ACBEL_FSF019, 0x2e, 16, 16, "FSF045-"}
 
 };
 
@@ -117,9 +120,9 @@ ssize_t pddf_get_custom_psu_serial_num(struct device *dev, struct device_attribu
         /* Determine if the model name is known, if not, read next index
          */
         if (strncmp(data.model_name, models[i].model_name, models[i].chk_length) == 0) {
+
             status = pddf_psu_read_block(client, serials[i].offset,
-                                           data.serial_number, serials[i].length);
-
+                                      data.serial_number, serials[i].length);
             if (status < 0) {
                 data.serial_number[0] = '\0';
                 dev_dbg(&client->dev, "unable to read serial num from (0x%x) offset(0x%x)\n",