Skip to content

L
linux-davinci-2.6.23
Commit bd5ab26a authored by Dave Jones's avatar Dave Jones
Browse files
Options

[CPUFREQ] constify some data tables. 

Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent aeeddc14
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 17 deletions
arch/i386/kernel/cpu/cpufreq/longhaul.c
View file @ bd5ab26a
...@@ -61,8 +61,8 @@ static int cpu_model; ...@@ -61,8 +61,8 @@ static int cpu_model;
static unsigned int numscales=16; static unsigned int numscales=16;
static unsigned int fsb; static unsigned int fsb;
static struct mV_pos *vrm_mV_table; static const struct mV_pos *vrm_mV_table;
static unsigned char *mV_vrm_table; static const unsigned char *mV_vrm_table;
struct f_msr { struct f_msr {
u8 vrm; u8 vrm;
u8 pos; u8 pos;
......
arch/i386/kernel/cpu/cpufreq/longhaul.h
View file @ bd5ab26a
...@@ -56,7 +56,7 @@ union msr_longhaul { ...@@ -56,7 +56,7 @@ union msr_longhaul {
/* /*
* VIA C3 Samuel 1 & Samuel 2 (stepping 0) * VIA C3 Samuel 1 & Samuel 2 (stepping 0)
*/ */
static int __initdata samuel1_clock_ratio[16] = { static const int __initdata samuel1_clock_ratio[16] = {
-1, /* 0000 -> RESERVED */ -1, /* 0000 -> RESERVED */
30, /* 0001 -> 3.0x */ 30, /* 0001 -> 3.0x */
40, /* 0010 -> 4.0x */ 40, /* 0010 -> 4.0x */
...@@ -75,7 +75,7 @@ static int __initdata samuel1_clock_ratio[16] = { ...@@ -75,7 +75,7 @@ static int __initdata samuel1_clock_ratio[16] = {
-1, /* 1111 -> RESERVED */ -1, /* 1111 -> RESERVED */
}; };
static int __initdata samuel1_eblcr[16] = { static const int __initdata samuel1_eblcr[16] = {
50, /* 0000 -> RESERVED */ 50, /* 0000 -> RESERVED */
30, /* 0001 -> 3.0x */ 30, /* 0001 -> 3.0x */
40, /* 0010 -> 4.0x */ 40, /* 0010 -> 4.0x */
...@@ -97,7 +97,7 @@ static int __initdata samuel1_eblcr[16] = { ...@@ -97,7 +97,7 @@ static int __initdata samuel1_eblcr[16] = {
/* /*
* VIA C3 Samuel2 Stepping 1->15 * VIA C3 Samuel2 Stepping 1->15
*/ */
static int __initdata samuel2_eblcr[16] = { static const int __initdata samuel2_eblcr[16] = {
50, /* 0000 -> 5.0x */ 50, /* 0000 -> 5.0x */
30, /* 0001 -> 3.0x */ 30, /* 0001 -> 3.0x */
40, /* 0010 -> 4.0x */ 40, /* 0010 -> 4.0x */
...@@ -119,7 +119,7 @@ static int __initdata samuel2_eblcr[16] = { ...@@ -119,7 +119,7 @@ static int __initdata samuel2_eblcr[16] = {
/* /*
* VIA C3 Ezra * VIA C3 Ezra
*/ */
static int __initdata ezra_clock_ratio[16] = { static const int __initdata ezra_clock_ratio[16] = {
100, /* 0000 -> 10.0x */ 100, /* 0000 -> 10.0x */
30, /* 0001 -> 3.0x */ 30, /* 0001 -> 3.0x */
40, /* 0010 -> 4.0x */ 40, /* 0010 -> 4.0x */
...@@ -138,7 +138,7 @@ static int __initdata ezra_clock_ratio[16] = { ...@@ -138,7 +138,7 @@ static int __initdata ezra_clock_ratio[16] = {
120, /* 1111 -> 12.0x */ 120, /* 1111 -> 12.0x */
}; };
static int __initdata ezra_eblcr[16] = { static const int __initdata ezra_eblcr[16] = {
50, /* 0000 -> 5.0x */ 50, /* 0000 -> 5.0x */
30, /* 0001 -> 3.0x */ 30, /* 0001 -> 3.0x */
40, /* 0010 -> 4.0x */ 40, /* 0010 -> 4.0x */
...@@ -160,7 +160,7 @@ static int __initdata ezra_eblcr[16] = { ...@@ -160,7 +160,7 @@ static int __initdata ezra_eblcr[16] = {
/* /*
* VIA C3 (Ezra-T) [C5M]. * VIA C3 (Ezra-T) [C5M].
*/ */
static int __initdata ezrat_clock_ratio[32] = { static const int __initdata ezrat_clock_ratio[32] = {
100, /* 0000 -> 10.0x */ 100, /* 0000 -> 10.0x */
30, /* 0001 -> 3.0x */ 30, /* 0001 -> 3.0x */
40, /* 0010 -> 4.0x */ 40, /* 0010 -> 4.0x */
...@@ -196,7 +196,7 @@ static int __initdata ezrat_clock_ratio[32] = { ...@@ -196,7 +196,7 @@ static int __initdata ezrat_clock_ratio[32] = {
-1, /* 1111 -> RESERVED (12.0x) */ -1, /* 1111 -> RESERVED (12.0x) */
}; };
static int __initdata ezrat_eblcr[32] = { static const int __initdata ezrat_eblcr[32] = {
50, /* 0000 -> 5.0x */ 50, /* 0000 -> 5.0x */
30, /* 0001 -> 3.0x */ 30, /* 0001 -> 3.0x */
40, /* 0010 -> 4.0x */ 40, /* 0010 -> 4.0x */
...@@ -235,7 +235,7 @@ static int __initdata ezrat_eblcr[32] = { ...@@ -235,7 +235,7 @@ static int __initdata ezrat_eblcr[32] = {
/* /*
* VIA C3 Nehemiah */ * VIA C3 Nehemiah */
static int __initdata nehemiah_clock_ratio[32] = { static const int __initdata nehemiah_clock_ratio[32] = {
100, /* 0000 -> 10.0x */ 100, /* 0000 -> 10.0x */
160, /* 0001 -> 16.0x */ 160, /* 0001 -> 16.0x */
40, /* 0010 -> 4.0x */ 40, /* 0010 -> 4.0x */
...@@ -270,7 +270,7 @@ static int __initdata nehemiah_clock_ratio[32] = { ...@@ -270,7 +270,7 @@ static int __initdata nehemiah_clock_ratio[32] = {
120, /* 1111 -> 12.0x */ 120, /* 1111 -> 12.0x */
}; };
static int __initdata nehemiah_eblcr[32] = { static const int __initdata nehemiah_eblcr[32] = {
50, /* 0000 -> 5.0x */ 50, /* 0000 -> 5.0x */
160, /* 0001 -> 16.0x */ 160, /* 0001 -> 16.0x */
40, /* 0010 -> 4.0x */ 40, /* 0010 -> 4.0x */
...@@ -315,7 +315,7 @@ struct mV_pos { ...@@ -315,7 +315,7 @@ struct mV_pos {
unsigned short pos; unsigned short pos;
}; };
static struct mV_pos __initdata vrm85_mV[32] = { static const struct mV_pos __initdata vrm85_mV[32] = {
{1250, 8}, {1200, 6}, {1150, 4}, {1100, 2}, {1250, 8}, {1200, 6}, {1150, 4}, {1100, 2},
{1050, 0}, {1800, 30}, {1750, 28}, {1700, 26}, {1050, 0}, {1800, 30}, {1750, 28}, {1700, 26},
{1650, 24}, {1600, 22}, {1550, 20}, {1500, 18}, {1650, 24}, {1600, 22}, {1550, 20}, {1500, 18},
...@@ -326,14 +326,14 @@ static struct mV_pos __initdata vrm85_mV[32] = { ...@@ -326,14 +326,14 @@ static struct mV_pos __initdata vrm85_mV[32] = {
{1475, 17}, {1425, 15}, {1375, 13}, {1325, 11} {1475, 17}, {1425, 15}, {1375, 13}, {1325, 11}
}; };
static unsigned char __initdata mV_vrm85[32] = { static const unsigned char __initdata mV_vrm85[32] = {
0x04, 0x14, 0x03, 0x13, 0x02, 0x12, 0x01, 0x11, 0x04, 0x14, 0x03, 0x13, 0x02, 0x12, 0x01, 0x11,
0x00, 0x10, 0x0f, 0x1f, 0x0e, 0x1e, 0x0d, 0x1d, 0x00, 0x10, 0x0f, 0x1f, 0x0e, 0x1e, 0x0d, 0x1d,
0x0c, 0x1c, 0x0b, 0x1b, 0x0a, 0x1a, 0x09, 0x19, 0x0c, 0x1c, 0x0b, 0x1b, 0x0a, 0x1a, 0x09, 0x19,
0x08, 0x18, 0x07, 0x17, 0x06, 0x16, 0x05, 0x15 0x08, 0x18, 0x07, 0x17, 0x06, 0x16, 0x05, 0x15
}; };
static struct mV_pos __initdata mobilevrm_mV[32] = { static const struct mV_pos __initdata mobilevrm_mV[32] = {
{1750, 31}, {1700, 30}, {1650, 29}, {1600, 28}, {1750, 31}, {1700, 30}, {1650, 29}, {1600, 28},
{1550, 27}, {1500, 26}, {1450, 25}, {1400, 24}, {1550, 27}, {1500, 26}, {1450, 25}, {1400, 24},
{1350, 23}, {1300, 22}, {1250, 21}, {1200, 20}, {1350, 23}, {1300, 22}, {1250, 21}, {1200, 20},
...@@ -344,7 +344,7 @@ static struct mV_pos __initdata mobilevrm_mV[32] = { ...@@ -344,7 +344,7 @@ static struct mV_pos __initdata mobilevrm_mV[32] = {
{675, 3}, {650, 2}, {625, 1}, {600, 0} {675, 3}, {650, 2}, {625, 1}, {600, 0}
}; };
static unsigned char __initdata mV_mobilevrm[32] = { static const unsigned char __initdata mV_mobilevrm[32] = {
0x1f, 0x1e, 0x1d, 0x1c, 0x1b, 0x1a, 0x19, 0x18, 0x1f, 0x1e, 0x1d, 0x1c, 0x1b, 0x1a, 0x19, 0x18,
0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10,
0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
......
arch/i386/kernel/cpu/cpufreq/powernow-k7.c
View file @ bd5ab26a
...@@ -68,7 +68,7 @@ union powernow_acpi_control_t { ...@@ -68,7 +68,7 @@ union powernow_acpi_control_t {
#ifdef CONFIG_CPU_FREQ_DEBUG #ifdef CONFIG_CPU_FREQ_DEBUG
/* divide by 1000 to get VCore voltage in V. */ /* divide by 1000 to get VCore voltage in V. */
static int mobile_vid_table[32] = { static const int mobile_vid_table[32] = {
2000, 1950, 1900, 1850, 1800, 1750, 1700, 1650, 2000, 1950, 1900, 1850, 1800, 1750, 1700, 1650,
1600, 1550, 1500, 1450, 1400, 1350, 1300, 0, 1600, 1550, 1500, 1450, 1400, 1350, 1300, 0,
1275, 1250, 1225, 1200, 1175, 1150, 1125, 1100, 1275, 1250, 1225, 1200, 1175, 1150, 1125, 1100,
...@@ -77,7 +77,7 @@ static int mobile_vid_table[32] = { ...@@ -77,7 +77,7 @@ static int mobile_vid_table[32] = {
#endif #endif
/* divide by 10 to get FID. */ /* divide by 10 to get FID. */
static int fid_codes[32] = { static const int fid_codes[32] = {
110, 115, 120, 125, 50, 55, 60, 65, 110, 115, 120, 125, 50, 55, 60, 65,
70, 75, 80, 85, 90, 95, 100, 105, 70, 75, 80, 85, 90, 95, 100, 105,
30, 190, 40, 200, 130, 135, 140, 210, 30, 190, 40, 200, 130, 135, 140, 210,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment