dell trixie changes (sonic-net#36)

Author: rohinikumart

platform/broadcom/sonic-platform-modules-dell/common/dell_fpga_ocores.c

@@ -678,6 +678,11 @@ static int fpgai2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
     int ret;
     unsigned long timeout = jiffies + msecs_to_jiffies(1000);
 
+    if (!i2c) {
+        pr_err("fpgai2c_xfer: adapter data is NULL\n");
+        return -ENODEV;
+    }
+
     i2c->msg = msgs;
     i2c->pos = 0;
     i2c->nmsgs = num;
@@ -923,13 +928,13 @@ static int i2c_pci_init (struct fpgapci_dev *fpgapci)
 		/* /dev/i2c-600 ~ /dev/i2c-615  for FPGA LOGIC I2C channel  controller 1-7  */
 		i2c_pci_adap[i].nr = i+600;
 		sprintf( i2c_pci_adap[ i ].name, "i2c-pci-%d", i );
+		i2c_set_adapdata(&i2c_pci_adap[i], &fpgalogic_i2c[i]);
 		/* Add the bus via the algorithm code */
 		if( i2c_pci_add_bus( &i2c_pci_adap[ i ] ) != 0 )
 		{
 			PRINT("Cannot add bus %d to algorithm layer\n", i );
 			return( -ENODEV );
 		}
-		i2c_set_adapdata(&i2c_pci_adap[i], &fpgalogic_i2c[i]);
 
 		PRINT( "Registered bus id: %s\n", kobject_name(&i2c_pci_adap[ i ].dev.kobj));
 	}

platform/broadcom/sonic-platform-modules-dell/e3224f/scripts/mux_controller.sh

