matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update some more Dell platform modules for 5.10 and Bullseye changes

Browse Source 
Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
This commit is contained in:
Saikrishna Arcot 2021-10-28 14:07:26 -07:00 committed by Saikrishna Arcot
parent 88d607f209
commit 1379ca14cc
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platform/broadcom/sonic-platform-modules-dell/debian/rules
View File

@ -68,7 +68,6 @@ override_dh_auto_build:
elif [ $$mod = "n3248pxe" ]; then \ elif [ $$mod = "n3248pxe" ]; then \
cp $(COMMON_DIR)/ipmihelper.py $(MOD_SRC_DIR)/$${mod}/sonic_platform/ipmihelper.py; \ cp $(COMMON_DIR)/ipmihelper.py $(MOD_SRC_DIR)/$${mod}/sonic_platform/ipmihelper.py; \
cd $(MOD_SRC_DIR)/$${mod}; \ cd $(MOD_SRC_DIR)/$${mod}; \
python2.7 setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}/modules; \
python3 setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}/modules; \ python3 setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}/modules; \
cd $(MOD_SRC_DIR); \ cd $(MOD_SRC_DIR); \
fi; \ fi; \

4
platform/broadcom/sonic-platform-modules-dell/n3248pxe/modules/dell_n3248pxe_platform.c
View File

@ -1052,7 +1052,7 @@ static int __init cpld_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
} }
for (i = 0; i < CPLD_DEVICE_NUM; i++) { for (i = 0; i < CPLD_DEVICE_NUM; i++) {
pdata[i].client = i2c_new_dummy(parent, pdata[i].reg_addr); pdata[i].client = i2c_new_dummy_device(parent, pdata[i].reg_addr);
if (!pdata[i].client) { if (!pdata[i].client) {
printk(KERN_WARNING "Fail to create dummy i2c client for addr %d\n", pdata[i].reg_addr); printk(KERN_WARNING "Fail to create dummy i2c client for addr %d\n", pdata[i].reg_addr);
goto error; goto error;
@ -1135,7 +1135,7 @@ static int __init dell_n3248pxe_platform_init(void)
} }
sys_i2c_adap = i2c_get_adapter(sys_i2c_bus); sys_i2c_adap = i2c_get_adapter(sys_i2c_bus);
mux_i2c_cli = i2c_new_device(sys_i2c_adap, sys_board_mux); mux_i2c_cli = i2c_new_client_device(sys_i2c_adap, sys_board_mux);
if (!mux_i2c_cli) if (!mux_i2c_cli)
return PTR_ERR_OR_ZERO(mux_i2c_cli); return PTR_ERR_OR_ZERO(mux_i2c_cli);

4
platform/broadcom/sonic-platform-modules-dell/n3248te/modules/dell_n3248te_platform.c
View File

@ -1081,7 +1081,7 @@ static int __init cpld_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
} }
for (i = 0; i < CPLD_DEVICE_NUM; i++) { for (i = 0; i < CPLD_DEVICE_NUM; i++) {
pdata[i].client = i2c_new_dummy(parent, pdata[i].reg_addr); pdata[i].client = i2c_new_dummy_device(parent, pdata[i].reg_addr);
if (!pdata[i].client) { if (!pdata[i].client) {
printk(KERN_WARNING "Fail to create dummy i2c client for addr %d\n", pdata[i].reg_addr); printk(KERN_WARNING "Fail to create dummy i2c client for addr %d\n", pdata[i].reg_addr);
goto error; goto error;
@ -1164,7 +1164,7 @@ static int __init dell_n3248te_platform_init(void)
} }
sys_i2c_adap = i2c_get_adapter(sys_i2c_bus); sys_i2c_adap = i2c_get_adapter(sys_i2c_bus);
mux_i2c_cli = i2c_new_device(sys_i2c_adap, sys_board_mux); mux_i2c_cli = i2c_new_client_device(sys_i2c_adap, sys_board_mux);
if (!mux_i2c_cli) if (!mux_i2c_cli)
return PTR_ERR_OR_ZERO(mux_i2c_cli); return PTR_ERR_OR_ZERO(mux_i2c_cli);

4
platform/broadcom/sonic-platform-modules-dell/s5224f/modules/dell_s5224f_fpga_ocores.c
View File

@ -1047,7 +1047,7 @@ static int map_bars(struct fpgapci_dev *fpgapci, struct pci_dev *dev)
/* map the device memory or IO region into kernel virtual /* map the device memory or IO region into kernel virtual
* address space */ * address space */
fpgapci->bar[i] = ioremap_nocache (bar_start + FPGALOGIC_I2C_BASE, I2C_PCI_MAX_BUS * FPGALOGIC_CH_OFFSET); fpgapci->bar[i] = ioremap (bar_start + FPGALOGIC_I2C_BASE, I2C_PCI_MAX_BUS * FPGALOGIC_CH_OFFSET);
if (!fpgapci->bar[i]) { if (!fpgapci->bar[i]) {
PRINT ( "Could not map BAR #%d.\n", i); PRINT ( "Could not map BAR #%d.\n", i);
@ -1061,7 +1061,7 @@ static int map_bars(struct fpgapci_dev *fpgapci, struct pci_dev *dev)
{ {
fpga_phys_addr = bar_start; fpga_phys_addr = bar_start;
fpga_ctl_addr = ioremap_nocache (bar_start, FPGA_CTL_REG_SIZE); fpga_ctl_addr = ioremap (bar_start, FPGA_CTL_REG_SIZE);
fpga_base_addr = fpgapci->bar[i]; fpga_base_addr = fpgapci->bar[i];
} }