Add to set pca idle_state=-2

sonic-net · Mar 10, 2022 · f5ae9a8 · f5ae9a8
1 parent aa81034
commit f5ae9a8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 18 deletions.
diff --git a/device/accton/x86_64-accton_as5835_54t-r0/pddf/pddf-device.json b/device/accton/x86_64-accton_as5835_54t-r0/pddf/pddf-device.json
@@ -33,7 +33,7 @@
             "i2c-i801",
             "i2c-ismt",
             "i2c_dev",
-            "i2c_mux_pca954x force_deselect_on_exit=1",
+            "i2c_mux_pca954x",
             "optoe"
         ],
         "pddf_kos":
@@ -113,12 +113,12 @@
         "i2c":
         {
             "topo_info": { "parent_bus":"0x1", "dev_addr":"0x77", "dev_type":"pca9548"},
-            "dev_attr": { "virt_bus":"0x2"},
+            "dev_attr": { "virt_bus":"0x2", "idle_state":"-2"},
              "channel":
             [
                 { "chn":"0", "dev":"MUX2" },
                 { "chn":"0", "dev":"MUX3" },
-                { "chn":"0", "dev":"MUX4" },                
+                { "chn":"0", "dev":"MUX4" },
                 { "chn":"1", "dev":"CPLD1" },
                 { "chn":"1", "dev":"CPLD2" },
                 { "chn":"1", "dev":"CPLD3" },
@@ -214,7 +214,7 @@
         "i2c":
         {
             "topo_info": { "parent_bus":"0x2", "dev_addr":"0x70", "dev_type":"pca9548"},
-            "dev_attr": { "virt_bus":"0xa"},
+            "dev_attr": { "virt_bus":"0xa", "idle_state":"-2"},
             "channel":
             [
                 { "chn":"1", "dev":"PSU1" },
@@ -325,7 +325,7 @@
         "i2c":
         {
             "topo_info": { "parent_bus":"0x2", "dev_addr":"0x71", "dev_type":"pca9548"},
-            "dev_attr": { "virt_bus":"0x1a"},
+            "dev_attr": { "virt_bus":"0x1a", "idle_state":"-2"},
             "channel":
             [               
                 { "chn":"0", "dev":"TEMP1" },
@@ -398,7 +398,7 @@
         "i2c":
         {
             "topo_info": { "parent_bus":"0x2", "dev_addr":"0x72", "dev_type":"pca9548"},
-            "dev_attr": { "virt_bus":"0x12"},
+            "dev_attr": { "virt_bus":"0x12", "idle_state":"-2"},
             "channel":
             [
                 { "chn":"0", "dev":"PORT51" },

diff --git a/platform/broadcom/sonic-platform-modules-accton/as5835-54t/modules/Makefile b/platform/broadcom/sonic-platform-modules-accton/as5835-54t/modules/Makefile
@@ -3,6 +3,9 @@ obj-m:= accton_as5835_54t_cpld.o accton_as5835_54t_psu.o  \
         accton_as5835_54t_fan.o accton_as5835_54t_leds.o \
         ym2651y.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/as5835-54t/modules/pddf_custom_psu.c b/platform/broadcom/sonic-platform-modules-accton/as5835-54t/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_show_custom_psu_v_out(struct device *dev, struct device_attribute *da, char *buf);
 extern PSU_SYSFS_ATTR_DATA access_psu_v_out;
@@ -86,13 +86,7 @@ ssize_t pddf_show_custom_psu_v_out(struct device *dev, struct device_attribute *
 	u16 value = psu_get_v_out(client);
 	u8 vout_mode = psu_get_vout_mode(client);
 
-	if ((vout_mode >> 5) == 0)
-		exponent = two_complement_to_int(vout_mode & 0x1f, 5, 0x1f);
-	else
-	{
-		printk(KERN_ERR "%s: Only support linear mode for vout mode\n", __func__);
-		exponent = 0;
-	}
+	exponent = two_complement_to_int(vout_mode, 5, 0x1f);
 	mantissa = value;
 	if (exponent >= 0)
 		return sprintf(buf, "%d\n", (mantissa << exponent) * multiplier);
@@ -104,14 +98,14 @@ ssize_t pddf_show_custom_psu_v_out(struct device *dev, struct device_attribute *
 
 static int __init pddf_custom_psu_init(void)
 {
-	access_psu_v_out.show = pddf_show_custom_psu_v_out;
-	access_psu_v_out.do_get = NULL;
-	return 0;
+    access_psu_v_out.show = pddf_show_custom_psu_v_out;
+    access_psu_v_out.do_get = NULL;
+    return 0;
 }
 
 static void __exit pddf_custom_psu_exit(void)
 {
-	return;
+    return;
 }
 
 MODULE_AUTHOR("Broadcom");