Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: ARM: 6535/1: V6 MPCore v6_dma_inv_range and v6_dma_flush_range RWFO fix ARM: 6534/1: Make CONFIG_FPE_NWFPE depend on !CONFIG_THUMB2_KERNEL ARM: 6533/1: Thumb-2: Make CONFIG_THUMB2_KERNEL depend on !CPU_V6 Change bcmring Maintainer list. ARM: Update mach-types ARM: 6528/1: Use CTR for the I-cache line size on ARMv7 ARM: 6527/1: Use CTR instead of CCSIDR for the D-cache line size on ARMv7 ARM: pxa/palm: fix ifdef around gen_nand driver registration ARM: pxa: fix pxa2xx-flash section mismatch ARM: mmp2: remove not used clk_rtc
This commit is contained in:
commit
fc47e672ee
|
@ -559,14 +559,14 @@ W: http://maxim.org.za/at91_26.html
|
||||||
S: Maintained
|
S: Maintained
|
||||||
|
|
||||||
ARM/BCMRING ARM ARCHITECTURE
|
ARM/BCMRING ARM ARCHITECTURE
|
||||||
M: Leo Chen <leochen@broadcom.com>
|
M: Jiandong Zheng <jdzheng@broadcom.com>
|
||||||
M: Scott Branden <sbranden@broadcom.com>
|
M: Scott Branden <sbranden@broadcom.com>
|
||||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: arch/arm/mach-bcmring
|
F: arch/arm/mach-bcmring
|
||||||
|
|
||||||
ARM/BCMRING MTD NAND DRIVER
|
ARM/BCMRING MTD NAND DRIVER
|
||||||
M: Leo Chen <leochen@broadcom.com>
|
M: Jiandong Zheng <jdzheng@broadcom.com>
|
||||||
M: Scott Branden <sbranden@broadcom.com>
|
M: Scott Branden <sbranden@broadcom.com>
|
||||||
L: linux-mtd@lists.infradead.org
|
L: linux-mtd@lists.infradead.org
|
||||||
S: Maintained
|
S: Maintained
|
||||||
|
|
|
@ -1311,7 +1311,7 @@ config HZ
|
||||||
|
|
||||||
config THUMB2_KERNEL
|
config THUMB2_KERNEL
|
||||||
bool "Compile the kernel in Thumb-2 mode"
|
bool "Compile the kernel in Thumb-2 mode"
|
||||||
depends on CPU_V7 && EXPERIMENTAL
|
depends on CPU_V7 && !CPU_V6 && EXPERIMENTAL
|
||||||
select AEABI
|
select AEABI
|
||||||
select ARM_ASM_UNIFIED
|
select ARM_ASM_UNIFIED
|
||||||
help
|
help
|
||||||
|
@ -1759,7 +1759,7 @@ comment "At least one emulation must be selected"
|
||||||
|
|
||||||
config FPE_NWFPE
|
config FPE_NWFPE
|
||||||
bool "NWFPE math emulation"
|
bool "NWFPE math emulation"
|
||||||
depends on !AEABI || OABI_COMPAT
|
depends on (!AEABI || OABI_COMPAT) && !THUMB2_KERNEL
|
||||||
---help---
|
---help---
|
||||||
Say Y to include the NWFPE floating point emulator in the kernel.
|
Say Y to include the NWFPE floating point emulator in the kernel.
|
||||||
This is necessary to run most binaries. Linux does not currently
|
This is necessary to run most binaries. Linux does not currently
|
||||||
|
|
|
@ -126,7 +126,6 @@ static APBC_CLK(twsi3, MMP2_TWSI3, 0, 26000000);
|
||||||
static APBC_CLK(twsi4, MMP2_TWSI4, 0, 26000000);
|
static APBC_CLK(twsi4, MMP2_TWSI4, 0, 26000000);
|
||||||
static APBC_CLK(twsi5, MMP2_TWSI5, 0, 26000000);
|
static APBC_CLK(twsi5, MMP2_TWSI5, 0, 26000000);
|
||||||
static APBC_CLK(twsi6, MMP2_TWSI6, 0, 26000000);
|
static APBC_CLK(twsi6, MMP2_TWSI6, 0, 26000000);
|
||||||
static APBC_CLK(rtc, MMP2_RTC, 0, 32768);
|
|
||||||
|
|
||||||
static APMU_CLK(nand, NAND, 0xbf, 100000000);
|
static APMU_CLK(nand, NAND, 0xbf, 100000000);
|
||||||
|
|
||||||
|
|
|
@ -241,7 +241,8 @@ static inline void palmtx_keys_init(void) {}
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* NAND Flash
|
* NAND Flash
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
#if defined(CONFIG_MTD_NAND_GPIO) || defined(CONFIG_MTD_NAND_GPIO_MODULE)
|
#if defined(CONFIG_MTD_NAND_PLATFORM) || \
|
||||||
|
defined(CONFIG_MTD_NAND_PLATFORM_MODULE)
|
||||||
static void palmtx_nand_cmd_ctl(struct mtd_info *mtd, int cmd,
|
static void palmtx_nand_cmd_ctl(struct mtd_info *mtd, int cmd,
|
||||||
unsigned int ctrl)
|
unsigned int ctrl)
|
||||||
{
|
{
|
||||||
|
|
|
@ -203,6 +203,10 @@ ENTRY(v6_flush_kern_dcache_area)
|
||||||
* - end - virtual end address of region
|
* - end - virtual end address of region
|
||||||
*/
|
*/
|
||||||
v6_dma_inv_range:
|
v6_dma_inv_range:
|
||||||
|
#ifdef CONFIG_DMA_CACHE_RWFO
|
||||||
|
ldrb r2, [r0] @ read for ownership
|
||||||
|
strb r2, [r0] @ write for ownership
|
||||||
|
#endif
|
||||||
tst r0, #D_CACHE_LINE_SIZE - 1
|
tst r0, #D_CACHE_LINE_SIZE - 1
|
||||||
bic r0, r0, #D_CACHE_LINE_SIZE - 1
|
bic r0, r0, #D_CACHE_LINE_SIZE - 1
|
||||||
#ifdef HARVARD_CACHE
|
#ifdef HARVARD_CACHE
|
||||||
|
@ -211,6 +215,10 @@ v6_dma_inv_range:
|
||||||
mcrne p15, 0, r0, c7, c11, 1 @ clean unified line
|
mcrne p15, 0, r0, c7, c11, 1 @ clean unified line
|
||||||
#endif
|
#endif
|
||||||
tst r1, #D_CACHE_LINE_SIZE - 1
|
tst r1, #D_CACHE_LINE_SIZE - 1
|
||||||
|
#ifdef CONFIG_DMA_CACHE_RWFO
|
||||||
|
ldrneb r2, [r1, #-1] @ read for ownership
|
||||||
|
strneb r2, [r1, #-1] @ write for ownership
|
||||||
|
#endif
|
||||||
bic r1, r1, #D_CACHE_LINE_SIZE - 1
|
bic r1, r1, #D_CACHE_LINE_SIZE - 1
|
||||||
#ifdef HARVARD_CACHE
|
#ifdef HARVARD_CACHE
|
||||||
mcrne p15, 0, r1, c7, c14, 1 @ clean & invalidate D line
|
mcrne p15, 0, r1, c7, c14, 1 @ clean & invalidate D line
|
||||||
|
@ -218,10 +226,6 @@ v6_dma_inv_range:
|
||||||
mcrne p15, 0, r1, c7, c15, 1 @ clean & invalidate unified line
|
mcrne p15, 0, r1, c7, c15, 1 @ clean & invalidate unified line
|
||||||
#endif
|
#endif
|
||||||
1:
|
1:
|
||||||
#ifdef CONFIG_DMA_CACHE_RWFO
|
|
||||||
ldr r2, [r0] @ read for ownership
|
|
||||||
str r2, [r0] @ write for ownership
|
|
||||||
#endif
|
|
||||||
#ifdef HARVARD_CACHE
|
#ifdef HARVARD_CACHE
|
||||||
mcr p15, 0, r0, c7, c6, 1 @ invalidate D line
|
mcr p15, 0, r0, c7, c6, 1 @ invalidate D line
|
||||||
#else
|
#else
|
||||||
|
@ -229,6 +233,10 @@ v6_dma_inv_range:
|
||||||
#endif
|
#endif
|
||||||
add r0, r0, #D_CACHE_LINE_SIZE
|
add r0, r0, #D_CACHE_LINE_SIZE
|
||||||
cmp r0, r1
|
cmp r0, r1
|
||||||
|
#ifdef CONFIG_DMA_CACHE_RWFO
|
||||||
|
ldrlo r2, [r0] @ read for ownership
|
||||||
|
strlo r2, [r0] @ write for ownership
|
||||||
|
#endif
|
||||||
blo 1b
|
blo 1b
|
||||||
mov r0, #0
|
mov r0, #0
|
||||||
mcr p15, 0, r0, c7, c10, 4 @ drain write buffer
|
mcr p15, 0, r0, c7, c10, 4 @ drain write buffer
|
||||||
|
@ -263,12 +271,12 @@ v6_dma_clean_range:
|
||||||
* - end - virtual end address of region
|
* - end - virtual end address of region
|
||||||
*/
|
*/
|
||||||
ENTRY(v6_dma_flush_range)
|
ENTRY(v6_dma_flush_range)
|
||||||
|
#ifdef CONFIG_DMA_CACHE_RWFO
|
||||||
|
ldrb r2, [r0] @ read for ownership
|
||||||
|
strb r2, [r0] @ write for ownership
|
||||||
|
#endif
|
||||||
bic r0, r0, #D_CACHE_LINE_SIZE - 1
|
bic r0, r0, #D_CACHE_LINE_SIZE - 1
|
||||||
1:
|
1:
|
||||||
#ifdef CONFIG_DMA_CACHE_RWFO
|
|
||||||
ldr r2, [r0] @ read for ownership
|
|
||||||
str r2, [r0] @ write for ownership
|
|
||||||
#endif
|
|
||||||
#ifdef HARVARD_CACHE
|
#ifdef HARVARD_CACHE
|
||||||
mcr p15, 0, r0, c7, c14, 1 @ clean & invalidate D line
|
mcr p15, 0, r0, c7, c14, 1 @ clean & invalidate D line
|
||||||
#else
|
#else
|
||||||
|
@ -276,6 +284,10 @@ ENTRY(v6_dma_flush_range)
|
||||||
#endif
|
#endif
|
||||||
add r0, r0, #D_CACHE_LINE_SIZE
|
add r0, r0, #D_CACHE_LINE_SIZE
|
||||||
cmp r0, r1
|
cmp r0, r1
|
||||||
|
#ifdef CONFIG_DMA_CACHE_RWFO
|
||||||
|
ldrlob r2, [r0] @ read for ownership
|
||||||
|
strlob r2, [r0] @ write for ownership
|
||||||
|
#endif
|
||||||
blo 1b
|
blo 1b
|
||||||
mov r0, #0
|
mov r0, #0
|
||||||
mcr p15, 0, r0, c7, c10, 4 @ drain write buffer
|
mcr p15, 0, r0, c7, c10, 4 @ drain write buffer
|
||||||
|
|
|
@ -173,15 +173,22 @@ ENTRY(v7_coherent_user_range)
|
||||||
UNWIND(.fnstart )
|
UNWIND(.fnstart )
|
||||||
dcache_line_size r2, r3
|
dcache_line_size r2, r3
|
||||||
sub r3, r2, #1
|
sub r3, r2, #1
|
||||||
bic r0, r0, r3
|
bic r12, r0, r3
|
||||||
1:
|
1:
|
||||||
USER( mcr p15, 0, r0, c7, c11, 1 ) @ clean D line to the point of unification
|
USER( mcr p15, 0, r12, c7, c11, 1 ) @ clean D line to the point of unification
|
||||||
dsb
|
add r12, r12, r2
|
||||||
USER( mcr p15, 0, r0, c7, c5, 1 ) @ invalidate I line
|
cmp r12, r1
|
||||||
add r0, r0, r2
|
|
||||||
2:
|
|
||||||
cmp r0, r1
|
|
||||||
blo 1b
|
blo 1b
|
||||||
|
dsb
|
||||||
|
icache_line_size r2, r3
|
||||||
|
sub r3, r2, #1
|
||||||
|
bic r12, r0, r3
|
||||||
|
2:
|
||||||
|
USER( mcr p15, 0, r12, c7, c5, 1 ) @ invalidate I line
|
||||||
|
add r12, r12, r2
|
||||||
|
cmp r12, r1
|
||||||
|
blo 2b
|
||||||
|
3:
|
||||||
mov r0, #0
|
mov r0, #0
|
||||||
ALT_SMP(mcr p15, 0, r0, c7, c1, 6) @ invalidate BTB Inner Shareable
|
ALT_SMP(mcr p15, 0, r0, c7, c1, 6) @ invalidate BTB Inner Shareable
|
||||||
ALT_UP(mcr p15, 0, r0, c7, c5, 6) @ invalidate BTB
|
ALT_UP(mcr p15, 0, r0, c7, c5, 6) @ invalidate BTB
|
||||||
|
@ -194,10 +201,10 @@ ENTRY(v7_coherent_user_range)
|
||||||
* isn't mapped, just try the next page.
|
* isn't mapped, just try the next page.
|
||||||
*/
|
*/
|
||||||
9001:
|
9001:
|
||||||
mov r0, r0, lsr #12
|
mov r12, r12, lsr #12
|
||||||
mov r0, r0, lsl #12
|
mov r12, r12, lsl #12
|
||||||
add r0, r0, #4096
|
add r12, r12, #4096
|
||||||
b 2b
|
b 3b
|
||||||
UNWIND(.fnend )
|
UNWIND(.fnend )
|
||||||
ENDPROC(v7_coherent_kern_range)
|
ENDPROC(v7_coherent_kern_range)
|
||||||
ENDPROC(v7_coherent_user_range)
|
ENDPROC(v7_coherent_user_range)
|
||||||
|
|
|
@ -61,17 +61,27 @@
|
||||||
.endm
|
.endm
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* cache_line_size - get the cache line size from the CSIDR register
|
* dcache_line_size - get the minimum D-cache line size from the CTR register
|
||||||
* (available on ARMv7+). It assumes that the CSSR register was configured
|
* on ARMv7.
|
||||||
* to access the L1 data cache CSIDR.
|
|
||||||
*/
|
*/
|
||||||
.macro dcache_line_size, reg, tmp
|
.macro dcache_line_size, reg, tmp
|
||||||
mrc p15, 1, \tmp, c0, c0, 0 @ read CSIDR
|
mrc p15, 0, \tmp, c0, c0, 1 @ read ctr
|
||||||
and \tmp, \tmp, #7 @ cache line size encoding
|
lsr \tmp, \tmp, #16
|
||||||
mov \reg, #16 @ size offset
|
and \tmp, \tmp, #0xf @ cache line size encoding
|
||||||
|
mov \reg, #4 @ bytes per word
|
||||||
mov \reg, \reg, lsl \tmp @ actual cache line size
|
mov \reg, \reg, lsl \tmp @ actual cache line size
|
||||||
.endm
|
.endm
|
||||||
|
|
||||||
|
/*
|
||||||
|
* icache_line_size - get the minimum I-cache line size from the CTR register
|
||||||
|
* on ARMv7.
|
||||||
|
*/
|
||||||
|
.macro icache_line_size, reg, tmp
|
||||||
|
mrc p15, 0, \tmp, c0, c0, 1 @ read ctr
|
||||||
|
and \tmp, \tmp, #0xf @ cache line size encoding
|
||||||
|
mov \reg, #4 @ bytes per word
|
||||||
|
mov \reg, \reg, lsl \tmp @ actual cache line size
|
||||||
|
.endm
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Sanity check the PTE configuration for the code below - which makes
|
* Sanity check the PTE configuration for the code below - which makes
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
#
|
#
|
||||||
# http://www.arm.linux.org.uk/developer/machines/?action=new
|
# http://www.arm.linux.org.uk/developer/machines/?action=new
|
||||||
#
|
#
|
||||||
# Last update: Thu Sep 9 22:43:01 2010
|
# Last update: Sun Dec 12 23:24:27 2010
|
||||||
#
|
#
|
||||||
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
|
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
|
||||||
#
|
#
|
||||||
|
@ -2321,7 +2321,7 @@ mx31txtr MACH_MX31TXTR MX31TXTR 2332
|
||||||
u380 MACH_U380 U380 2333
|
u380 MACH_U380 U380 2333
|
||||||
oamp3_hualu MACH_HUALU_BOARD HUALU_BOARD 2334
|
oamp3_hualu MACH_HUALU_BOARD HUALU_BOARD 2334
|
||||||
npcmx50 MACH_NPCMX50 NPCMX50 2335
|
npcmx50 MACH_NPCMX50 NPCMX50 2335
|
||||||
mx51_lange51 MACH_MX51_LANGE51 MX51_LANGE51 2336
|
mx51_efikamx MACH_MX51_EFIKAMX MX51_EFIKAMX 2336
|
||||||
mx51_lange52 MACH_MX51_LANGE52 MX51_LANGE52 2337
|
mx51_lange52 MACH_MX51_LANGE52 MX51_LANGE52 2337
|
||||||
riom MACH_RIOM RIOM 2338
|
riom MACH_RIOM RIOM 2338
|
||||||
comcas MACH_COMCAS COMCAS 2339
|
comcas MACH_COMCAS COMCAS 2339
|
||||||
|
@ -2355,7 +2355,7 @@ at91sam9263cs MACH_AT91SAM9263CS AT91SAM9263CS 2366
|
||||||
csb732 MACH_CSB732 CSB732 2367
|
csb732 MACH_CSB732 CSB732 2367
|
||||||
u8500 MACH_U8500 U8500 2368
|
u8500 MACH_U8500 U8500 2368
|
||||||
huqiu MACH_HUQIU HUQIU 2369
|
huqiu MACH_HUQIU HUQIU 2369
|
||||||
mx51_kunlun MACH_MX51_KUNLUN MX51_KUNLUN 2370
|
mx51_efikasb MACH_MX51_EFIKASB MX51_EFIKASB 2370
|
||||||
pmt1g MACH_PMT1G PMT1G 2371
|
pmt1g MACH_PMT1G PMT1G 2371
|
||||||
htcelf MACH_HTCELF HTCELF 2372
|
htcelf MACH_HTCELF HTCELF 2372
|
||||||
armadillo420 MACH_ARMADILLO420 ARMADILLO420 2373
|
armadillo420 MACH_ARMADILLO420 ARMADILLO420 2373
|
||||||
|
@ -2971,7 +2971,7 @@ premierwave_en MACH_PREMIERWAVE_EN PREMIERWAVE_EN 2985
|
||||||
wasabi MACH_WASABI WASABI 2986
|
wasabi MACH_WASABI WASABI 2986
|
||||||
vivow MACH_VIVOW VIVOW 2987
|
vivow MACH_VIVOW VIVOW 2987
|
||||||
mx50_rdp MACH_MX50_RDP MX50_RDP 2988
|
mx50_rdp MACH_MX50_RDP MX50_RDP 2988
|
||||||
universal MACH_UNIVERSAL UNIVERSAL 2989
|
universal_c210 MACH_UNIVERSAL_C210 UNIVERSAL_C210 2989
|
||||||
real6410 MACH_REAL6410 REAL6410 2990
|
real6410 MACH_REAL6410 REAL6410 2990
|
||||||
spx_sakura MACH_SPX_SAKURA SPX_SAKURA 2991
|
spx_sakura MACH_SPX_SAKURA SPX_SAKURA 2991
|
||||||
ij3k_2440 MACH_IJ3K_2440 IJ3K_2440 2992
|
ij3k_2440 MACH_IJ3K_2440 IJ3K_2440 2992
|
||||||
|
@ -3044,3 +3044,178 @@ harvest_desoto MACH_HARVEST_DESOTO HARVEST_DESOTO 3059
|
||||||
msm8x60_qrdc MACH_MSM8X60_QRDC MSM8X60_QRDC 3060
|
msm8x60_qrdc MACH_MSM8X60_QRDC MSM8X60_QRDC 3060
|
||||||
spear900 MACH_SPEAR900 SPEAR900 3061
|
spear900 MACH_SPEAR900 SPEAR900 3061
|
||||||
pcontrol_g20 MACH_PCONTROL_G20 PCONTROL_G20 3062
|
pcontrol_g20 MACH_PCONTROL_G20 PCONTROL_G20 3062
|
||||||
|
rdstor MACH_RDSTOR RDSTOR 3063
|
||||||
|
usdloader MACH_USDLOADER USDLOADER 3064
|
||||||
|
tsoploader MACH_TSOPLOADER TSOPLOADER 3065
|
||||||
|
kronos MACH_KRONOS KRONOS 3066
|
||||||
|
ffcore MACH_FFCORE FFCORE 3067
|
||||||
|
mone MACH_MONE MONE 3068
|
||||||
|
unit2s MACH_UNIT2S UNIT2S 3069
|
||||||
|
acer_a5 MACH_ACER_A5 ACER_A5 3070
|
||||||
|
etherpro_isp MACH_ETHERPRO_ISP ETHERPRO_ISP 3071
|
||||||
|
stretchs7000 MACH_STRETCHS7000 STRETCHS7000 3072
|
||||||
|
p87_smartsim MACH_P87_SMARTSIM P87_SMARTSIM 3073
|
||||||
|
tulip MACH_TULIP TULIP 3074
|
||||||
|
sunflower MACH_SUNFLOWER SUNFLOWER 3075
|
||||||
|
rib MACH_RIB RIB 3076
|
||||||
|
clod MACH_CLOD CLOD 3077
|
||||||
|
rump MACH_RUMP RUMP 3078
|
||||||
|
tenderloin MACH_TENDERLOIN TENDERLOIN 3079
|
||||||
|
shortloin MACH_SHORTLOIN SHORTLOIN 3080
|
||||||
|
crespo MACH_CRESPO CRESPO 3081
|
||||||
|
antares MACH_ANTARES ANTARES 3082
|
||||||
|
wb40n MACH_WB40N WB40N 3083
|
||||||
|
herring MACH_HERRING HERRING 3084
|
||||||
|
naxy400 MACH_NAXY400 NAXY400 3085
|
||||||
|
naxy1200 MACH_NAXY1200 NAXY1200 3086
|
||||||
|
vpr200 MACH_VPR200 VPR200 3087
|
||||||
|
bug20 MACH_BUG20 BUG20 3088
|
||||||
|
goflexnet MACH_GOFLEXNET GOFLEXNET 3089
|
||||||
|
torbreck MACH_TORBRECK TORBRECK 3090
|
||||||
|
saarb_mg1 MACH_SAARB_MG1 SAARB_MG1 3091
|
||||||
|
callisto MACH_CALLISTO CALLISTO 3092
|
||||||
|
multhsu MACH_MULTHSU MULTHSU 3093
|
||||||
|
saluda MACH_SALUDA SALUDA 3094
|
||||||
|
pemp_omap3_apollo MACH_PEMP_OMAP3_APOLLO PEMP_OMAP3_APOLLO 3095
|
||||||
|
vc0718 MACH_VC0718 VC0718 3096
|
||||||
|
mvblx MACH_MVBLX MVBLX 3097
|
||||||
|
inhand_apeiron MACH_INHAND_APEIRON INHAND_APEIRON 3098
|
||||||
|
inhand_fury MACH_INHAND_FURY INHAND_FURY 3099
|
||||||
|
inhand_siren MACH_INHAND_SIREN INHAND_SIREN 3100
|
||||||
|
hdnvp MACH_HDNVP HDNVP 3101
|
||||||
|
softwinner MACH_SOFTWINNER SOFTWINNER 3102
|
||||||
|
prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103
|
||||||
|
nas6210 MACH_NAS6210 NAS6210 3104
|
||||||
|
unisdev MACH_UNISDEV UNISDEV 3105
|
||||||
|
sbca11 MACH_SBCA11 SBCA11 3106
|
||||||
|
saga MACH_SAGA SAGA 3107
|
||||||
|
ns_k330 MACH_NS_K330 NS_K330 3108
|
||||||
|
tanna MACH_TANNA TANNA 3109
|
||||||
|
imate8502 MACH_IMATE8502 IMATE8502 3110
|
||||||
|
aspen MACH_ASPEN ASPEN 3111
|
||||||
|
daintree_cwac MACH_DAINTREE_CWAC DAINTREE_CWAC 3112
|
||||||
|
zmx25 MACH_ZMX25 ZMX25 3113
|
||||||
|
maple1 MACH_MAPLE1 MAPLE1 3114
|
||||||
|
qsd8x72_surf MACH_QSD8X72_SURF QSD8X72_SURF 3115
|
||||||
|
qsd8x72_ffa MACH_QSD8X72_FFA QSD8X72_FFA 3116
|
||||||
|
abilene MACH_ABILENE ABILENE 3117
|
||||||
|
eigen_ttr MACH_EIGEN_TTR EIGEN_TTR 3118
|
||||||
|
iomega_ix2_200 MACH_IOMEGA_IX2_200 IOMEGA_IX2_200 3119
|
||||||
|
coretec_vcx7400 MACH_CORETEC_VCX7400 CORETEC_VCX7400 3120
|
||||||
|
santiago MACH_SANTIAGO SANTIAGO 3121
|
||||||
|
mx257sol MACH_MX257SOL MX257SOL 3122
|
||||||
|
strasbourg MACH_STRASBOURG STRASBOURG 3123
|
||||||
|
msm8x60_fluid MACH_MSM8X60_FLUID MSM8X60_FLUID 3124
|
||||||
|
smartqv5 MACH_SMARTQV5 SMARTQV5 3125
|
||||||
|
smartqv3 MACH_SMARTQV3 SMARTQV3 3126
|
||||||
|
smartqv7 MACH_SMARTQV7 SMARTQV7 3127
|
||||||
|
paz00 MACH_PAZ00 PAZ00 3128
|
||||||
|
acmenetusfoxg20 MACH_ACMENETUSFOXG20 ACMENETUSFOXG20 3129
|
||||||
|
htcwillow MACH_HTCWILLOW HTCWILLOW 3130
|
||||||
|
fwbd_0404 MACH_FWBD_0404 FWBD_0404 3131
|
||||||
|
hdgu MACH_HDGU HDGU 3132
|
||||||
|
pyramid MACH_PYRAMID PYRAMID 3133
|
||||||
|
epiphan MACH_EPIPHAN EPIPHAN 3134
|
||||||
|
omap_bender MACH_OMAP_BENDER OMAP_BENDER 3135
|
||||||
|
gurnard MACH_GURNARD GURNARD 3136
|
||||||
|
gtl_it5100 MACH_GTL_IT5100 GTL_IT5100 3137
|
||||||
|
bcm2708 MACH_BCM2708 BCM2708 3138
|
||||||
|
mx51_ggc MACH_MX51_GGC MX51_GGC 3139
|
||||||
|
sharespace MACH_SHARESPACE SHARESPACE 3140
|
||||||
|
haba_knx_explorer MACH_HABA_KNX_EXPLORER HABA_KNX_EXPLORER 3141
|
||||||
|
simtec_kirkmod MACH_SIMTEC_KIRKMOD SIMTEC_KIRKMOD 3142
|
||||||
|
crux MACH_CRUX CRUX 3143
|
||||||
|
mx51_bravo MACH_MX51_BRAVO MX51_BRAVO 3144
|
||||||
|
charon MACH_CHARON CHARON 3145
|
||||||
|
picocom3 MACH_PICOCOM3 PICOCOM3 3146
|
||||||
|
picocom4 MACH_PICOCOM4 PICOCOM4 3147
|
||||||
|
serrano MACH_SERRANO SERRANO 3148
|
||||||
|
doubleshot MACH_DOUBLESHOT DOUBLESHOT 3149
|
||||||
|
evsy MACH_EVSY EVSY 3150
|
||||||
|
huashan MACH_HUASHAN HUASHAN 3151
|
||||||
|
lausanne MACH_LAUSANNE LAUSANNE 3152
|
||||||
|
emerald MACH_EMERALD EMERALD 3153
|
||||||
|
tqma35 MACH_TQMA35 TQMA35 3154
|
||||||
|
marvel MACH_MARVEL MARVEL 3155
|
||||||
|
manuae MACH_MANUAE MANUAE 3156
|
||||||
|
chacha MACH_CHACHA CHACHA 3157
|
||||||
|
lemon MACH_LEMON LEMON 3158
|
||||||
|
csc MACH_CSC CSC 3159
|
||||||
|
gira_knxip_router MACH_GIRA_KNXIP_ROUTER GIRA_KNXIP_ROUTER 3160
|
||||||
|
t20 MACH_T20 T20 3161
|
||||||
|
hdmini MACH_HDMINI HDMINI 3162
|
||||||
|
sciphone_g2 MACH_SCIPHONE_G2 SCIPHONE_G2 3163
|
||||||
|
express MACH_EXPRESS EXPRESS 3164
|
||||||
|
express_kt MACH_EXPRESS_KT EXPRESS_KT 3165
|
||||||
|
maximasp MACH_MAXIMASP MAXIMASP 3166
|
||||||
|
nitrogen_imx51 MACH_NITROGEN_IMX51 NITROGEN_IMX51 3167
|
||||||
|
nitrogen_imx53 MACH_NITROGEN_IMX53 NITROGEN_IMX53 3168
|
||||||
|
sunfire MACH_SUNFIRE SUNFIRE 3169
|
||||||
|
arowana MACH_AROWANA AROWANA 3170
|
||||||
|
tegra_daytona MACH_TEGRA_DAYTONA TEGRA_DAYTONA 3171
|
||||||
|
tegra_swordfish MACH_TEGRA_SWORDFISH TEGRA_SWORDFISH 3172
|
||||||
|
edison MACH_EDISON EDISON 3173
|
||||||
|
svp8500v1 MACH_SVP8500V1 SVP8500V1 3174
|
||||||
|
svp8500v2 MACH_SVP8500V2 SVP8500V2 3175
|
||||||
|
svp5500 MACH_SVP5500 SVP5500 3176
|
||||||
|
b5500 MACH_B5500 B5500 3177
|
||||||
|
s5500 MACH_S5500 S5500 3178
|
||||||
|
icon MACH_ICON ICON 3179
|
||||||
|
elephant MACH_ELEPHANT ELEPHANT 3180
|
||||||
|
msm8x60_fusion MACH_MSM8X60_FUSION MSM8X60_FUSION 3181
|
||||||
|
shooter MACH_SHOOTER SHOOTER 3182
|
||||||
|
spade_lte MACH_SPADE_LTE SPADE_LTE 3183
|
||||||
|
philhwani MACH_PHILHWANI PHILHWANI 3184
|
||||||
|
gsncomm MACH_GSNCOMM GSNCOMM 3185
|
||||||
|
strasbourg_a2 MACH_STRASBOURG_A2 STRASBOURG_A2 3186
|
||||||
|
mmm MACH_MMM MMM 3187
|
||||||
|
davinci_dm365_bv MACH_DAVINCI_DM365_BV DAVINCI_DM365_BV 3188
|
||||||
|
ag5evm MACH_AG5EVM AG5EVM 3189
|
||||||
|
sc575plc MACH_SC575PLC SC575PLC 3190
|
||||||
|
sc575hmi MACH_SC575IPC SC575IPC 3191
|
||||||
|
omap3_tdm3730 MACH_OMAP3_TDM3730 OMAP3_TDM3730 3192
|
||||||
|
g7 MACH_G7 G7 3193
|
||||||
|
top9000_eval MACH_TOP9000_EVAL TOP9000_EVAL 3194
|
||||||
|
top9000_su MACH_TOP9000_SU TOP9000_SU 3195
|
||||||
|
utm300 MACH_UTM300 UTM300 3196
|
||||||
|
tsunagi MACH_TSUNAGI TSUNAGI 3197
|
||||||
|
ts75xx MACH_TS75XX TS75XX 3198
|
||||||
|
msm8x60_fusn_ffa MACH_MSM8X60_FUSN_FFA MSM8X60_FUSN_FFA 3199
|
||||||
|
ts47xx MACH_TS47XX TS47XX 3200
|
||||||
|
da850_k5 MACH_DA850_K5 DA850_K5 3201
|
||||||
|
ax502 MACH_AX502 AX502 3202
|
||||||
|
igep0032 MACH_IGEP0032 IGEP0032 3203
|
||||||
|
antero MACH_ANTERO ANTERO 3204
|
||||||
|
synergy MACH_SYNERGY SYNERGY 3205
|
||||||
|
ics_if_voip MACH_ICS_IF_VOIP ICS_IF_VOIP 3206
|
||||||
|
wlf_cragg_6410 MACH_WLF_CRAGG_6410 WLF_CRAGG_6410 3207
|
||||||
|
punica MACH_PUNICA PUNICA 3208
|
||||||
|
sbc_nt250 MACH_SBC_NT250 SBC_NT250 3209
|
||||||
|
mx27_wmultra MACH_MX27_WMULTRA MX27_WMULTRA 3210
|
||||||
|
mackerel MACH_MACKEREL MACKEREL 3211
|
||||||
|
fa9x27 MACH_FA9X27 FA9X27 3213
|
||||||
|
ns2816tb MACH_NS2816TB NS2816TB 3214
|
||||||
|
ns2816_ntpad MACH_NS2816_NTPAD NS2816_NTPAD 3215
|
||||||
|
ns2816_ntnb MACH_NS2816_NTNB NS2816_NTNB 3216
|
||||||
|
kaen MACH_KAEN KAEN 3217
|
||||||
|
nv1000 MACH_NV1000 NV1000 3218
|
||||||
|
nuc950ts MACH_NUC950TS NUC950TS 3219
|
||||||
|
nokia_rm680 MACH_NOKIA_RM680 NOKIA_RM680 3220
|
||||||
|
ast2200 MACH_AST2200 AST2200 3221
|
||||||
|
lead MACH_LEAD LEAD 3222
|
||||||
|
unino1 MACH_UNINO1 UNINO1 3223
|
||||||
|
greeco MACH_GREECO GREECO 3224
|
||||||
|
verdi MACH_VERDI VERDI 3225
|
||||||
|
dm6446_adbox MACH_DM6446_ADBOX DM6446_ADBOX 3226
|
||||||
|
quad_salsa MACH_QUAD_SALSA QUAD_SALSA 3227
|
||||||
|
abb_gma_1_1 MACH_ABB_GMA_1_1 ABB_GMA_1_1 3228
|
||||||
|
svcid MACH_SVCID SVCID 3229
|
||||||
|
msm8960_sim MACH_MSM8960_SIM MSM8960_SIM 3230
|
||||||
|
msm8960_rumi3 MACH_MSM8960_RUMI3 MSM8960_RUMI3 3231
|
||||||
|
icon_g MACH_ICON_G ICON_G 3232
|
||||||
|
mb3 MACH_MB3 MB3 3233
|
||||||
|
gsia18s MACH_GSIA18S GSIA18S 3234
|
||||||
|
pivicc MACH_PIVICC PIVICC 3235
|
||||||
|
pcm048 MACH_PCM048 PCM048 3236
|
||||||
|
dds MACH_DDS DDS 3237
|
||||||
|
chalten_xa1 MACH_CHALTEN_XA1 CHALTEN_XA1 3238
|
||||||
|
|
|
@ -51,7 +51,7 @@ struct pxa2xx_flash_info {
|
||||||
static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
|
static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
|
||||||
|
|
||||||
|
|
||||||
static int __init pxa2xx_flash_probe(struct platform_device *pdev)
|
static int __devinit pxa2xx_flash_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct flash_platform_data *flash = pdev->dev.platform_data;
|
struct flash_platform_data *flash = pdev->dev.platform_data;
|
||||||
struct pxa2xx_flash_info *info;
|
struct pxa2xx_flash_info *info;
|
||||||
|
|
Loading…
Reference in New Issue