diff options
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/pci.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/platform_gk20a.h | 3 |
2 files changed, 7 insertions, 2 deletions
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[] = { | |||
89 | .hardcode_sw_threshold = true, | 89 | .hardcode_sw_threshold = true, |
90 | .ina3221_dcb_index = 0, | 90 | .ina3221_dcb_index = 0, |
91 | .ina3221_i2c_address = 0x84, | 91 | .ina3221_i2c_address = 0x84, |
92 | .ina3221_i2c_port = 0x2, | ||
92 | }, | 93 | }, |
93 | { /* DEVICE=0x1c36 */ | 94 | { /* DEVICE=0x1c36 */ |
94 | /* ptimer src frequency in hz */ | 95 | /* ptimer src frequency in hz */ |
@@ -123,6 +124,7 @@ static struct gk20a_platform nvgpu_pci_device[] = { | |||
123 | .hardcode_sw_threshold = true, | 124 | .hardcode_sw_threshold = true, |
124 | .ina3221_dcb_index = 0, | 125 | .ina3221_dcb_index = 0, |
125 | .ina3221_i2c_address = 0x84, | 126 | .ina3221_i2c_address = 0x84, |
127 | .ina3221_i2c_port = 0x2, | ||
126 | }, | 128 | }, |
127 | { /* DEVICE=0x1c37 */ | 129 | { /* DEVICE=0x1c37 */ |
128 | /* ptimer src frequency in hz */ | 130 | /* ptimer src frequency in hz */ |
@@ -157,6 +159,7 @@ static struct gk20a_platform nvgpu_pci_device[] = { | |||
157 | .hardcode_sw_threshold = true, | 159 | .hardcode_sw_threshold = true, |
158 | .ina3221_dcb_index = 0, | 160 | .ina3221_dcb_index = 0, |
159 | .ina3221_i2c_address = 0x84, | 161 | .ina3221_i2c_address = 0x84, |
162 | .ina3221_i2c_port = 0x2, | ||
160 | }, | 163 | }, |
161 | { /* DEVICE=0x1c75 */ | 164 | { /* DEVICE=0x1c75 */ |
162 | /* ptimer src frequency in hz */ | 165 | /* ptimer src frequency in hz */ |
@@ -187,10 +190,11 @@ static struct gk20a_platform nvgpu_pci_device[] = { | |||
187 | .ch_wdt_timeout_ms = 7000, | 190 | .ch_wdt_timeout_ms = 7000, |
188 | 191 | ||
189 | .vidmem_is_vidmem = true, | 192 | .vidmem_is_vidmem = true, |
190 | .vbios_min_version = 0x86064700, | 193 | .vbios_min_version = 0x86065600, |
191 | .hardcode_sw_threshold = false, | 194 | .hardcode_sw_threshold = false, |
192 | .ina3221_dcb_index = 1, | 195 | .ina3221_dcb_index = 1, |
193 | .ina3221_i2c_address = 0x80, | 196 | .ina3221_i2c_address = 0x80, |
197 | .ina3221_i2c_port = 0x1, | ||
194 | } | 198 | } |
195 | }; | 199 | }; |
196 | 200 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h index 4208816f..452b868d 100644 --- a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h | |||
@@ -229,9 +229,10 @@ struct gk20a_platform { | |||
229 | */ | 229 | */ |
230 | bool hardcode_sw_threshold; | 230 | bool hardcode_sw_threshold; |
231 | 231 | ||
232 | /* i2c device index and address for INA3221 */ | 232 | /* i2c device index, port and address for INA3221 */ |
233 | u32 ina3221_dcb_index; | 233 | u32 ina3221_dcb_index; |
234 | u32 ina3221_i2c_address; | 234 | u32 ina3221_i2c_address; |
235 | u32 ina3221_i2c_port; | ||
235 | }; | 236 | }; |
236 | 237 | ||
237 | static inline struct gk20a_platform *gk20a_get_platform( | 238 | static inline struct gk20a_platform *gk20a_get_platform( |