[centec] upgrade centec platform driver for linux 5.10

saiarcot895 · Oct 15, 2021 · d85298e · d85298e
1 parent 27476b0
commit d85298e
Show file tree

Hide file tree

Showing 33 changed files with 1,333 additions and 68 deletions.
diff --git a/platform/centec-arm64/sonic-platform-modules-e530/24x2c/modules/Makefile b/platform/centec-arm64/sonic-platform-modules-e530/24x2c/modules/Makefile
@@ -1 +1,3 @@
+KBUILD_EXTRA_SYMBOLS = /sonic/platform/centec-arm64/sonic-platform-modules-e530/pca954x/Module.symvers
+
 obj-m := centec_e530_24x2c_platform.o
diff --git a/platform/centec-arm64/sonic-platform-modules-e530/24x2c/modules/centec_e530_24x2c_platform.c b/platform/centec-arm64/sonic-platform-modules-e530/24x2c/modules/centec_e530_24x2c_platform.c
@@ -1,7 +1,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/i2c.h>
-#include <linux/platform_data/pca954x.h>
 #include <linux/device.h>
 #include <linux/kdev_t.h>
 #include <linux/leds.h>
@@ -129,7 +128,7 @@ static int e530_24x2c_init_i2c_gpio(void)
         return -1;
     }
 
-    i2c_client_gpio0 = i2c_new_device(i2c_adp_gpio0, &i2c_dev_gpio0);
+    i2c_client_gpio0 = i2c_new_client_device(i2c_adp_gpio0, &i2c_dev_gpio0);
     if(IS_INVALID_PTR(i2c_client_gpio0))
     {
         i2c_client_gpio0 = NULL;
@@ -145,7 +144,7 @@ static int e530_24x2c_init_i2c_gpio(void)
         return -1;
     }
 
-    i2c_client_gpio1 = i2c_new_device(i2c_adp_gpio1, &i2c_dev_gpio1);
+    i2c_client_gpio1 = i2c_new_client_device(i2c_adp_gpio1, &i2c_dev_gpio1);
     if(IS_INVALID_PTR(i2c_client_gpio1))
     {
         i2c_client_gpio1 = NULL;
@@ -161,7 +160,7 @@ static int e530_24x2c_init_i2c_gpio(void)
         return -1;
     }
 
-    i2c_client_gpio2 = i2c_new_device(i2c_adp_gpio2, &i2c_dev_gpio2);
+    i2c_client_gpio2 = i2c_new_client_device(i2c_adp_gpio2, &i2c_dev_gpio2);
     if(IS_INVALID_PTR(i2c_client_gpio2))
     {
         i2c_client_gpio2 = NULL;

diff --git a/platform/centec-arm64/sonic-platform-modules-e530/24x2q/modules/Makefile b/platform/centec-arm64/sonic-platform-modules-e530/24x2q/modules/Makefile
@@ -1 +1,3 @@
+KBUILD_EXTRA_SYMBOLS = /sonic/platform/centec-arm64/sonic-platform-modules-e530/pca954x/Module.symvers
+
 obj-m := centec_e530_24x2q_platform.o
diff --git a/platform/centec-arm64/sonic-platform-modules-e530/24x2q/modules/centec_e530_24x2q_platform.c b/platform/centec-arm64/sonic-platform-modules-e530/24x2q/modules/centec_e530_24x2q_platform.c
@@ -1,7 +1,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/i2c.h>
-#include <linux/platform_data/pca954x.h>
 #include <linux/device.h>
 #include <linux/kdev_t.h>
 #include <linux/leds.h>
@@ -129,7 +128,7 @@ static int e530_24x2q_init_i2c_gpio(void)
         return -1;
     }
 
-    i2c_client_gpio0 = i2c_new_device(i2c_adp_gpio0, &i2c_dev_gpio0);
+    i2c_client_gpio0 = i2c_new_client_device(i2c_adp_gpio0, &i2c_dev_gpio0);
     if(IS_INVALID_PTR(i2c_client_gpio0))
     {
         i2c_client_gpio0 = NULL;
@@ -145,7 +144,7 @@ static int e530_24x2q_init_i2c_gpio(void)
         return -1;
     }
 
-    i2c_client_gpio1 = i2c_new_device(i2c_adp_gpio1, &i2c_dev_gpio1);
+    i2c_client_gpio1 = i2c_new_client_device(i2c_adp_gpio1, &i2c_dev_gpio1);
     if(IS_INVALID_PTR(i2c_client_gpio1))
     {
         i2c_client_gpio1 = NULL;
@@ -161,7 +160,7 @@ static int e530_24x2q_init_i2c_gpio(void)
         return -1;
     }
 
