diff --git a/packages/platforms/accton/x86-64/as5835-54x/modules/PKG.yml b/packages/platforms/accton/x86-64/as5835-54x/modules/PKG.yml index 91773f79b..d462baf90 100644 --- a/packages/platforms/accton/x86-64/as5835-54x/modules/PKG.yml +++ b/packages/platforms/accton/x86-64/as5835-54x/modules/PKG.yml @@ -1 +1 @@ -!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as5835-54x ARCH=amd64 KERNELS="onl-kernel-6.1-lts-x86-64-all:amd64" +!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as5835-54x ARCH=amd64 KERNELS="onl-kernel-6.12-lts-x86-64-all:amd64" diff --git a/packages/platforms/accton/x86-64/as5835-54x/modules/builds/Makefile b/packages/platforms/accton/x86-64/as5835-54x/modules/builds/Makefile index e4f304a9b..670da01f0 100644 --- a/packages/platforms/accton/x86-64/as5835-54x/modules/builds/Makefile +++ b/packages/platforms/accton/x86-64/as5835-54x/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-as5835-54x diff --git a/packages/platforms/accton/x86-64/as5835-54x/modules/builds/src/x86-64-accton-as5835-54x-cpld.c b/packages/platforms/accton/x86-64/as5835-54x/modules/builds/src/x86-64-accton-as5835-54x-cpld.c index c357f4b4b..65341a856 100644 --- a/packages/platforms/accton/x86-64/as5835-54x/modules/builds/src/x86-64-accton-as5835-54x-cpld.c +++ b/packages/platforms/accton/x86-64/as5835-54x/modules/builds/src/x86-64-accton-as5835-54x-cpld.c @@ -1004,9 +1004,9 @@ static ssize_t show_version(struct device *dev, struct device_attribute *attr, c /* * I2C init/probing/exit functions */ -static int as5835_54x_cpld_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int as5835_54x_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 as5835_54x_cpld_data *data; int ret = -ENODEV; diff --git a/packages/platforms/accton/x86-64/as5835-54x/modules/builds/src/x86-64-accton-as5835-54x-fan.c b/packages/platforms/accton/x86-64/as5835-54x/modules/builds/src/x86-64-accton-as5835-54x-fan.c index 6170605e5..e07d8dba8 100644 --- a/packages/platforms/accton/x86-64/as5835-54x/modules/builds/src/x86-64-accton-as5835-54x-fan.c +++ b/packages/platforms/accton/x86-64/as5835-54x/modules/builds/src/x86-64-accton-as5835-54x-fan.c @@ -428,8 +428,7 @@ static const struct hwmon_chip_info as5835_54x_fan_chip_info = { .info = as5835_54x_fan_info, }; -static int as5835_54x_fan_probe(struct i2c_client *client, - const struct i2c_device_id *dev_id) +static int as5835_54x_fan_probe(struct i2c_client *client) { struct as5835_54x_fan_data *data; int status; diff --git a/packages/platforms/accton/x86-64/as5835-54x/modules/builds/src/x86-64-accton-as5835-54x-leds.c b/packages/platforms/accton/x86-64/as5835-54x/modules/builds/src/x86-64-accton-as5835-54x-leds.c index cc6651107..1e64948e3 100644 --- a/packages/platforms/accton/x86-64/as5835-54x/modules/builds/src/x86-64-accton-as5835-54x-leds.c +++ b/packages/platforms/accton/x86-64/as5835-54x/modules/builds/src/x86-64-accton-as5835-54x-leds.c @@ -310,15 +310,13 @@ static int accton_as5835_54x_led_probe(struct platform_device *pdev) return ret; } -static int accton_as5835_54x_led_remove(struct platform_device *pdev) +static void accton_as5835_54x_led_remove(struct platform_device *pdev) { int i; - + for (i = 0; i < ARRAY_SIZE(accton_as5835_54x_leds); i++) { led_classdev_unregister(&accton_as5835_54x_leds[i]); } - - return 0; } static struct platform_driver accton_as5835_54x_led_driver = { diff --git a/packages/platforms/accton/x86-64/as5835-54x/modules/builds/src/x86-64-accton-as5835-54x-psu.c b/packages/platforms/accton/x86-64/as5835-54x/modules/builds/src/x86-64-accton-as5835-54x-psu.c index 1b302a23a..ec751cc10 100644 --- a/packages/platforms/accton/x86-64/as5835-54x/modules/builds/src/x86-64-accton-as5835-54x-psu.c +++ b/packages/platforms/accton/x86-64/as5835-54x/modules/builds/src/x86-64-accton-as5835-54x-psu.c @@ -171,9 +171,9 @@ static const struct hwmon_chip_info as5835_54x_psu_chip_info = { .info = as5835_54x_psu_info, }; -static int as5835_54x_psu_probe(struct i2c_client *client, - const struct i2c_device_id *dev_id) +static int as5835_54x_psu_probe(struct i2c_client *client) { + const struct i2c_device_id *dev_id = i2c_client_get_device_id(client); struct as5835_54x_psu_data *data; int status; diff --git a/packages/platforms/accton/x86-64/as5835-54x/platform-config/r0/src/lib/x86-64-accton-as5835-54x-r0.yml b/packages/platforms/accton/x86-64/as5835-54x/platform-config/r0/src/lib/x86-64-accton-as5835-54x-r0.yml index 08012caaf..ea10d5488 100644 --- a/packages/platforms/accton/x86-64/as5835-54x/platform-config/r0/src/lib/x86-64-accton-as5835-54x-r0.yml +++ b/packages/platforms/accton/x86-64/as5835-54x/platform-config/r0/src/lib/x86-64-accton-as5835-54x-r0.yml @@ -18,7 +18,7 @@ x86-64-accton-as5835-54x-r0: --stop=1 kernel: - <<: *kernel-6-1 + <<: *kernel-6-12 args: >- nopat