diff options
author | Bo Kim <bok@nvidia.com> | 2013-06-27 13:48:37 +0900 |
---|---|---|
committer | Gabby Lee <galee@nvidia.com> | 2013-06-30 23:12:53 -0700 |
commit | ade2ccb73623707bbf95c128447a8cca3d063a05 (patch) | |
tree | fb475f76d14e4a46057532d7e211d564f8667c3b /arch | |
parent | dd7afeebe028aa98392283009ce1065377220069 (diff) |
tegratab: Update edp e-states.
These values are measured on DVT1 or ERS.
Bug 1244384
Change-Id: I0f5f73132c0b00d51ea2713d62aade01110ec1c6
Signed-off-by: Bo Kim <bok@nvidia.com>
Reviewed-on: http://git-master/r/242722
Reviewed-by: Gabby Lee <galee@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-tegra/board-tegratab-power.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-tegratab-sdhci.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-tegratab-sensors.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-tegratab.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-tegra/panel-lgd-wxga-7-0.c | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm/mach-tegra/board-tegratab-power.c b/arch/arm/mach-tegra/board-tegratab-power.c index 50039056847c..7a4e69877025 100644 --- a/arch/arm/mach-tegra/board-tegratab-power.c +++ b/arch/arm/mach-tegra/board-tegratab-power.c @@ -996,7 +996,7 @@ static unsigned int tegratab_psydepl_states[] = { }; static struct psy_depletion_ibat_lut tegratab_ibat_lut[] = { - { 60, 0 }, + { 60, 500 }, /* Temporary, due to psy_depletion client */ { 50, 4500 }, { 0, 4500 }, { -10, 0 } diff --git a/arch/arm/mach-tegra/board-tegratab-sdhci.c b/arch/arm/mach-tegra/board-tegratab-sdhci.c index 7c101ddd77ce..7f6d296f0d14 100644 --- a/arch/arm/mach-tegra/board-tegratab-sdhci.c +++ b/arch/arm/mach-tegra/board-tegratab-sdhci.c @@ -30,6 +30,7 @@ #include <mach/gpio-tegra.h> #include <mach/io_dpd.h> #include <linux/wl12xx.h> +#include <linux/edp.h> #include "tegra-board-id.h" #include "gpio-names.h" @@ -55,11 +56,12 @@ static struct wl12xx_platform_data tegratab_wl12xx_wlan_data __initdata = { .board_tcxo_clock = 1, .set_power = tegratab_wifi_power, .set_carddetect = tegratab_wifi_set_carddetect, -#if defined(CONFIG_BCMDHD_EDP_SUPPORT) + /* TODO: Need to check. wl12xx doen't support EDP client now. */ +#if 0 /* defined(CONFIG_BCMDHD_EDP_SUPPORT) */ /* set the wifi edp client information here */ .client_info = { .name = "wifi_edp_client", - .states = {1080, 0}, + .states = {1509, 478}, .num_states = ARRAY_SIZE(wifi_states), .e0_index = 0, .priority = EDP_MAX_PRIO, @@ -155,7 +157,7 @@ static struct tegra_sdhci_platform_data tegra_sdhci_platform_data2 = { .max_clk_limit = 156000000, .uhs_mask = MMC_UHS_MASK_DDR50, .edp_support = true, - .edp_states = {966, 0}, + .edp_states = { 36, 0}, }; static struct tegra_sdhci_platform_data tegra_sdhci_platform_data3 = { @@ -172,7 +174,7 @@ static struct tegra_sdhci_platform_data tegra_sdhci_platform_data3 = { .ocr_mask = MMC_OCR_1V8_MASK, }, .edp_support = true, - .edp_states = {966, 0}, + .edp_states = {466, 0}, }; static struct platform_device tegra_sdhci_device0 = { diff --git a/arch/arm/mach-tegra/board-tegratab-sensors.c b/arch/arm/mach-tegra/board-tegratab-sensors.c index 959a7d8174c3..0270f4930594 100644 --- a/arch/arm/mach-tegra/board-tegratab-sensors.c +++ b/arch/arm/mach-tegra/board-tegratab-sensors.c @@ -238,18 +238,12 @@ static int tegratab_ov5693_power_off(struct ov5693_power_rail *pw) static struct nvc_gpio_pdata ov5693_gpio_pdata[] = { { OV5693_GPIO_TYPE_PWRDN, CAM1_POWER_DWN_GPIO, true, 0, }, }; -static unsigned ov5693_estates[] = { 876, 656, 220, 0 }; + static struct ov5693_platform_data tegratab_ov5693_pdata = { .num = 5693, .dev_name = "camera", .gpio_count = ARRAY_SIZE(ov5693_gpio_pdata), .gpio = ov5693_gpio_pdata, - .edpc_config = { - .states = ov5693_estates, - .num_states = ARRAY_SIZE(ov5693_estates), - .e0_index = ARRAY_SIZE(ov5693_estates) - 1, - .priority = EDP_MAX_PRIO + 1, - }, .power_on = tegratab_ov5693_power_on, .power_off = tegratab_ov5693_power_off, }; @@ -394,7 +388,7 @@ static int tegratab_ov7695_power_off(struct ov7695_power_rail *pw) return 0; } -static unsigned ov7695_estates[] = { 220, 0 }; +static unsigned ov7695_estates[] = { 99, 0 }; struct ov7695_platform_data tegratab_ov7695_pdata = { .edpc_config = { .states = ov7695_estates, diff --git a/arch/arm/mach-tegra/board-tegratab.c b/arch/arm/mach-tegra/board-tegratab.c index 587856861d7d..40ab98401fe6 100644 --- a/arch/arm/mach-tegra/board-tegratab.c +++ b/arch/arm/mach-tegra/board-tegratab.c @@ -354,6 +354,8 @@ static struct tegra_asoc_platform_data tegratab_audio_pdata = { .is_i2s_master = 1, .i2s_mode = TEGRA_DAIFMT_DSP_A, }, + .edp_support = true, + .edp_states = {4760, 522, 0}, }; static struct platform_device tegratab_audio_device = { diff --git a/arch/arm/mach-tegra/panel-lgd-wxga-7-0.c b/arch/arm/mach-tegra/panel-lgd-wxga-7-0.c index 0e2a1202c2e3..eab60deda8b9 100644 --- a/arch/arm/mach-tegra/panel-lgd-wxga-7-0.c +++ b/arch/arm/mach-tegra/panel-lgd-wxga-7-0.c @@ -522,6 +522,8 @@ static struct platform_pwm_backlight_data dsi_lgd_wxga_7_0_bl_data = { .dft_brightness = 224, .pwm_period_ns = 1000000, .notify = dsi_lgd_wxga_7_0_bl_notify, + .edp_states = { 1711, 1390, 1057, 713, 360, 0}, + .edp_brightness = {255, 204, 153, 101, 50, 0}, /* Only toggle backlight on fb blank notifications for disp1 */ .check_fb = dsi_lgd_wxga_7_0_check_fb, .pwm_gpio = DSI_PANEL_BL_PWM, |