-    i2c_client_gpio2 = i2c_new_device(i2c_adp_gpio2, &i2c_dev_gpio2);
+    i2c_client_gpio2 = i2c_new_client_device(i2c_adp_gpio2, &i2c_dev_gpio2);
     if(IS_INVALID_PTR(i2c_client_gpio2))
     {
         i2c_client_gpio2 = NULL;

diff --git a/platform/centec-arm64/sonic-platform-modules-e530/48s4x/modules/Makefile b/platform/centec-arm64/sonic-platform-modules-e530/48s4x/modules/Makefile
@@ -1 +1,3 @@
+KBUILD_EXTRA_SYMBOLS = /sonic/platform/centec-arm64/sonic-platform-modules-e530/pca954x/Module.symvers
+
 obj-m := centec_e530_48s4x_platform.o
diff --git a/platform/centec-arm64/sonic-platform-modules-e530/48s4x/modules/centec_e530_48s4x_platform.c b/platform/centec-arm64/sonic-platform-modules-e530/48s4x/modules/centec_e530_48s4x_platform.c
@@ -1,7 +1,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/i2c.h>
-#include <linux/platform_data/pca954x.h>
 #include <linux/device.h>
 #include <linux/kdev_t.h>
 #include <linux/leds.h>
@@ -197,7 +196,7 @@ static int e530_48s4x_init_i2c_gpio(void)
         return -1;
     }
 
-    i2c_client_gpio0 = i2c_new_device(i2c_adp_gpio0, &i2c_dev_gpio0);
+    i2c_client_gpio0 = i2c_new_client_device(i2c_adp_gpio0, &i2c_dev_gpio0);
     if(IS_INVALID_PTR(i2c_client_gpio0))
     {
         i2c_client_gpio0 = NULL;
@@ -213,7 +212,7 @@ static int e530_48s4x_init_i2c_gpio(void)
         return -1;
     }
 
-    i2c_client_gpio1 = i2c_new_device(i2c_adp_gpio1, &i2c_dev_gpio1);
+    i2c_client_gpio1 = i2c_new_client_device(i2c_adp_gpio1, &i2c_dev_gpio1);
     if(IS_INVALID_PTR(i2c_client_gpio1))
     {
         i2c_client_gpio1 = NULL;
@@ -274,7 +273,7 @@ static int e530_48s4x_init_i2c_epld(void)
          return -1;
     }
 
-    i2c_client_epld = i2c_new_device(i2c_adp_master, &i2c_dev_epld);
+    i2c_client_epld = i2c_new_client_device(i2c_adp_master, &i2c_dev_epld);
     if(IS_INVALID_PTR(i2c_client_epld))
     {
         i2c_client_epld = NULL;

diff --git a/platform/centec-arm64/sonic-platform-modules-e530/48t4x-p/modules/Makefile b/platform/centec-arm64/sonic-platform-modules-e530/48t4x-p/modules/Makefile
@@ -1 +1,3 @@
+KBUILD_EXTRA_SYMBOLS = /sonic/platform/centec-arm64/sonic-platform-modules-e530/pca954x/Module.symvers
+
 obj-m := centec_e530_48t4x_p_platform.o
diff --git a/...m/centec-arm64/sonic-platform-modules-e530/48t4x-p/modules/centec_e530_48t4x_p_platform.c b/...m/centec-arm64/sonic-platform-modules-e530/48t4x-p/modules/centec_e530_48t4x_p_platform.c
@@ -1,7 +1,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/i2c.h>
-#include <linux/platform_data/pca954x.h>
 #include <linux/device.h>
 #include <linux/kdev_t.h>
 #include <linux/leds.h>
@@ -195,7 +194,7 @@ static int e530_48t4x_p_init_i2c_gpio(void)
         return -1;
     }
 
