video: tegra: Update headers to NET16 (cl 19087349)
Chao Xu [Fri, 12 Apr 2013 23:43:19 +0000 (16:43 -0700)]
Change-Id: I34c2a865d346435eef9095e8a3afbadcff0d4ce9
Signed-off-by: Chao Xu <cxu@nvidia.com>
Reviewed-on: http://git-master/r/219127
Reviewed-by: Alexander Van Brunt <avanbrunt@nvidia.com>

drivers/video/tegra/host/gk20a/gk20a_gating_reglist.c
drivers/video/tegra/host/gk20a/hw_gr_gk20a.h
drivers/video/tegra/host/gk20a/hw_therm_gk20a.h

index c5ed744..c0379e0 100644 (file)
@@ -66,7 +66,7 @@ const struct gating_desc gk20a_slcg_gr[] = {
        {.addr = 0x00419a7c, .prod = 0x00000000, .disable = 0x0000003e},
        {.addr = 0x00419a84, .prod = 0x00000000, .disable = 0x0000000e},
        {.addr = 0x00419ad0, .prod = 0x00000000, .disable = 0x0000000e},
-       {.addr = 0x0041986c, .prod = 0x00000000, .disable = 0x00fffffe},
+       {.addr = 0x0041986c, .prod = 0x0000dfc0, .disable = 0x00fffffe},
        {.addr = 0x00419cd8, .prod = 0x00000000, .disable = 0x001ffffe},
        {.addr = 0x00419ce0, .prod = 0x00000000, .disable = 0x001ffffe},
        {.addr = 0x00419c74, .prod = 0x00000000, .disable = 0x0000001e},
@@ -75,7 +75,7 @@ const struct gating_desc gk20a_slcg_gr[] = {
        {.addr = 0x00419fe4, .prod = 0x00000000, .disable = 0x0000000e},
        {.addr = 0x00419ff4, .prod = 0x00000000, .disable = 0x00003ffe},
        {.addr = 0x00419ffc, .prod = 0x00000000, .disable = 0x0001fffe},
-       {.addr = 0x0041be2c, .prod = 0x00000000, .disable = 0xfffffffe},
+       {.addr = 0x0041be2c, .prod = 0x020bbfc0, .disable = 0xfffffffe},
        {.addr = 0x0041bfec, .prod = 0x00000000, .disable = 0xfffffffe},
        {.addr = 0x0041bed4, .prod = 0x00000000, .disable = 0xfffffffe},
        {.addr = 0x00408814, .prod = 0x00000000, .disable = 0x0001fffe},
@@ -136,7 +136,7 @@ const struct gating_desc gk20a_blcg_gr[] = {
        {.addr = 0x00419a78, .prod = 0x00004042, .disable = 0x00000000},
        {.addr = 0x00419a80, .prod = 0x00004042, .disable = 0x00000000},
        {.addr = 0x00419acc, .prod = 0x00004047, .disable = 0x00000000},
-       {.addr = 0x00419868, .prod = 0x00000042, .disable = 0x00000000},
+       {.addr = 0x00419868, .prod = 0x00000043, .disable = 0x00000000},
        {.addr = 0x00419cd4, .prod = 0x00004042, .disable = 0x00000000},
        {.addr = 0x00419cdc, .prod = 0x00004042, .disable = 0x00000000},
        {.addr = 0x00419c70, .prod = 0x00004045, .disable = 0x00000000},
index 6eb327e..226bc46 100644 (file)
@@ -3524,11 +3524,11 @@ static inline u32 gr_fe_go_idle_timeout_count_init_f(void)
 }
 static inline u32 gr_fe_go_idle_timeout_count__prod_v(void)
 {
-       return 0x00000400;
+       return 0x00000800;
 }
 static inline u32 gr_fe_go_idle_timeout_count__prod_f(void)
 {
-       return 0x400;
+       return 0x800;
 }
 static inline u32 gr_fe_go_idle_timeout_count_disabled_v(void)
 {
@@ -25154,6 +25154,46 @@ static inline u32 gr_gpcs_tpcs_pes_vsc_vpc_debug_disable_nic_cg_fix_init_f(void)
 {
        return 0x0;
 }
+static inline u32 gr_gpcs_tpcs_pes_vsc_vpc_debug_pe2mpcdone_order_disable_s(void)
+{
+       return 1;
+}
+static inline u32 gr_gpcs_tpcs_pes_vsc_vpc_debug_pe2mpcdone_order_disable_f(u32 v)
+{
+       return (v & 0x1) << 25;
+}
+static inline u32 gr_gpcs_tpcs_pes_vsc_vpc_debug_pe2mpcdone_order_disable_m(void)
+{
+       return 0x1 << 25;
+}
+static inline u32 gr_gpcs_tpcs_pes_vsc_vpc_debug_pe2mpcdone_order_disable_v(u32 r)
+{
+       return (r >> 25) & 0x1;
+}
+static inline u32 gr_gpcs_tpcs_pes_vsc_vpc_debug_pe2mpcdone_order_disable_disabled_v(void)
+{
+       return 0x00000001;
+}
+static inline u32 gr_gpcs_tpcs_pes_vsc_vpc_debug_pe2mpcdone_order_disable_disabled_f(void)
+{
+       return 0x2000000;
+}
+static inline u32 gr_gpcs_tpcs_pes_vsc_vpc_debug_pe2mpcdone_order_disable_enabled_v(void)
+{
+       return 0x00000000;
+}
+static inline u32 gr_gpcs_tpcs_pes_vsc_vpc_debug_pe2mpcdone_order_disable_enabled_f(void)
+{
+       return 0x0;
+}
+static inline u32 gr_gpcs_tpcs_pes_vsc_vpc_debug_pe2mpcdone_order_disable_init_v(void)
+{
+       return 0x00000000;
+}
+static inline u32 gr_gpcs_tpcs_pes_vsc_vpc_debug_pe2mpcdone_order_disable_init_f(void)
+{
+       return 0x0;
+}
 static inline u32 gr_ppcs_wwdx_map_gpc_map0_r(void)
 {
        return 0x0041bf00;
index a7f7e0b..19c4b0a 100644 (file)
@@ -3036,11 +3036,11 @@ static inline u32 therm_gate_ctrl_eng_idle_filt_exp_max_f(void)
 }
 static inline u32 therm_gate_ctrl_eng_idle_filt_exp__prod_v(void)
 {
-       return 0x00000000;
+       return 0x00000002;
 }
 static inline u32 therm_gate_ctrl_eng_idle_filt_exp__prod_f(void)
 {
-       return 0x0;
+       return 0x200;
 }
 static inline u32 therm_gate_ctrl_eng_idle_filt_mant_s(void)
 {
@@ -3076,11 +3076,11 @@ static inline u32 therm_gate_ctrl_eng_idle_filt_mant_max_f(void)
 }
 static inline u32 therm_gate_ctrl_eng_idle_filt_mant__prod_v(void)
 {
-       return 0x00000000;
+       return 0x00000001;
 }
 static inline u32 therm_gate_ctrl_eng_idle_filt_mant__prod_f(void)
 {
-       return 0x0;
+       return 0x2000;
 }
 static inline u32 therm_gate_ctrl_eng_delay_before_s(void)
 {