Update some more Dell platform modules for 5.10 and Bullseye changes

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
praveen-li · Nov 10, 2021 · 1379ca1 · 1379ca1
1 parent 88d607f
commit 1379ca1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/platform/broadcom/sonic-platform-modules-dell/debian/rules b/platform/broadcom/sonic-platform-modules-dell/debian/rules
@@ -68,7 +68,6 @@ override_dh_auto_build:
  elif [ $$mod = "n3248pxe" ]; then \
  cp $(COMMON_DIR)/ipmihelper.py $(MOD_SRC_DIR)/$${mod}/sonic_platform/ipmihelper.py; \
  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; \
  cd $(MOD_SRC_DIR); \
  fi; \

diff --git a/platform/broadcom/sonic-platform-modules-dell/n3248pxe/modules/dell_n3248pxe_platform.c b/platform/broadcom/sonic-platform-modules-dell/n3248pxe/modules/dell_n3248pxe_platform.c
@@ -1052,7 +1052,7 @@ static int __init cpld_probe(struct platform_device *pdev)
  return -ENODEV;
  }
  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) {
  printk(KERN_WARNING "Fail to create dummy i2c client for addr %d\n", pdata[i].reg_addr);
  goto error;
@@ -1135,7 +1135,7 @@ static int __init dell_n3248pxe_platform_init(void)
  }
 
  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) 
  return PTR_ERR_OR_ZERO(mux_i2c_cli);
 

diff --git a/platform/broadcom/sonic-platform-modules-dell/n3248te/modules/dell_n3248te_platform.c b/platform/broadcom/sonic-platform-modules-dell/n3248te/modules/dell_n3248te_platform.c
@@ -1081,7 +1081,7 @@ static int __init cpld_probe(struct platform_device *pdev)
  return -ENODEV;
  }
  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) {
  printk(KERN_WARNING "Fail to create dummy i2c client for addr %d\n", pdata[i].reg_addr);
  goto error;
@@ -1164,7 +1164,7 @@ static int __init dell_n3248te_platform_init(void)
  }
 
  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)
  return PTR_ERR_OR_ZERO(mux_i2c_cli);
 

diff --git a/platform/broadcom/sonic-platform-modules-dell/s5224f/modules/dell_s5224f_fpga_ocores.c b/platform/broadcom/sonic-platform-modules-dell/s5224f/modules/dell_s5224f_fpga_ocores.c
@@ -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
  * 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]) {
  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_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];
  }