--- arch/arm/mach-msm/acpuclock-krait.c

+++ arch/arm/mach-msm/acpuclock-krait.c

@@ -936,56 +936,8 @@ static void __init bus_init(const struct

dev_err(drv.dev, "initial bandwidth req failed (%d)\n", ret);

}

-#ifdef CONFIG_CPU_VOLTAGE_TABLE

-

-#define HFPLL_MIN_VDD 600000

-#define HFPLL_MAX_VDD 1450000

-

-ssize_t acpuclk_get_vdd_levels_str(char *buf) {

-

- int i, len = 0;

-

- if (buf) {

- mutex_lock(&driver_lock);

-

- for (i = 0; drv.acpu_freq_tbl[i].speed.khz; i++) {

- /* updated to use uv required by 8x60 architecture - faux123 */

- len += sprintf(buf + len, "%8lu: %8d\n", drv.acpu_freq_tbl[i].speed.khz,

- drv.acpu_freq_tbl[i].vdd_core );

- }

-

- mutex_unlock(&driver_lock);

- }

- return len;

-}

-

-/* updated to use uv required by 8x60 architecture - faux123 */

-void acpuclk_set_vdd(unsigned int khz, int vdd_uv) {

-

- int i;

- unsigned int new_vdd_uv;

-

- mutex_lock(&driver_lock);

-

- for (i = 0; drv.acpu_freq_tbl[i].speed.khz; i++) {

- if (khz == 0)

- new_vdd_uv = min(max((unsigned int)(drv.acpu_freq_tbl[i].vdd_core + vdd_uv),

- (unsigned int)HFPLL_MIN_VDD), (unsigned int)HFPLL_MAX_VDD);

- else if ( drv.acpu_freq_tbl[i].speed.khz == khz)

- new_vdd_uv = min(max((unsigned int)vdd_uv,

- (unsigned int)HFPLL_MIN_VDD), (unsigned int)HFPLL_MAX_VDD);

- else

- continue;

-

- drv.acpu_freq_tbl[i].vdd_core = new_vdd_uv;

- }

- pr_warn("faux123: user voltage table modified!\n");

- mutex_unlock(&driver_lock);

-}

-#endif /* CONFIG_CPU_VOTALGE_TABLE */

-

#ifdef CONFIG_CPU_FREQ_MSM

-static struct cpufreq_frequency_table freq_table[NR_CPUS][46];

+static struct cpufreq_frequency_table freq_table[NR_CPUS][35];

extern int console_batt_stat;

static void __init cpufreq_table_init(void)

{

@@ -1162,7 +1114,7 @@ static struct pvs_table * __init select_

speed_bin = bin_idx;

pvs_bin = tbl_idx;

#endif

- return &pvs_tables[7][1];

+ return &pvs_tables[bin_idx][tbl_idx];

}

static void __init drv_data_init(struct device *dev,