bcm63xx: add 3.9 support
[openwrt/svn-archive/archive.git] / target / linux / brcm63xx / patches-3.9 / 415-MIPS-BCM63XX-store-the-flash-type-in-global-variable.patch
1 From f888824d352df894ab721a5ca067b0313500efe7 Mon Sep 17 00:00:00 2001
2 From: Jonas Gorski <jonas.gorski@gmail.com>
3 Date: Thu, 3 May 2012 12:17:54 +0200
4 Subject: [PATCH 38/59] MIPS: BCM63XX: store the flash type in global variable
5
6 ---
7 arch/mips/bcm63xx/dev-flash.c | 36 +++++++++++++------
8 .../include/asm/mach-bcm63xx/bcm63xx_dev_flash.h | 2 +
9 2 files changed, 26 insertions(+), 12 deletions(-)
10
11 --- a/arch/mips/bcm63xx/dev-flash.c
12 +++ b/arch/mips/bcm63xx/dev-flash.c
13 @@ -25,6 +25,8 @@
14 #include <bcm63xx_regs.h>
15 #include <bcm63xx_io.h>
16
17 +int bcm63xx_attached_flash = -1;
18 +
19 static struct mtd_partition mtd_partitions[] = {
20 {
21 .name = "cfe",
22 @@ -86,26 +88,30 @@ static int __init bcm63xx_detect_flash_t
23 bcm63xx_spi_flash_info[0].max_speed_hz = 16666667;
24
25 if (val & STRAPBUS_6328_BOOT_SEL_SERIAL)
26 - return BCM63XX_FLASH_TYPE_SERIAL;
27 + bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_SERIAL;
28 else
29 - return BCM63XX_FLASH_TYPE_NAND;
30 + bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_NAND;
31 + break;
32 case BCM6338_CPU_ID:
33 case BCM6345_CPU_ID:
34 case BCM6348_CPU_ID:
35 /* no way to auto detect so assume parallel */
36 - return BCM63XX_FLASH_TYPE_PARALLEL;
37 + bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_PARALLEL;
38 + break;
39 case BCM6358_CPU_ID:
40 val = bcm_gpio_readl(GPIO_STRAPBUS_REG);
41 if (val & STRAPBUS_6358_BOOT_SEL_PARALLEL)
42 - return BCM63XX_FLASH_TYPE_PARALLEL;
43 + bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_PARALLEL;
44 else
45 - return BCM63XX_FLASH_TYPE_SERIAL;
46 + bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_SERIAL;
47 + break;
48 case BCM6362_CPU_ID:
49 val = bcm_misc_readl(MISC_STRAPBUS_6362_REG);
50 if (val & STRAPBUS_6362_BOOT_SEL_SERIAL)
51 - return BCM63XX_FLASH_TYPE_SERIAL;
52 + bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_SERIAL;
53 else
54 - return BCM63XX_FLASH_TYPE_NAND;
55 + bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_NAND;
56 + break;
57 case BCM6368_CPU_ID:
58 val = bcm_gpio_readl(GPIO_STRAPBUS_REG);
59 if (val & STRAPBUS_6368_SPI_CLK_FAST)
60 @@ -113,25 +119,32 @@ static int __init bcm63xx_detect_flash_t
61
62 switch (val & STRAPBUS_6368_BOOT_SEL_MASK) {
63 case STRAPBUS_6368_BOOT_SEL_NAND:
64 - return BCM63XX_FLASH_TYPE_NAND;
65 + bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_NAND;
66 + break;
67 case STRAPBUS_6368_BOOT_SEL_SERIAL:
68 - return BCM63XX_FLASH_TYPE_SERIAL;
69 + bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_SERIAL;
70 + break;
71 case STRAPBUS_6368_BOOT_SEL_PARALLEL:
72 - return BCM63XX_FLASH_TYPE_PARALLEL;
73 + bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_PARALLEL;
74 + break;
75 + default:
76 + return -EINVAL;
77 }
78 default:
79 return -EINVAL;
80 }
81 +
82 + return 0;
83 }
84
85 int __init bcm63xx_flash_register(void)
86 {
87 - int flash_type;
88 u32 val;
89
90 - flash_type = bcm63xx_detect_flash_type();
91
92 - switch (flash_type) {
93 + bcm63xx_detect_flash_type();
94 +
95 + switch (bcm63xx_attached_flash) {
96 case BCM63XX_FLASH_TYPE_PARALLEL:
97 /* read base address of boot chip select (0) */
98 val = bcm_mpi_readl(MPI_CSBASE_REG(0));
99 @@ -154,7 +167,7 @@ int __init bcm63xx_flash_register(void)
100 return -ENODEV;
101 default:
102 pr_err("flash detection failed for BCM%x: %d\n",
103 - bcm63xx_get_cpu_id(), flash_type);
104 + bcm63xx_get_cpu_id(), bcm63xx_attached_flash);
105 return -ENODEV;
106 }
107 }
108 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h
109 +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h
110 @@ -7,6 +7,8 @@ enum {
111 BCM63XX_FLASH_TYPE_NAND,
112 };
113
114 +extern int bcm63xx_attached_flash;
115 +
116 int __init bcm63xx_flash_register(void);
117
118 #endif /* __BCM63XX_FLASH_H */