-    i2c_client_gpio0 = i2c_new_device(i2c_adp_gpio0, &i2c_dev_gpio0);
+    i2c_client_gpio0 = i2c_new_client_device(i2c_adp_gpio0, &i2c_dev_gpio0);
     if(IS_INVALID_PTR(i2c_client_gpio0))
     {
         i2c_client_gpio0 = NULL;

diff --git a/platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-24x2c.init b/platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-24x2c.init
@@ -17,10 +17,6 @@ function install_python_api_package()
     device="/usr/share/sonic/device"
     platform=$(/usr/local/bin/sonic-cfggen -H -v DEVICE_METADATA.localhost.platform)
 
-    rv=$(pip2 show sonic-platform > /dev/null 2>/dev/null)
-    if [ $? -ne 0 ]; then
-        rv=$(pip2 install $device/$platform/sonic_platform-1.0-py2-none-any.whl)
-    fi
     rv=$(pip3 show sonic-platform > /dev/null 2>/dev/null)
     if [ $? -ne 0 ]; then
         rv=$(pip3 install $device/$platform/sonic_platform-1.0-py3-none-any.whl)
@@ -34,6 +30,7 @@ function load_kernel_modules()
         ifconfig eth0 hw ether $hwaddr
     fi
     depmod -a
+    modprobe ctc-i2c-mux-pca954x
     modprobe centec_e530_24x2c_platform
     modprobe fan-ctc5236
     modprobe dal
@@ -48,6 +45,7 @@ function remove_kernel_modules()
     modprobe -r dal
     modprobe -r fan-ctc5236
     modprobe -r centec_e530_24x2c_platform
+    modprobe -r ctc-i2c-mux-pca954x
 }
 
 case "$1" in

diff --git a/platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-24x2c.install b/platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-24x2c.install
@@ -1,2 +1 @@
-24x2c/modules/sonic_platform-1.0-py2-none-any.whl usr/share/sonic/device/arm64-centec_e530_24x2c-r0
 24x2c/modules/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/arm64-centec_e530_24x2c-r0
diff --git a/platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-24x2q.init b/platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-24x2q.init
@@ -17,10 +17,6 @@ function install_python_api_package()
     device="/usr/share/sonic/device"
     platform=$(/usr/local/bin/sonic-cfggen -H -v DEVICE_METADATA.localhost.platform)
 
-    rv=$(pip2 show sonic-platform > /dev/null 2>/dev/null)
-    if [ $? -ne 0 ]; then
-        rv=$(pip2 install $device/$platform/sonic_platform-1.0-py2-none-any.whl)
-    fi
     rv=$(pip3 show sonic-platform > /dev/null 2>/dev/null)
     if [ $? -ne 0 ]; then
         rv=$(pip3 install $device/$platform/sonic_platform-1.0-py3-none-any.whl)
@@ -34,6 +30,7 @@ function load_kernel_modules()
         ifconfig eth0 hw ether $hwaddr
     fi
     depmod -a
+    modprobe ctc-i2c-mux-pca954x
     modprobe centec_e530_24x2q_platform
     modprobe fan-ctc5236
     modprobe dal
@@ -48,6 +45,7 @@ function remove_kernel_modules()
     modprobe -r dal
     modprobe -r fan-ctc5236
     modprobe -r centec_e530_24x2q_platform
+    modprobe -r ctc-i2c-mux-pca954x
 }
 
 case "$1" in

diff --git a/platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-24x2q.install b/platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-24x2q.install
@@ -1,2 +1 @@
-24x2q/modules/sonic_platform-1.0-py2-none-any.whl usr/share/sonic/device/arm64-centec_e530_24x2q-r0
 24x2q/modules/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/arm64-centec_e530_24x2q-r0
diff --git a/platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-48s4x.init b/platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-48s4x.init
@@ -17,10 +17,6 @@ function install_python_api_package()
     device="/usr/share/sonic/device"
     platform=$(/usr/local/bin/sonic-cfggen -H -v DEVICE_METADATA.localhost.platform)
 
-    rv=$(pip2 show sonic-platform > /dev/null 2>/dev/null)
-    if [ $? -ne 0 ]; then
-        rv=$(pip2 install $device/$platform/sonic_platform-1.0-py2-none-any.whl)
-    fi
     rv=$(pip3 show sonic-platform > /dev/null 2>/dev/null)
     if [ $? -ne 0 ]; then
         rv=$(pip3 install $device/$platform/sonic_platform-1.0-py3-none-any.whl)
@@ -34,6 +30,7 @@ function load_kernel_modules()
         ifconfig eth0 hw ether $hwaddr
     fi
     depmod -a
+    modprobe ctc-i2c-mux-pca954x
     modprobe centec_e530_48s4x_platform
     modprobe fan-ctc5236
     modprobe dal
@@ -48,6 +45,7 @@ function remove_kernel_modules()
     modprobe -r dal
     modprobe -r fan-ctc5236
     modprobe -r centec_e530_48s4x_platform
