summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mx5/mx50_rdp.c
diff options
context:
space:
mode:
authorRanjani Vaidyanathan <ra5478@freescale.com>2011-02-10 15:41:59 -0600
committerAlex Gonzalez <alex.gonzalez@digi.com>2011-08-01 09:51:09 +0200
commitcfad5b0fe33d57e4d54146ac33f67110188a5a75 (patch)
tree0a58c6757d169f9c2099ea0f87a88c8a97d851b2 /arch/arm/mach-mx5/mx50_rdp.c
parenta2d35da7aae4ae5235b172a08cbbc41eab15fc80 (diff)
ENGR00139053-2: MX50_ARM2:Incorrect num_cpu_wp initialization breaks dvfs_core
Incorrect initialization of num_cpu_wp breaks DVFS-CORE on MX50_ARM2. Fix by removing static initialization of the global variable. Instead initialize it to the size of the cpu_wp array defined in the board file. Signed-off-by: Ranjani Vaidyanathan <ra5478@freescale.com> Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'arch/arm/mach-mx5/mx50_rdp.c')
-rw-r--r--arch/arm/mach-mx5/mx50_rdp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mx5/mx50_rdp.c b/arch/arm/mach-mx5/mx50_rdp.c
index eb30b1b65731..23c56d30c8c7 100644
--- a/arch/arm/mach-mx5/mx50_rdp.c
+++ b/arch/arm/mach-mx5/mx50_rdp.c
@@ -128,7 +128,7 @@ static void fec_gpio_iomux_init(void);
static void fec_gpio_iomux_deinit(void);
static int max17135_regulator_init(struct max17135 *max17135);
-static int num_cpu_wp = 3;
+static int num_cpu_wp;
static iomux_v3_cfg_t mx50_rdp[] = {
/* SD1 */
@@ -457,7 +457,6 @@ static struct mxc_dvfs_platform_data dvfs_core_data = {
.upcnt_val = 10,
.dncnt_val = 10,
.delay_time = 80,
- .num_wp = 3,
};
static struct mxc_bus_freq_platform_data bus_freq_data = {
@@ -1432,6 +1431,7 @@ static void __init fixup_mxc_board(struct machine_desc *desc, struct tag *tags,
get_cpu_wp = mx50_rdp_get_cpu_wp;
set_num_cpu_wp = mx50_rdp_set_num_cpu_wp;
get_dvfs_core_wp = mx50_rdp_get_dvfs_core_table;
+ num_cpu_wp = ARRAY_SIZE(cpu_wp_auto);
}
static void __init mx50_rdp_io_init(void)