diff --git a/packages/platforms/accton/x86-64/as9726-32d/modules/PKG.yml b/packages/platforms/accton/x86-64/as9726-32d/modules/PKG.yml index 06a02bec5..7808b4a78 100644 --- a/packages/platforms/accton/x86-64/as9726-32d/modules/PKG.yml +++ b/packages/platforms/accton/x86-64/as9726-32d/modules/PKG.yml @@ -1 +1 @@ -!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as9726-32d ARCH=amd64 KERNELS="onl-kernel-6.1-lts-x86-64-all:amd64" +!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as9726-32d ARCH=amd64 KERNELS="onl-kernel-6.12-lts-x86-64-all:amd64" diff --git a/packages/platforms/accton/x86-64/as9726-32d/modules/builds/Makefile b/packages/platforms/accton/x86-64/as9726-32d/modules/builds/Makefile index 3c70c12fa..2bc42bdfa 100644 --- a/packages/platforms/accton/x86-64/as9726-32d/modules/builds/Makefile +++ b/packages/platforms/accton/x86-64/as9726-32d/modules/builds/Makefile @@ -1,4 +1,4 @@ -KERNELS := onl-kernel-6.1-lts-x86-64-all:amd64 +KERNELS := onl-kernel-6.12-lts-x86-64-all:amd64 KMODULES := src VENDOR := accton BASENAME := x86-64-accton-as9726-32d diff --git a/packages/platforms/accton/x86-64/as9726-32d/modules/builds/src/x86-64-accton-as9726-32d-cpld.c b/packages/platforms/accton/x86-64/as9726-32d/modules/builds/src/x86-64-accton-as9726-32d-cpld.c index 3aed8f66c..064af0d1a 100644 --- a/packages/platforms/accton/x86-64/as9726-32d/modules/builds/src/x86-64-accton-as9726-32d-cpld.c +++ b/packages/platforms/accton/x86-64/as9726-32d/modules/builds/src/x86-64-accton-as9726-32d-cpld.c @@ -839,9 +839,9 @@ static ssize_t show_bios_flash_id(struct device *dev, struct device_attribute *a /* * I2C init/probing/exit functions */ -static int as9726_32d_cpld_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int as9726_32d_cpld_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent); struct as9726_32d_cpld_data *data; int ret = -ENODEV; diff --git a/packages/platforms/accton/x86-64/as9726-32d/modules/builds/src/x86-64-accton-as9726-32d-fan.c b/packages/platforms/accton/x86-64/as9726-32d/modules/builds/src/x86-64-accton-as9726-32d-fan.c index 97be3808c..39f80849e 100644 --- a/packages/platforms/accton/x86-64/as9726-32d/modules/builds/src/x86-64-accton-as9726-32d-fan.c +++ b/packages/platforms/accton/x86-64/as9726-32d/modules/builds/src/x86-64-accton-as9726-32d-fan.c @@ -462,8 +462,7 @@ static const struct hwmon_chip_info as9726_32d_fan_chip_info = { .info = as9726_32d_fan_info, }; -static int as9726_32d_fan_probe(struct i2c_client *client, - const struct i2c_device_id *dev_id) +static int as9726_32d_fan_probe(struct i2c_client *client) { struct as9726_32d_fan_data *data; int status; diff --git a/packages/platforms/accton/x86-64/as9726-32d/modules/builds/src/x86-64-accton-as9726-32d-leds.c b/packages/platforms/accton/x86-64/as9726-32d/modules/builds/src/x86-64-accton-as9726-32d-leds.c index f6831d358..04d2ce8a0 100644 --- a/packages/platforms/accton/x86-64/as9726-32d/modules/builds/src/x86-64-accton-as9726-32d-leds.c +++ b/packages/platforms/accton/x86-64/as9726-32d/modules/builds/src/x86-64-accton-as9726-32d-leds.c @@ -390,14 +390,12 @@ static int accton_as9726_32d_led_probe(struct platform_device *pdev) return ret; } -static int accton_as9726_32d_led_remove(struct platform_device *pdev) +static void accton_as9726_32d_led_remove(struct platform_device *pdev) { int i; for (i = 0; i < ARRAY_SIZE(accton_as9726_32d_leds); i++) led_classdev_unregister(&accton_as9726_32d_leds[i]); - - return 0; } static struct platform_driver accton_as9726_32d_led_driver = { diff --git a/packages/platforms/accton/x86-64/as9726-32d/modules/builds/src/x86-64-accton-as9726-32d-psu.c b/packages/platforms/accton/x86-64/as9726-32d/modules/builds/src/x86-64-accton-as9726-32d-psu.c index 8b5a3da8a..3bf480ef3 100644 --- a/packages/platforms/accton/x86-64/as9726-32d/modules/builds/src/x86-64-accton-as9726-32d-psu.c +++ b/packages/platforms/accton/x86-64/as9726-32d/modules/builds/src/x86-64-accton-as9726-32d-psu.c @@ -131,9 +131,9 @@ static const struct hwmon_chip_info as9726_32d_psu_chip_info = { .info = as9726_32d_psu_info, }; -static int as9726_32d_psu_probe(struct i2c_client *client, - const struct i2c_device_id *dev_id) +static int as9726_32d_psu_probe(struct i2c_client *client) { + const struct i2c_device_id *dev_id = i2c_client_get_device_id(client); struct as9726_32d_psu_data *data; int status; diff --git a/packages/platforms/accton/x86-64/as9726-32d/onlp/builds/x86_64_accton_as9726_32d/module/src/sysi.c b/packages/platforms/accton/x86-64/as9726-32d/onlp/builds/x86_64_accton_as9726_32d/module/src/sysi.c index 0a97d9623..576b70698 100644 --- a/packages/platforms/accton/x86-64/as9726-32d/onlp/builds/x86_64_accton_as9726_32d/module/src/sysi.c +++ b/packages/platforms/accton/x86-64/as9726-32d/onlp/builds/x86_64_accton_as9726_32d/module/src/sysi.c @@ -100,7 +100,7 @@ int onlp_sysi_oids_get(onlp_oid_t* table, int max) int onlp_sysi_platform_info_get(onlp_platform_info_t* pi) { int i, v[NUM_OF_CPLD]={0}; - onlp_onie_info_t onie; + onlp_onie_info_t onie = {0}; char *bios_ver = NULL; /* BIOS version */ diff --git a/packages/platforms/accton/x86-64/as9726-32d/platform-config/r0/src/lib/x86-64-accton-as9726-32d-r0.yml b/packages/platforms/accton/x86-64/as9726-32d/platform-config/r0/src/lib/x86-64-accton-as9726-32d-r0.yml index 2f8e7b099..ecdd283d7 100644 --- a/packages/platforms/accton/x86-64/as9726-32d/platform-config/r0/src/lib/x86-64-accton-as9726-32d-r0.yml +++ b/packages/platforms/accton/x86-64/as9726-32d/platform-config/r0/src/lib/x86-64-accton-as9726-32d-r0.yml @@ -18,7 +18,7 @@ x86-64-accton-as9726-32d-r0: --stop=1 kernel: - <<: *kernel-6-1 + <<: *kernel-6-12 args: >- console=tty0