Skip to content

[AS7515-24X] Upgrade kernel from 6.1 to 6.12 #119

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

Open
vincentchiang-ec wants to merge 1 commit into
base: support_linux_6.12
Choose a base branch
from
Open

[AS7515-24X] Upgrade kernel from 6.1 to 6.12 #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 packages/platforms/accton/x86-64/as7515-24x/modules/PKG.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as7515-24x ARCH=amd64 KERNELS="onl-kernel-6.1-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as7515-24x ARCH=amd64 KERNELS="onl-kernel-6.12-lts-x86-64-all:amd64"
2 changes: 1 addition & 1 deletion packages/platforms/accton/x86-64/as7515-24x/modules/builds/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-as7515-24x
Expand Down
4 changes: 2 additions & 2 deletions ...ges/platforms/accton/x86-64/as7515-24x/modules/builds/src/x86-64-accton-as7515-24x-cpld.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,9 +321,9 @@ static void as7515_24x_cpld_remove_client(struct i2c_client *client)
/*
* I2C init/probing/exit functions
*/
static int as7515_24x_cpld_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int as7515_24x_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 as7515_24x_cpld_data *data;
int ret = -ENODEV;
Expand Down
3 changes: 1 addition & 2 deletions ...ages/platforms/accton/x86-64/as7515-24x/modules/builds/src/x86-64-accton-as7515-24x-fan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,8 +613,7 @@ static struct as7515_24x_fan_data *as7515_fan_update_device(struct device *dev)
return data;
}

static int as7515_24x_fan_probe(struct i2c_client *client,
const struct i2c_device_id *dev_id)
static int as7515_24x_fan_probe(struct i2c_client *client)
{
struct as7515_24x_fan_data *data;
int status;
Expand Down
4 changes: 1 addition & 3 deletions ...ges/platforms/accton/x86-64/as7515-24x/modules/builds/src/x86-64-accton-as7515-24x-fpga.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ static int as7515_24x_pcie_fpga_stat_probe(struct platform_device *pdev)
return status;
}

static int as7515_24x_pcie_fpga_stat_remove(struct platform_device *pdev)
static void as7515_24x_pcie_fpga_stat_remove(struct platform_device *pdev)
{
struct as7515_24x_fpga_data *fpga_ctl = platform_get_drvdata(pdev);

Expand All @@ -276,8 +276,6 @@ static int as7515_24x_pcie_fpga_stat_remove(struct platform_device *pdev)
release_mem_region(fpga_ctl->pci_fpga_dev.data_region0, REGION_LEN);
pci_disable_device(fpga_ctl->pci_fpga_dev.pci_dev);
}

return 0;
}

static struct platform_driver pcie_fpga_port_stat_driver = {
Expand Down
6 changes: 2 additions & 4 deletions ...ges/platforms/accton/x86-64/as7515-24x/modules/builds/src/x86-64-accton-as7515-24x-leds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ static ssize_t show_led(struct device *dev, struct device_attribute *attr,
extern int as7515_24x_fpga_read(u8 reg);
extern int as7515_24x_fpga_write(u8 reg, u8 value);
static int as7515_24x_led_probe(struct platform_device *pdev);
static int as7515_24x_led_remove(struct platform_device *pdev);
static void as7515_24x_led_remove(struct platform_device *pdev);

enum led_type {
LED_TYPE_FAN,
Expand Down Expand Up @@ -406,7 +406,7 @@ static int as7515_24x_led_probe(struct platform_device *pdev)
return status;
}

static int as7515_24x_led_remove(struct platform_device *pdev)
static void as7515_24x_led_remove(struct platform_device *pdev)
{
struct as7515_24x_led_data *data = platform_get_drvdata(pdev);
int i = 0;
Expand All @@ -416,8 +416,6 @@ static int as7515_24x_led_remove(struct platform_device *pdev)
}

kfree(data);

return 0;
}

static struct platform_device_id as7515_24x_led_id[] = {
Expand Down
6 changes: 3 additions & 3 deletions ...ages/platforms/accton/x86-64/as7515-24x/modules/builds/src/x86-64-accton-as7515-24x-mux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@ static void as7515_24x_mux_cleanup(struct i2c_mux_core *muxc)
/*
* I2C init/probing/exit functions
*/
static int as7515_24x_mux_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int as7515_24x_mux_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 device *dev = &client->dev;
struct as7515_24x_mux_data *data;
Expand All @@ -184,7 +184,7 @@ static int as7515_24x_mux_probe(struct i2c_client *client,

/* Now create an adapter for each channel */
for (i = 0; i < chips[data->type].nchans; i++) {
ret = i2c_mux_add_adapter(muxc, 0, i, 0);
ret = i2c_mux_add_adapter(muxc, 0, i);
if (ret)
goto exit_mux;
}
Expand Down
4 changes: 2 additions & 2 deletions ...ages/platforms/accton/x86-64/as7515-24x/modules/builds/src/x86-64-accton-as7515-24x-psu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,9 @@ static const struct hwmon_chip_info as7515_24x_psu_chip_info = {
.info = as7515_24x_psu_info,
};

static int as7515_24x_psu_probe(struct i2c_client *client,
const struct i2c_device_id *dev_id)
static int as7515_24x_psu_probe(struct i2c_client *client)
{
const struct i2c_device_id *dev_id = i2c_client_get_device_id(client);
struct as7515_24x_psu_data *data;
int status;

Expand Down
3 changes: 1 addition & 2 deletions ...ages/platforms/accton/x86-64/as7515-24x/modules/builds/src/x86-64-accton-as7515-24x-sfp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ static int as7515_sfp_probe(struct platform_device *pdev)
}


static int as7515_sfp_remove(struct platform_device *pdev)
static void as7515_sfp_remove(struct platform_device *pdev)
{
struct as7515_sfp_data *data = platform_get_drvdata(pdev);
int i = 0;
Expand All @@ -474,7 +474,6 @@ static int as7515_sfp_remove(struct platform_device *pdev)
}

kfree(data);
return 0;
}

static const struct platform_device_id as7515_sfp_id[] = {
Expand Down
2 changes: 1 addition & 1 deletion ...forms/accton/x86-64/as7515-24x/platform-config/r0/src/lib/x86-64-accton-as7515-24x-r0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ x86-64-accton-as7515-24x-r0:
--stop=1

kernel:
<<: *kernel-6-1
<<: *kernel-6-12

args: >-
console=ttyS0,115200n8
Expand Down