+    modprobe -r ctc-i2c-mux-pca954x
 }
 
 case "$1" in

diff --git a/platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-48s4x.install b/platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-48s4x.install
@@ -1,2 +1 @@
-48s4x/modules/sonic_platform-1.0-py2-none-any.whl usr/share/sonic/device/arm64-centec_e530_48s4x-r0
 48s4x/modules/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/arm64-centec_e530_48s4x-r0
diff --git a/platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-48t4x-p.init b/platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-48t4x-p.init
@@ -17,10 +17,6 @@ function install_python_api_package()
     device="/usr/share/sonic/device"
     platform=$(/usr/local/bin/sonic-cfggen -H -v DEVICE_METADATA.localhost.platform)
 
-    rv=$(pip2 show sonic-platform > /dev/null 2>/dev/null)
-    if [ $? -ne 0 ]; then
-        rv=$(pip2 install $device/$platform/sonic_platform-1.0-py2-none-any.whl)
-    fi
     rv=$(pip3 show sonic-platform > /dev/null 2>/dev/null)
     if [ $? -ne 0 ]; then
         rv=$(pip3 install $device/$platform/sonic_platform-1.0-py3-none-any.whl)
@@ -34,6 +30,7 @@ function load_kernel_modules()
         ifconfig eth0 hw ether $hwaddr
     fi
     depmod -a
+    modprobe ctc-i2c-mux-pca954x
     modprobe centec_e530_48t4x_p_platform
     modprobe fan-ctc5236
     modprobe dal
@@ -48,6 +45,7 @@ function remove_kernel_modules()
     modprobe -r dal
     modprobe -r fan-ctc5236
     modprobe -r centec_e530_48t4x_p_platform
+    modprobe -r ctc-i2c-mux-pca954x
 }
 
 case "$1" in

diff --git a/...orm/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-48t4x-p.install b/...orm/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-48t4x-p.install
@@ -1,2 +1 @@
-48t4x-p/modules/sonic_platform-1.0-py2-none-any.whl usr/share/sonic/device/arm64-centec_e530_48t4x_p-r0
 48t4x-p/modules/sonic_platform-1.0-py3-none-any.whl usr/share/sonic/device/arm64-centec_e530_48t4x_p-r0
diff --git a/platform/centec-arm64/sonic-platform-modules-e530/debian/rules b/platform/centec-arm64/sonic-platform-modules-e530/debian/rules
@@ -24,6 +24,7 @@ CLASSES_DIR := classes
 CONF_DIR := conf
 KDAL_DIR := ../../centec/centec-dal/
 FAN_DIR := fan
+PCA954X_DIR := pca954x
 
 %:
 	dh $@
@@ -41,10 +42,12 @@ build:
 	(for mod in $(FAN_DIR); do \
 		make modules -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$${mod}/; \
 	done)
+	(for mod in $(PCA954X_DIR); do \
+		make modules -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$${mod}/; \
+	done)
 	(for mod in $(MODULE_DIRS); do \
 		make modules -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$${mod}/modules; \
 		cd $${mod}; \
-		python2.7 setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}/modules; \
 		python3 setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}/modules; \
 		cd -; \
 	done)
@@ -73,6 +76,7 @@ binary-indep:
 		cp $(MOD_SRC_DIR)/$${mod}/$(MODULE_DIR)/*.ko debian/$(PACKAGE_PRE_NAME)-$${mod}/$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \
 		cp $(MOD_SRC_DIR)/$(KDAL_DIR)/*.ko debian/$(PACKAGE_PRE_NAME)-$${mod}/$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \
 		cp $(MOD_SRC_DIR)/$(FAN_DIR)/*.ko debian/$(PACKAGE_PRE_NAME)-$${mod}/$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \
+		cp $(MOD_SRC_DIR)/$(PCA954X_DIR)/*.ko debian/$(PACKAGE_PRE_NAME)-$${mod}/$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \
 		cp $(MOD_SRC_DIR)/$${mod}/$(SERVICE_DIR)/*.service debian/$(PACKAGE_PRE_NAME)-$${mod}/lib/systemd/system/; \
 	done)
 	# Resuming debhelper scripts

diff --git a/platform/centec-arm64/sonic-platform-modules-e530/pca954x/Makefile b/platform/centec-arm64/sonic-platform-modules-e530/pca954x/Makefile
@@ -0,0 +1 @@
+obj-m := ctc-i2c-mux-pca954x.o