drm/amdgpu: remove eeprom from the smu i2c handlers

The driver uses it for EEPROM access, but it's just an i2c bus.

Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c b/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c
index f3d0324c4a7f6eaf1ad67481a46b47afc8591ae0..d55bf64770c48581491ce3153ecc21618f65d6cc 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c
+++ b/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c
@@ -536,12 +536,12 @@ Fail:
        return false;
 }
 
-/***************************** EEPROM I2C GLUE ****************************/
+/***************************** I2C GLUE ****************************/
 
-static uint32_t smu_v11_0_i2c_eeprom_read_data(struct i2c_adapter *control,
-                                              uint8_t address,
-                                              uint8_t *data,
-                                              uint32_t numbytes)
+static uint32_t smu_v11_0_i2c_read_data(struct i2c_adapter *control,
+                                       uint8_t address,
+                                       uint8_t *data,
+                                       uint32_t numbytes)
 {
        uint32_t  ret = 0;
 
@@ -561,10 +561,10 @@ Fail:
        return ret;
 }
 
-static uint32_t smu_v11_0_i2c_eeprom_write_data(struct i2c_adapter *control,
-                                               uint8_t address,
-                                               uint8_t *data,
-                                               uint32_t numbytes)
+static uint32_t smu_v11_0_i2c_write_data(struct i2c_adapter *control,
+                                        uint8_t address,
+                                        uint8_t *data,
+                                        uint32_t numbytes)
 {
        uint32_t  ret;
 
@@ -624,7 +624,7 @@ static const struct i2c_lock_operations smu_v11_0_i2c_i2c_lock_ops = {
        .unlock_bus = unlock_bus,
 };
 
-static int smu_v11_0_i2c_eeprom_i2c_xfer(struct i2c_adapter *i2c_adap,
+static int smu_v11_0_i2c_xfer(struct i2c_adapter *i2c_adap,
                              struct i2c_msg *msgs, int num)
 {
        int i, ret;
@@ -639,13 +639,13 @@ static int smu_v11_0_i2c_eeprom_i2c_xfer(struct i2c_adapter *i2c_adap,
 
        for (i = 0; i < num; i++) {
                if (msgs[i].flags & I2C_M_RD)
-                       ret = smu_v11_0_i2c_eeprom_read_data(i2c_adap,
-                                                       (uint8_t)msgs[i].addr,
-                                                       msgs[i].buf, msgs[i].len);
+                       ret = smu_v11_0_i2c_read_data(i2c_adap,
+                                                     (uint8_t)msgs[i].addr,
+                                                     msgs[i].buf, msgs[i].len);
                else
-                       ret = smu_v11_0_i2c_eeprom_write_data(i2c_adap,
-                                                        (uint8_t)msgs[i].addr,
-                                                        msgs[i].buf, msgs[i].len);
+                       ret = smu_v11_0_i2c_write_data(i2c_adap,
+                                                      (uint8_t)msgs[i].addr,
+                                                      msgs[i].buf, msgs[i].len);
 
                if (ret != I2C_OK) {
                        num = -EIO;
@@ -657,18 +657,18 @@ static int smu_v11_0_i2c_eeprom_i2c_xfer(struct i2c_adapter *i2c_adap,
        return num;
 }
 
-static u32 smu_v11_0_i2c_eeprom_i2c_func(struct i2c_adapter *adap)
+static u32 smu_v11_0_i2c_func(struct i2c_adapter *adap)
 {
        return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
 }
 
 
-static const struct i2c_algorithm smu_v11_0_i2c_eeprom_i2c_algo = {
-       .master_xfer = smu_v11_0_i2c_eeprom_i2c_xfer,
-       .functionality = smu_v11_0_i2c_eeprom_i2c_func,
+static const struct i2c_algorithm smu_v11_0_i2c_algo = {
+       .master_xfer = smu_v11_0_i2c_xfer,
+       .functionality = smu_v11_0_i2c_func,
 };
 
-int smu_v11_0_i2c_eeprom_control_init(struct i2c_adapter *control)
+int smu_v11_0_i2c_control_init(struct i2c_adapter *control)
 {
        struct amdgpu_device *adev = to_amdgpu_device(control);
        int res;
@@ -676,8 +676,8 @@ int smu_v11_0_i2c_eeprom_control_init(struct i2c_adapter *control)
        control->owner = THIS_MODULE;
        control->class = I2C_CLASS_SPD;
        control->dev.parent = &adev->pdev->dev;
-       control->algo = &smu_v11_0_i2c_eeprom_i2c_algo;
-       snprintf(control->name, sizeof(control->name), "AMDGPU EEPROM");
+       control->algo = &smu_v11_0_i2c_algo;
+       snprintf(control->name, sizeof(control->name), "AMDGPU SMU");
        control->lock_ops = &smu_v11_0_i2c_i2c_lock_ops;
 
        res = i2c_add_adapter(control);
@@ -687,7 +687,7 @@ int smu_v11_0_i2c_eeprom_control_init(struct i2c_adapter *control)
        return res;
 }
 
-void smu_v11_0_i2c_eeprom_control_fini(struct i2c_adapter *control)
+void smu_v11_0_i2c_control_fini(struct i2c_adapter *control)
 {
        i2c_del_adapter(control);
 }
@@ -715,9 +715,9 @@ bool smu_v11_0_i2c_test_bus(struct i2c_adapter *control)
        smu_v11_0_i2c_init(control);
 
        /* Write 0xde to address 0x0000 on the EEPROM */
-       ret = smu_v11_0_i2c_eeprom_write_data(control, I2C_TARGET_ADDR, data, 6);
+       ret = smu_v11_0_i2c_write_data(control, I2C_TARGET_ADDR, data, 6);
 
-       ret = smu_v11_0_i2c_eeprom_read_data(control, I2C_TARGET_ADDR, data, 6);
+       ret = smu_v11_0_i2c_read_data(control, I2C_TARGET_ADDR, data, 6);
 
        smu_v11_0_i2c_fini(control);
 

diff --git a/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.h b/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.h
index 973f28d68e702fa68f084eb949c8e2caf26b8916..44467c05f6421da65d0b4d7c94a9e3de20f9a3da 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.h
+++ b/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.h
@@ -28,7 +28,7 @@
 
 struct i2c_adapter;
 
-int smu_v11_0_i2c_eeprom_control_init(struct i2c_adapter *control);
-void smu_v11_0_i2c_eeprom_control_fini(struct i2c_adapter *control);
+int smu_v11_0_i2c_control_init(struct i2c_adapter *control);
+void smu_v11_0_i2c_control_fini(struct i2c_adapter *control);
 
 #endif

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c
index c2e0fbbccf56a33bf6b5c6bd88ab8e4fe611fb33..d1b7955bb4c714006a66d9ed02e57b595366c4e2 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c
@@ -523,7 +523,7 @@ static int vega20_smu_init(struct pp_hwmgr *hwmgr)
        priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].size = sizeof(DpmActivityMonitorCoeffInt_t);
 
        if (adev->psp.ras.ras) {
-               ret = smu_v11_0_i2c_eeprom_control_init(&adev->pm.smu_i2c);
+               ret = smu_v11_0_i2c_control_init(&adev->pm.smu_i2c);
                if (ret)
                        goto err4;
        }
@@ -563,7 +563,7 @@ static int vega20_smu_fini(struct pp_hwmgr *hwmgr)
        struct amdgpu_device *adev = hwmgr->adev;
 
        if (adev->psp.ras.ras)
-               smu_v11_0_i2c_eeprom_control_fini(&adev->pm.smu_i2c);
+               smu_v11_0_i2c_control_fini(&adev->pm.smu_i2c);
 
        if (priv) {
                amdgpu_bo_free_kernel(&priv->smu_tables.entry[TABLE_PPTABLE].handle,