@@ -18,10 +18,10 @@ init_devnum() {
 init_devnum
 while [ 1 ]
 do
-    if [ ! -f /sys/class/i2c-adapter/i2c-${devnum}/${devnum}-0071/idle_state ]; then
+    if [ ! -f /sys/bus/i2c/devices/i2c-${devnum}/${devnum}-0071/idle_state ]; then
         sleep 1
         continue
     fi
-    echo -2 > /sys/class/i2c-adapter/i2c-${devnum}/${devnum}-0071/idle_state
+    echo -2 > /sys/bus/i2c/devices/i2c-${devnum}/${devnum}-0071/idle_state
     break
 done

platform/broadcom/sonic-platform-modules-dell/e3224f/sonic_platform/chassis.py

@@ -102,7 +102,7 @@ def __init__(self):
         self.PORTS_IN_BLOCK = (self.PORT_END + 1)
         self.SFP_PORT_START = 1
         self._sfp_port = range(self.SFP_PORT_START, self.PORTS_IN_BLOCK)
-        eeprom_base = "/sys/class/i2c-adapter/i2c-{0}/{0}-0050/eeprom"
+        eeprom_base = "/sys/bus/i2c/devices/i2c-{0}/{0}-0050/eeprom"
         for index in range(self.PORT_START, self.PORTS_IN_BLOCK):
             eeprom_path = ''
             if index in self._sfp_port:

platform/broadcom/sonic-platform-modules-dell/e3224f/sonic_platform/eeprom.py

@@ -19,7 +19,7 @@ class Eeprom(eeprom_tlvinfo.TlvInfoDecoder):
 
     def __init__(self):
         self.eeprom_path = None
-        f = '/sys/class/i2c-adapter/i2c-2/2-0050/eeprom'
+        f = '/sys/bus/i2c/devices/i2c-2/2-0050/eeprom'
         if not os.path.exists(f):
             return
         self.eeprom_path = f

platform/broadcom/sonic-platform-modules-dell/e3224f/sonic_platform/sfp.py

@@ -136,9 +136,9 @@ def reinit_sfp_driver(self):
         """
         Changes the driver based on media type detected
         """
-        del_sfp_path = "/sys/class/i2c-adapter/i2c-{0}/delete_device".format(self._port_to_i2c_mapping[self.index])
-        new_sfp_path =    "/sys/class/i2c-adapter/i2c-{0}/new_device".format(self._port_to_i2c_mapping[self.index])
-        driver_path  = "/sys/class/i2c-adapter/i2c-{0}/{0}-0050/name".format(self._port_to_i2c_mapping[self.index])
+        del_sfp_path = "/sys/bus/i2c/devices/i2c-{0}/delete_device".format(self._port_to_i2c_mapping[self.index])
+        new_sfp_path =    "/sys/bus/i2c/devices/i2c-{0}/new_device".format(self._port_to_i2c_mapping[self.index])
+        driver_path  = "/sys/bus/i2c/devices/i2c-{0}/{0}-0050/name".format(self._port_to_i2c_mapping[self.index])
 
         if not os.path.isfile(driver_path):
             print(driver_path, "does not exist")

platform/broadcom/sonic-platform-modules-dell/n3248pxe/scripts/n3248pxe_platform.sh

@@ -122,7 +122,7 @@ if [[ "$1" == "init" ]]; then
    echo 0xf0 > /sys/devices/platform/dell-n3248pxe-cpld.0/sfp_txdis
    install_python_api_package
    platform_firmware_versions
-   echo -2 > /sys/class/i2c-adapter/i2c-0/0-0071/idle_state
+   echo -2 > /sys/bus/i2c/devices/i2c-0/0-0071/idle_state
 elif [[ "$1" == "deinit" ]]; then
     switch_board_sfp "delete_device"
     sysdevices "delete_device"

platform/broadcom/sonic-platform-modules-dell/n3248pxe/sonic_platform/chassis.py

@@ -72,7 +72,7 @@ def __init__(self):
         self.PORTS_IN_BLOCK = (self.PORT_END + 1)
         self.SFP_PORT_START = 49
         self._sfp_port = range(self.SFP_PORT_START, self.PORTS_IN_BLOCK)
-        eeprom_base = "/sys/class/i2c-adapter/i2c-{0}/{0}-0050/eeprom"
+        eeprom_base = "/sys/bus/i2c/devices/i2c-{0}/{0}-0050/eeprom"
         for index in range(self.PORT_START, self.PORTS_IN_BLOCK):
             eeprom_path = ''
             if index in self._sfp_port:

platform/broadcom/sonic-platform-modules-dell/n3248pxe/sonic_platform/eeprom.py

@@ -20,7 +20,7 @@ class Eeprom(eeprom_tlvinfo.TlvInfoDecoder):
 
     def __init__(self):
         self.eeprom_path = None
-        f = '/sys/class/i2c-adapter/i2c-2/2-0050/eeprom'
+        f = '/sys/bus/i2c/devices/i2c-2/2-0050/eeprom'
         if not os.path.exists(f):
             return
         self.eeprom_path = f

platform/broadcom/sonic-platform-modules-dell/n3248te/scripts/n3248te_platform.sh

@@ -126,7 +126,7 @@ if [[ "$1" == "init" ]]; then
    echo 0xf0 > /sys/devices/platform/dell-n3248te-cpld.0/sfp_txdis
    install_python_api_package
    platform_firmware_versions
-   echo -2 > /sys/class/i2c-adapter/i2c-0/0-0071/idle_state
+   echo -2 > /sys/bus/i2c/devices/i2c-0/0-0071/idle_state
 elif [[ "$1" == "deinit" ]]; then
     switch_board_sfp "delete_device"
     sysdevices "delete_device"

platform/broadcom/sonic-platform-modules-dell/n3248te/sonic_platform/chassis.py

@@ -77,7 +77,7 @@ def __init__(self):
         self.PORTS_IN_BLOCK = (self.PORT_END + 1)
         self.SFP_PORT_START = 49
         self._sfp_port = range(self.SFP_PORT_START, self.PORTS_IN_BLOCK)
-        eeprom_base = "/sys/class/i2c-adapter/i2c-{0}/{0}-0050/eeprom"
+        eeprom_base = "/sys/bus/i2c/devices/i2c-{0}/{0}-0050/eeprom"
         for index in range(self.PORT_START, self.PORTS_IN_BLOCK):
             eeprom_path = ''
             if index in self._sfp_port: