mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
mako: update board files to jb_2.5
Signed-off-by: Iliyan Malchev <malchev@google.com>
This commit is contained in:
Iliyan Malchev
parent
5b23668c50
commit
31c05facd9
3 changed files with 82 additions and 45 deletions
|
|
@ -411,6 +411,16 @@ struct msm_panel_common_pdata {
|
|||
struct msm_bus_scale_pdata *mdp_bus_scale_table;
|
||||
#endif
|
||||
int mdp_rev;
|
||||
void *power_on_set_1;
|
||||
void *power_on_set_2;
|
||||
void *power_on_set_3;
|
||||
ssize_t power_on_set_size_1;
|
||||
ssize_t power_on_set_size_2;
|
||||
ssize_t power_on_set_size_3;
|
||||
void *power_off_set_1;
|
||||
void *power_off_set_2;
|
||||
ssize_t power_off_set_size_1;
|
||||
ssize_t power_off_set_size_2;
|
||||
u32 ov0_wb_size; /* overlay0 writeback size */
|
||||
u32 ov1_wb_size; /* overlay1 writeback size */
|
||||
u32 mem_hid;
|
||||
|
|
@ -418,6 +428,8 @@ struct msm_panel_common_pdata {
|
|||
u32 splash_screen_addr;
|
||||
u32 splash_screen_size;
|
||||
char mdp_iommu_split_domain;
|
||||
void (*bl_pwm_disable)(void);
|
||||
int (*bl_on_status)(void);
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -496,6 +508,7 @@ struct msm_fb_platform_data {
|
|||
int (*allow_set_offset)(void);
|
||||
char prim_panel_name[PANEL_NAME_MAX_LEN];
|
||||
char ext_panel_name[PANEL_NAME_MAX_LEN];
|
||||
int (*update_lcdc_lut)(void);
|
||||
};
|
||||
|
||||
struct msm_hdmi_platform_data {
|
||||
|
|
|
|||
|
|
@ -25,26 +25,51 @@
|
|||
|
||||
#ifdef CONFIG_MSM_DCVS
|
||||
static struct msm_dcvs_freq_entry grp3d_freq[] = {
|
||||
{0, 0, 333932},
|
||||
{0, 0, 497532},
|
||||
{0, 0, 707610},
|
||||
{0, 0, 844545},
|
||||
{0, 900, 0, 0, 0},
|
||||
{0, 950, 0, 0, 0},
|
||||
{0, 950, 0, 0, 0},
|
||||
{0, 1200, 1, 100, 100},
|
||||
};
|
||||
|
||||
static struct msm_dcvs_core_info grp3d_core_info = {
|
||||
.freq_tbl = &grp3d_freq[0],
|
||||
.core_param = {
|
||||
.max_time_us = 100000,
|
||||
.num_freq = ARRAY_SIZE(grp3d_freq),
|
||||
.freq_tbl = &grp3d_freq[0],
|
||||
.num_cores = 1,
|
||||
.sensors = (int[]){0},
|
||||
.thermal_poll_ms = 60000,
|
||||
.core_param = {
|
||||
.core_type = MSM_DCVS_CORE_TYPE_GPU,
|
||||
},
|
||||
.algo_param = {
|
||||
.slack_time_us = 39000,
|
||||
.disable_pc_threshold = 86000,
|
||||
.ss_window_size = 1000000,
|
||||
.ss_util_pct = 95,
|
||||
.em_max_util_pct = 97,
|
||||
.ss_iobusy_conv = 100,
|
||||
.algo_param = {
|
||||
.disable_pc_threshold = 0,
|
||||
.em_win_size_min_us = 100000,
|
||||
.em_win_size_max_us = 300000,
|
||||
.em_max_util_pct = 97,
|
||||
.group_id = 0,
|
||||
.max_freq_chg_time_us = 100000,
|
||||
.slack_mode_dynamic = 0,
|
||||
.slack_time_min_us = 39000,
|
||||
.slack_time_max_us = 39000,
|
||||
.ss_win_size_min_us = 1000000,
|
||||
.ss_win_size_max_us = 1000000,
|
||||
.ss_util_pct = 95,
|
||||
.ss_no_corr_below_freq = 0,
|
||||
},
|
||||
|
||||
.energy_coeffs = {
|
||||
.leakage_coeff_a = -17720,
|
||||
.leakage_coeff_b = 37,
|
||||
.leakage_coeff_c = 3329,
|
||||
.leakage_coeff_d = -277,
|
||||
|
||||
.active_coeff_a = 2492,
|
||||
.active_coeff_b = 0,
|
||||
.active_coeff_c = 0
|
||||
},
|
||||
|
||||
.power_param = {
|
||||
.current_temp = 25,
|
||||
.num_freq = ARRAY_SIZE(grp3d_freq),
|
||||
}
|
||||
};
|
||||
#endif /* CONFIG_MSM_DCVS */
|
||||
|
||||
|
|
@ -202,7 +227,7 @@ static struct kgsl_device_platform_data kgsl_3d0_pdata = {
|
|||
.io_fraction = 0,
|
||||
},
|
||||
{
|
||||
.gpu_freq = 325000000,
|
||||
.gpu_freq = 320000000,
|
||||
.bus_freq = 3,
|
||||
.io_fraction = 33,
|
||||
},
|
||||
|
|
@ -252,11 +277,17 @@ void __init apq8064_init_gpu(void)
|
|||
{
|
||||
unsigned int version = socinfo_get_version();
|
||||
|
||||
if ((SOCINFO_VERSION_MAJOR(version) == 1) &&
|
||||
(SOCINFO_VERSION_MINOR(version) == 1))
|
||||
kgsl_3d0_pdata.chipid = ADRENO_CHIPID(3, 2, 0, 1);
|
||||
else
|
||||
kgsl_3d0_pdata.chipid = ADRENO_CHIPID(3, 2, 0, 0);
|
||||
if (cpu_is_apq8064ab())
|
||||
kgsl_3d0_pdata.pwrlevel[0].gpu_freq = 450000000;
|
||||
if (SOCINFO_VERSION_MAJOR(version) == 2) {
|
||||
kgsl_3d0_pdata.chipid = ADRENO_CHIPID(3, 2, 0, 2);
|
||||
} else {
|
||||
if ((SOCINFO_VERSION_MAJOR(version) == 1) &&
|
||||
(SOCINFO_VERSION_MINOR(version) == 1))
|
||||
kgsl_3d0_pdata.chipid = ADRENO_CHIPID(3, 2, 0, 1);
|
||||
else
|
||||
kgsl_3d0_pdata.chipid = ADRENO_CHIPID(3, 2, 0, 0);
|
||||
}
|
||||
|
||||
platform_device_register(&device_kgsl_3d0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
#include <linux/spi/spi.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/platform_data/qcom_crypto_device.h>
|
||||
#include <linux/ion.h>
|
||||
#include <linux/msm_ion.h>
|
||||
#include <linux/memory.h>
|
||||
#include <linux/memblock.h>
|
||||
#include <linux/msm_thermal.h>
|
||||
|
|
@ -343,9 +343,8 @@ static struct ion_co_heap_pdata fw_co_apq8064_ion_pdata = {
|
|||
* to each other.
|
||||
* Don't swap the order unless you know what you are doing!
|
||||
*/
|
||||
static struct ion_platform_data apq8064_ion_pdata = {
|
||||
.nr = MSM_ION_HEAP_NUM,
|
||||
.heaps = {
|
||||
|
||||
static struct ion_platform_heap ion_heaps[] = {
|
||||
{
|
||||
.id = ION_SYSTEM_HEAP_ID,
|
||||
.type = ION_HEAP_TYPE_SYSTEM,
|
||||
|
|
@ -408,7 +407,11 @@ static struct ion_platform_data apq8064_ion_pdata = {
|
|||
.extra_data = (void *) &co_apq8064_ion_pdata,
|
||||
},
|
||||
#endif
|
||||
}
|
||||
};
|
||||
|
||||
static struct ion_platform_data apq8064_ion_pdata = {
|
||||
.nr = MSM_ION_HEAP_NUM,
|
||||
.heaps = ion_heaps,
|
||||
};
|
||||
|
||||
static struct platform_device apq8064_ion_dev = {
|
||||
|
|
@ -484,7 +487,7 @@ static void __init reserve_ion_memory(void)
|
|||
const struct ion_platform_heap *heap =
|
||||
&(apq8064_ion_pdata.heaps[i]);
|
||||
|
||||
if (heap->type == ION_HEAP_TYPE_CP && heap->extra_data) {
|
||||
if ((int)heap->type == (int)ION_HEAP_TYPE_CP && heap->extra_data) {
|
||||
struct ion_cp_heap_pdata *data = heap->extra_data;
|
||||
|
||||
reusable_count += (data->reusable) ? 1 : 0;
|
||||
|
|
@ -506,21 +509,17 @@ static void __init reserve_ion_memory(void)
|
|||
int fixed_position = NOT_FIXED;
|
||||
int mem_is_fmem = 0;
|
||||
|
||||
switch (heap->type) {
|
||||
case ION_HEAP_TYPE_CP:
|
||||
if ((int)heap->type == ION_HEAP_TYPE_CP) {
|
||||
mem_is_fmem = ((struct ion_cp_heap_pdata *)
|
||||
heap->extra_data)->mem_is_fmem;
|
||||
fixed_position = ((struct ion_cp_heap_pdata *)
|
||||
heap->extra_data)->fixed_position;
|
||||
break;
|
||||
case ION_HEAP_TYPE_CARVEOUT:
|
||||
}
|
||||
else if (heap->type == ION_HEAP_TYPE_CARVEOUT) {
|
||||
mem_is_fmem = ((struct ion_co_heap_pdata *)
|
||||
heap->extra_data)->mem_is_fmem;
|
||||
fixed_position = ((struct ion_co_heap_pdata *)
|
||||
heap->extra_data)->fixed_position;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (fixed_position != NOT_FIXED)
|
||||
|
|
@ -567,18 +566,14 @@ static void __init reserve_ion_memory(void)
|
|||
int fixed_position = NOT_FIXED;
|
||||
struct ion_cp_heap_pdata *pdata = NULL;
|
||||
|
||||
switch (heap->type) {
|
||||
case ION_HEAP_TYPE_CP:
|
||||
pdata =
|
||||
(struct ion_cp_heap_pdata *)heap->extra_data;
|
||||
if ((int)heap->type == ION_HEAP_TYPE_CP) {
|
||||
pdata = (struct ion_cp_heap_pdata *)
|
||||
heap->extra_data;
|
||||
fixed_position = pdata->fixed_position;
|
||||
break;
|
||||
case ION_HEAP_TYPE_CARVEOUT:
|
||||
}
|
||||
else if (heap->type == ION_HEAP_TYPE_CARVEOUT) {
|
||||
fixed_position = ((struct ion_co_heap_pdata *)
|
||||
heap->extra_data)->fixed_position;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
switch (fixed_position) {
|
||||
|
|
@ -1741,7 +1736,6 @@ static struct platform_device *common_devices[] __initdata = {
|
|||
&msm_pil_vidc,
|
||||
&msm_gss,
|
||||
&apq8064_rtb_device,
|
||||
&apq8064_cpu_idle_device,
|
||||
&apq8064_device_cache_erp,
|
||||
&msm8960_device_ebi1_ch0_erp,
|
||||
&msm8960_device_ebi1_ch1_erp,
|
||||
|
|
@ -1923,7 +1917,6 @@ static void __init apq8064_common_init(void)
|
|||
msm_hsic_pdata.swfi_latency = rpmrs_level.latency_us;
|
||||
rpmrs_level =
|
||||
msm_rpmrs_levels[MSM_PM_SLEEP_MODE_POWER_COLLAPSE_STANDALONE];
|
||||
msm_hsic_pdata.standalone_latency = rpmrs_level.latency_us;
|
||||
apq8064_device_hsic_host.dev.platform_data = &msm_hsic_pdata;
|
||||
device_initialize(&apq8064_device_hsic_host.dev);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue