From 4739499f07b29282ee1031d08adaa76c238da2a6 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Mon, 27 Oct 2014 09:16:51 +0200 Subject: gpu: nvgpu: Sync gk20a and gm20b headers Synchronize gk20a and gm20b headers. All registers which were added to gk20a are now added to gm20b, and some registers that are unused are removed. Bug 1567274 Change-Id: Ia3b7958c148e495cbff420ee56bb448db0f58680 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/590313 GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/gm20b/hw_therm_gm20b.h | 56 -------------------------------- 1 file changed, 56 deletions(-) (limited to 'drivers/gpu/nvgpu/gm20b/hw_therm_gm20b.h') diff --git a/drivers/gpu/nvgpu/gm20b/hw_therm_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_therm_gm20b.h index 09bd5830..d928d70e 100644 --- a/drivers/gpu/nvgpu/gm20b/hw_therm_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/hw_therm_gm20b.h @@ -66,66 +66,10 @@ static inline u32 therm_evt_ext_therm_2_r(void) { return 0x00020708; } -static inline u32 therm_evt_ba_w0_t1h_r(void) -{ - return 0x00020750; -} static inline u32 therm_weight_1_r(void) { return 0x00020024; } -static inline u32 therm_peakpower_config1_r(u32 i) -{ - return 0x00020154 + i*4; -} -static inline u32 therm_peakpower_config1_window_period_2m_v(void) -{ - return 0x0000000f; -} -static inline u32 therm_peakpower_config1_window_period_2m_f(void) -{ - return 0xf; -} -static inline u32 therm_peakpower_config1_window_en_enabled_f(void) -{ - return 0x80000000; -} -static inline u32 therm_peakpower_config8_r(u32 i) -{ - return 0x000202e8 + i*4; -} -static inline u32 therm_peakpower_config8_ba_sum_shift_s(void) -{ - return 5; -} -static inline u32 therm_peakpower_config8_ba_sum_shift_f(u32 v) -{ - return (v & 0x1f) << 8; -} -static inline u32 therm_peakpower_config8_ba_sum_shift_m(void) -{ - return 0x1f << 8; -} -static inline u32 therm_peakpower_config8_ba_sum_shift_v(u32 r) -{ - return (r >> 8) & 0x1f; -} -static inline u32 therm_peakpower_config2_r(u32 i) -{ - return 0x00020170 + i*4; -} -static inline u32 therm_peakpower_config4_r(u32 i) -{ - return 0x000201c0 + i*4; -} -static inline u32 therm_peakpower_config6_r(u32 i) -{ - return 0x00020270 + i*4; -} -static inline u32 therm_peakpower_config9_r(u32 i) -{ - return 0x000202f4 + i*4; -} static inline u32 therm_config1_r(void) { return 0x00020050; -- cgit v1.2.2