From c1f549e5b27e0b86e3ab8e14f47b13aa9997a1d8 Mon Sep 17 00:00:00 2001 From: Thomas Fleury Date: Mon, 24 Apr 2017 09:12:02 -0700 Subject: gpu: nvgpu: I2C port for INA3221 in platform data PG419 board had been reworked to swap I2C_B and I2C_C (in order to solve PL issues). As a result, on this board we now use a different I2C port than on PG418. Remove support for non-reworked boards: VBIOS version must be at least .56 Add I2C port in platform data. Bug 1914023 Change-Id: Ia7940eaa823bb4d21f662491ba1de7c8490ce9f0 Signed-off-by: Thomas Fleury Reviewed-on: http://git-master/r/1467930 (cherry picked from commit cda5fefb456c0edc75c99dedf67a3020424967c1) Reviewed-on: http://git-master/r/1485191 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: svccoveritychecker GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/common/linux/pci.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/common') diff --git a/drivers/gpu/nvgpu/common/linux/pci.c b/drivers/gpu/nvgpu/common/linux/pci.c index 37673f5e..d729d273 100644 --- a/drivers/gpu/nvgpu/common/linux/pci.c +++ b/drivers/gpu/nvgpu/common/linux/pci.c @@ -89,6 +89,7 @@ static struct gk20a_platform nvgpu_pci_device[] = { .hardcode_sw_threshold = true, .ina3221_dcb_index = 0, .ina3221_i2c_address = 0x84, + .ina3221_i2c_port = 0x2, }, { /* DEVICE=0x1c36 */ /* ptimer src frequency in hz */ @@ -123,6 +124,7 @@ static struct gk20a_platform nvgpu_pci_device[] = { .hardcode_sw_threshold = true, .ina3221_dcb_index = 0, .ina3221_i2c_address = 0x84, + .ina3221_i2c_port = 0x2, }, { /* DEVICE=0x1c37 */ /* ptimer src frequency in hz */ @@ -157,6 +159,7 @@ static struct gk20a_platform nvgpu_pci_device[] = { .hardcode_sw_threshold = true, .ina3221_dcb_index = 0, .ina3221_i2c_address = 0x84, + .ina3221_i2c_port = 0x2, }, { /* DEVICE=0x1c75 */ /* ptimer src frequency in hz */ @@ -187,10 +190,11 @@ static struct gk20a_platform nvgpu_pci_device[] = { .ch_wdt_timeout_ms = 7000, .vidmem_is_vidmem = true, - .vbios_min_version = 0x86064700, + .vbios_min_version = 0x86065600, .hardcode_sw_threshold = false, .ina3221_dcb_index = 1, .ina3221_i2c_address = 0x80, + .ina3221_i2c_port = 0x1, } }; -- cgit v1.2.2