aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/blackfin/kernel/setup.c20
-rw-r--r--arch/blackfin/mach-bf527/boards/ezkit.c2
-rw-r--r--arch/blackfin/mach-bf533/boards/cm_bf533.c2
-rw-r--r--arch/blackfin/mach-bf533/boards/ezkit.c2
-rw-r--r--arch/blackfin/mach-bf533/boards/generic_board.c2
-rw-r--r--arch/blackfin/mach-bf533/boards/stamp.c2
-rw-r--r--arch/blackfin/mach-bf537/boards/cm_bf537.c2
-rw-r--r--arch/blackfin/mach-bf537/boards/generic_board.c2
-rw-r--r--arch/blackfin/mach-bf537/boards/pnav10.c2
-rw-r--r--arch/blackfin/mach-bf537/boards/stamp.c2
-rw-r--r--arch/blackfin/mach-bf548/boards/ezkit.c2
-rw-r--r--arch/blackfin/mach-bf561/boards/cm_bf561.c2
-rw-r--r--arch/blackfin/mach-bf561/boards/ezkit.c2
-rw-r--r--arch/blackfin/mach-bf561/boards/generic_board.c2
-rw-r--r--arch/blackfin/mach-bf561/boards/tepla.c2
-rw-r--r--include/asm-blackfin/bfin-global.h2
16 files changed, 25 insertions, 25 deletions
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 34fbf93cc118..6b85145f8488 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -498,7 +498,7 @@ EXPORT_SYMBOL(get_sclk);
498 */ 498 */
499static int show_cpuinfo(struct seq_file *m, void *v) 499static int show_cpuinfo(struct seq_file *m, void *v)
500{ 500{
501 char *cpu, *mmu, *fpu, *name, vendor[20], cache[30]; 501 char *cpu, *mmu, *fpu, *vendor, *cache;
502 uint32_t revid; 502 uint32_t revid;
503 503
504 u_long cclk = 0, sclk = 0; 504 u_long cclk = 0, sclk = 0;
@@ -508,17 +508,17 @@ static int show_cpuinfo(struct seq_file *m, void *v)
508 mmu = "none"; 508 mmu = "none";
509 fpu = "none"; 509 fpu = "none";
510 revid = bfin_revid(); 510 revid = bfin_revid();
511 name = bfin_board_name;
512 511
513 cclk = get_cclk(); 512 cclk = get_cclk();
514 sclk = get_sclk(); 513 sclk = get_sclk();
515 514
516 switch (bfin_read_CHIPID() & CHIPID_MANUFACTURE) { 515 switch (bfin_read_CHIPID() & CHIPID_MANUFACTURE) {
517 case(0xca): 516 case 0xca:
518 strcpy(vendor, "AnalogDevices"); 517 vendor = "Analog Devices";
519 break; 518 break;
520 default: 519 default:
521 strcpy(vendor, "unknown"); 520 vendor = "unknown";
521 break;
522 } 522 }
523 523
524 seq_printf(m, "processor\t: %d\n" 524 seq_printf(m, "processor\t: %d\n"
@@ -544,22 +544,22 @@ static int show_cpuinfo(struct seq_file *m, void *v)
544 /* Check Cache configutation */ 544 /* Check Cache configutation */
545 switch (bfin_read_DMEM_CONTROL() & (1 << DMC0_P | 1 << DMC1_P)) { 545 switch (bfin_read_DMEM_CONTROL() & (1 << DMC0_P | 1 << DMC1_P)) {
546 case ACACHE_BSRAM: 546 case ACACHE_BSRAM:
547 strcpy(cache, "dbank-A/B\t: cache/sram"); 547 cache = "dbank-A/B\t: cache/sram";
548 dcache_size = 16; 548 dcache_size = 16;
549 dsup_banks = 1; 549 dsup_banks = 1;
550 break; 550 break;
551 case ACACHE_BCACHE: 551 case ACACHE_BCACHE:
552 strcpy(cache, "dbank-A/B\t: cache/cache"); 552 cache = "dbank-A/B\t: cache/cache";
553 dcache_size = 32; 553 dcache_size = 32;
554 dsup_banks = 2; 554 dsup_banks = 2;
555 break; 555 break;
556 case ASRAM_BSRAM: 556 case ASRAM_BSRAM:
557 strcpy(cache, "dbank-A/B\t: sram/sram"); 557 cache = "dbank-A/B\t: sram/sram";
558 dcache_size = 0; 558 dcache_size = 0;
559 dsup_banks = 0; 559 dsup_banks = 0;
560 break; 560 break;
561 default: 561 default:
562 strcpy(cache, "unknown"); 562 cache = "unknown";
563 dcache_size = 0; 563 dcache_size = 0;
564 dsup_banks = 0; 564 dsup_banks = 0;
565 break; 565 break;
@@ -639,7 +639,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
639 } 639 }
640#endif 640#endif
641 641
642 seq_printf(m, "board name\t: %s\n", name); 642 seq_printf(m, "board name\t: %s\n", bfin_board_name);
643 seq_printf(m, "board memory\t: %ld kB (0x%p -> 0x%p)\n", 643 seq_printf(m, "board memory\t: %ld kB (0x%p -> 0x%p)\n",
644 physical_mem_end >> 10, (void *)0, (void *)physical_mem_end); 644 physical_mem_end >> 10, (void *)0, (void *)physical_mem_end);
645 seq_printf(m, "kernel memory\t: %d kB (0x%p -> 0x%p)\n", 645 seq_printf(m, "kernel memory\t: %d kB (0x%p -> 0x%p)\n",
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index 09fb624af5ac..3e884f3a8182 100644
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -49,7 +49,7 @@
49/* 49/*
50 * Name the Board for the /proc/cpuinfo 50 * Name the Board for the /proc/cpuinfo
51 */ 51 */
52char *bfin_board_name = "ADDS-BF527-EZKIT"; 52const char bfin_board_name[] = "ADDS-BF527-EZKIT";
53 53
54/* 54/*
55 * Driver needs to know address, irq and flag pin. 55 * Driver needs to know address, irq and flag pin.
diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c b/arch/blackfin/mach-bf533/boards/cm_bf533.c
index a57b52d207cd..1c5a86adfab7 100644
--- a/arch/blackfin/mach-bf533/boards/cm_bf533.c
+++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c
@@ -42,7 +42,7 @@
42/* 42/*
43 * Name the Board for the /proc/cpuinfo 43 * Name the Board for the /proc/cpuinfo
44 */ 44 */
45char *bfin_board_name = "Bluetechnix CM BF533"; 45const char bfin_board_name[] = "Bluetechnix CM BF533";
46 46
47#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) 47#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
48/* all SPI peripherals info goes here */ 48/* all SPI peripherals info goes here */
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c
index 5c1e35d3c012..34b63920e272 100644
--- a/arch/blackfin/mach-bf533/boards/ezkit.c
+++ b/arch/blackfin/mach-bf533/boards/ezkit.c
@@ -43,7 +43,7 @@
43/* 43/*
44 * Name the Board for the /proc/cpuinfo 44 * Name the Board for the /proc/cpuinfo
45 */ 45 */
46char *bfin_board_name = "ADDS-BF533-EZKIT"; 46const char bfin_board_name[] = "ADDS-BF533-EZKIT";
47 47
48#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) 48#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
49static struct platform_device rtc_device = { 49static struct platform_device rtc_device = {
diff --git a/arch/blackfin/mach-bf533/boards/generic_board.c b/arch/blackfin/mach-bf533/boards/generic_board.c
index 9bc1f0d0ab50..310b7772c458 100644
--- a/arch/blackfin/mach-bf533/boards/generic_board.c
+++ b/arch/blackfin/mach-bf533/boards/generic_board.c
@@ -35,7 +35,7 @@
35/* 35/*
36 * Name the Board for the /proc/cpuinfo 36 * Name the Board for the /proc/cpuinfo
37 */ 37 */
38char *bfin_board_name = "UNKNOWN BOARD"; 38const char bfin_board_name[] = "UNKNOWN BOARD";
39 39
40#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) 40#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
41static struct platform_device rtc_device = { 41static struct platform_device rtc_device = {
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c
index 8975e06ea158..f84be4eabfd1 100644
--- a/arch/blackfin/mach-bf533/boards/stamp.c
+++ b/arch/blackfin/mach-bf533/boards/stamp.c
@@ -46,7 +46,7 @@
46/* 46/*
47 * Name the Board for the /proc/cpuinfo 47 * Name the Board for the /proc/cpuinfo
48 */ 48 */
49char *bfin_board_name = "ADDS-BF533-STAMP"; 49const char bfin_board_name[] = "ADDS-BF533-STAMP";
50 50
51#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) 51#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
52static struct platform_device rtc_device = { 52static struct platform_device rtc_device = {
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537.c b/arch/blackfin/mach-bf537/boards/cm_bf537.c
index 44dea05e1d03..52e2320307de 100644
--- a/arch/blackfin/mach-bf537/boards/cm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537.c
@@ -43,7 +43,7 @@
43/* 43/*
44 * Name the Board for the /proc/cpuinfo 44 * Name the Board for the /proc/cpuinfo
45 */ 45 */
46char *bfin_board_name = "Bluetechnix CM BF537"; 46const char bfin_board_name[] = "Bluetechnix CM BF537";
47 47
48#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) 48#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
49/* all SPI peripherals info goes here */ 49/* all SPI peripherals info goes here */
diff --git a/arch/blackfin/mach-bf537/boards/generic_board.c b/arch/blackfin/mach-bf537/boards/generic_board.c
index 6668c8e4a3fc..255da7a98481 100644
--- a/arch/blackfin/mach-bf537/boards/generic_board.c
+++ b/arch/blackfin/mach-bf537/boards/generic_board.c
@@ -49,7 +49,7 @@
49/* 49/*
50 * Name the Board for the /proc/cpuinfo 50 * Name the Board for the /proc/cpuinfo
51 */ 51 */
52char *bfin_board_name = "GENERIC Board"; 52const char bfin_board_name[] = "GENERIC Board";
53 53
54/* 54/*
55 * Driver needs to know address, irq and flag pin. 55 * Driver needs to know address, irq and flag pin.
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c
index f83a2544004d..87b808926789 100644
--- a/arch/blackfin/mach-bf537/boards/pnav10.c
+++ b/arch/blackfin/mach-bf537/boards/pnav10.c
@@ -47,7 +47,7 @@
47/* 47/*
48 * Name the Board for the /proc/cpuinfo 48 * Name the Board for the /proc/cpuinfo
49 */ 49 */
50char *bfin_board_name = "PNAV-1.0"; 50const char bfin_board_name[] = "PNAV-1.0";
51 51
52/* 52/*
53 * Driver needs to know address, irq and flag pin. 53 * Driver needs to know address, irq and flag pin.
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index f42ba3aa86d7..cc41f6c2ef4f 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -49,7 +49,7 @@
49/* 49/*
50 * Name the Board for the /proc/cpuinfo 50 * Name the Board for the /proc/cpuinfo
51 */ 51 */
52char *bfin_board_name = "ADDS-BF537-STAMP"; 52const char bfin_board_name[] = "ADDS-BF537-STAMP";
53 53
54/* 54/*
55 * Driver needs to know address, irq and flag pin. 55 * Driver needs to know address, irq and flag pin.
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c
index 046e6d84bbfc..f5428a57b6e2 100644
--- a/arch/blackfin/mach-bf548/boards/ezkit.c
+++ b/arch/blackfin/mach-bf548/boards/ezkit.c
@@ -49,7 +49,7 @@
49/* 49/*
50 * Name the Board for the /proc/cpuinfo 50 * Name the Board for the /proc/cpuinfo
51 */ 51 */
52char *bfin_board_name = "ADSP-BF548-EZKIT"; 52const char bfin_board_name[] = "ADSP-BF548-EZKIT";
53 53
54/* 54/*
55 * Driver needs to know address, irq and flag pin. 55 * Driver needs to know address, irq and flag pin.
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c
index cd827a1b6ba1..97aeb43fd8b4 100644
--- a/arch/blackfin/mach-bf561/boards/cm_bf561.c
+++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c
@@ -42,7 +42,7 @@
42/* 42/*
43 * Name the Board for the /proc/cpuinfo 43 * Name the Board for the /proc/cpuinfo
44 */ 44 */
45char *bfin_board_name = "Bluetechnix CM BF561"; 45const char bfin_board_name[] = "Bluetechnix CM BF561";
46 46
47#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) 47#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
48/* all SPI peripherals info goes here */ 48/* all SPI peripherals info goes here */
diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c
index 57e14edca8b1..059d516cec23 100644
--- a/arch/blackfin/mach-bf561/boards/ezkit.c
+++ b/arch/blackfin/mach-bf561/boards/ezkit.c
@@ -39,7 +39,7 @@
39/* 39/*
40 * Name the Board for the /proc/cpuinfo 40 * Name the Board for the /proc/cpuinfo
41 */ 41 */
42char *bfin_board_name = "ADDS-BF561-EZKIT"; 42const char bfin_board_name[] = "ADDS-BF561-EZKIT";
43 43
44#define ISP1761_BASE 0x2C0F0000 44#define ISP1761_BASE 0x2C0F0000
45#define ISP1761_IRQ IRQ_PF10 45#define ISP1761_IRQ IRQ_PF10
diff --git a/arch/blackfin/mach-bf561/boards/generic_board.c b/arch/blackfin/mach-bf561/boards/generic_board.c
index 4dfea5da674c..46816be4b2ba 100644
--- a/arch/blackfin/mach-bf561/boards/generic_board.c
+++ b/arch/blackfin/mach-bf561/boards/generic_board.c
@@ -32,7 +32,7 @@
32#include <linux/platform_device.h> 32#include <linux/platform_device.h>
33#include <linux/irq.h> 33#include <linux/irq.h>
34 34
35char *bfin_board_name = "UNKNOWN BOARD"; 35const char bfin_board_name[] = "UNKNOWN BOARD";
36 36
37/* 37/*
38 * Driver needs to know address, irq and flag pin. 38 * Driver needs to know address, irq and flag pin.
diff --git a/arch/blackfin/mach-bf561/boards/tepla.c b/arch/blackfin/mach-bf561/boards/tepla.c
index c442eb23db5e..4a17c6da2a59 100644
--- a/arch/blackfin/mach-bf561/boards/tepla.c
+++ b/arch/blackfin/mach-bf561/boards/tepla.c
@@ -16,7 +16,7 @@
16#include <linux/platform_device.h> 16#include <linux/platform_device.h>
17#include <linux/irq.h> 17#include <linux/irq.h>
18 18
19char *bfin_board_name = "Tepla-BF561"; 19const char bfin_board_name[] = "Tepla-BF561";
20 20
21/* 21/*
22 * Driver needs to know address, irq and flag pin. 22 * Driver needs to know address, irq and flag pin.
diff --git a/include/asm-blackfin/bfin-global.h b/include/asm-blackfin/bfin-global.h
index a970781a0f98..a006353a4310 100644
--- a/include/asm-blackfin/bfin-global.h
+++ b/include/asm-blackfin/bfin-global.h
@@ -105,7 +105,7 @@ extern void led_disp_num(int);
105extern void led_toggle_num(int); 105extern void led_toggle_num(int);
106extern void init_leds(void); 106extern void init_leds(void);
107 107
108extern char *bfin_board_name __attribute__ ((weak)); 108extern const char bfin_board_name[];
109extern unsigned long wall_jiffies; 109extern unsigned long wall_jiffies;
110extern unsigned long ipdt_table[]; 110extern unsigned long ipdt_table[];
111extern unsigned long dpdt_table[]; 111extern unsigned long dpdt_table[];