Skip to content

Update Centec platform support for Bullseye and 5.10 kernel #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LuiSzee wants to merge 5 commits into from
Closed

Update Centec platform support for Bullseye and 5.10 kernel #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7bfdbb9
[centec] upgrade centec platform support to bullseye
LuiSzee Oct 7, 2021
27476b0
[centec] upgrade centec tsingma bsp for linux 5.10
LuiSzee Oct 14, 2021
d85298e
[centec] upgrade centec platform driver for linux 5.10
LuiSzee Oct 15, 2021
f7f0cde
[centec] upgrade centec platform driver for linux 5.10
LuiSzee Oct 15, 2021
7306aaf
fix bug for build arm64 image
LuiSzee Oct 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion platform/centec-arm64/modules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ rtc-sd2405
ctc5236_switch
ctc5236_mdio
ctcmac
ctcmac_test
ctc5236-mc
ctc_wdt
ehci-ctc
Expand All @@ -20,3 +19,4 @@ pwm-ctc
ext4
overlay
squashfs
mars
2 changes: 2 additions & 0 deletions platform/centec-arm64/sonic-platform-modules-e530/24x2c/modules/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
KBUILD_EXTRA_SYMBOLS = /sonic/platform/centec-arm64/sonic-platform-modules-e530/pca954x/Module.symvers

obj-m := centec_e530_24x2c_platform.o
7 changes: 3 additions & 4 deletions platform/centec-arm64/sonic-platform-modules-e530/24x2c/modules/centec_e530_24x2c_platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions platform/centec-arm64/sonic-platform-modules-e530/24x2q/modules/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
KBUILD_EXTRA_SYMBOLS = /sonic/platform/centec-arm64/sonic-platform-modules-e530/pca954x/Module.symvers

obj-m := centec_e530_24x2q_platform.o
7 changes: 3 additions & 4 deletions platform/centec-arm64/sonic-platform-modules-e530/24x2q/modules/centec_e530_24x2q_platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions platform/centec-arm64/sonic-platform-modules-e530/48s4x/modules/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
KBUILD_EXTRA_SYMBOLS = /sonic/platform/centec-arm64/sonic-platform-modules-e530/pca954x/Module.symvers

obj-m := centec_e530_48s4x_platform.o
7 changes: 3 additions & 4 deletions platform/centec-arm64/sonic-platform-modules-e530/48s4x/modules/centec_e530_48s4x_platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions platform/centec-arm64/sonic-platform-modules-e530/48t4x-p/modules/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 1 addition & 2 deletions ...m/centec-arm64/sonic-platform-modules-e530/48t4x-p/modules/centec_e530_48t4x_p_platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions platform/centec-arm64/sonic-platform-modules-e530/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ Standards-Version: 3.9.3

Package: platform-modules-e530-48t4x-p
Architecture: arm64
Depends: linux-image-4.19.0-12-2-arm64-unsigned
Depends: linux-image-5.10.0-8-2-arm64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-e530-24x2c
Architecture: arm64
Depends: linux-image-4.19.0-12-2-arm64-unsigned
Depends: linux-image-5.10.0-8-2-arm64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-e530-48s4x
Architecture: arm64
Depends: linux-image-4.19.0-12-2-arm64-unsigned
Depends: linux-image-5.10.0-8-2-arm64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-e530-24x2q
Architecture: arm64
Depends: linux-image-4.19.0-12-2-arm64-unsigned
Depends: linux-image-5.10.0-8-2-arm64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
6 changes: 2 additions & 4 deletions platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-24x2c.init
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-24x2c.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 2 additions & 4 deletions platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-24x2q.init
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-24x2q.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 2 additions & 4 deletions platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-48s4x.init
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-48s4x.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 2 additions & 4 deletions platform/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-48t4x-p.init
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion ...orm/centec-arm64/sonic-platform-modules-e530/debian/platform-modules-e530-48t4x-p.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 5 additions & 1 deletion platform/centec-arm64/sonic-platform-modules-e530/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ CLASSES_DIR := classes
CONF_DIR := conf
KDAL_DIR := ../../centec/centec-dal/
FAN_DIR := fan
PCA954X_DIR := pca954x

%:
dh $@
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions platform/centec-arm64/sonic-platform-modules-e530/pca954x/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
obj-m := ctc-i2c-mux-pca954x.o
Empty file added platform/centec-arm64/sonic-platform-modules-e530/pca954x/Module.symvers
View file
Open in desktop
Empty file.
Loading