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
author: Linus Torvalds <torvalds@linux-foundation.org> 2010-12-14 20:36:10 -0500
committer: Linus Torvalds <torvalds@linux-foundation.org> 2010-12-14 20:36:10 -0500
commit: fc47e672ee2a8dfcde7673997c8b1e0cec38e2c9 (patch)
tree: 28dea58dfef997fd9adfb637b04b5feaae9b8cc1 /arch
parent: 478b2a34e7d496b0cc3ae7696362740f954c91ba (diff)
parent: 85b093bcc5322baa811a03ec73de0909c157f181 (diff)
7 files changed, 236 insertions, 32 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f1d9297b1050..d56d21c0573b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1311,7 +1311,7 @@ config HZ
 config THUMB2_KERNEL
        bool "Compile the kernel in Thumb-2 mode"
-        depends on CPU_V7 && EXPERIMENTAL
+        depends on CPU_V7 && !CPU_V6 && EXPERIMENTAL
        select AEABI
        select ARM_ASM_UNIFIED
        help
@@ -1759,7 +1759,7 @@ comment "At least one emulation must be selected"
 config FPE_NWFPE
        bool "NWFPE math emulation"
-        depends on !AEABI || OABI_COMPAT
+        depends on (!AEABI || OABI_COMPAT) && !THUMB2_KERNEL
        ---help---
          Say Y to include the NWFPE floating point emulator in the kernel.
          This is necessary to run most binaries. Linux does not currently
diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c
index daf3993349f8..2e3dd08ccc3f 100644
--- a/arch/arm/mach-mmp/mmp2.c
+++ b/arch/arm/mach-mmp/mmp2.c
@@ -126,7 +126,6 @@ static APBC_CLK(twsi3, MMP2_TWSI3, 0, 26000000);
 static APBC_CLK(twsi4, MMP2_TWSI4, 0, 26000000);
 static APBC_CLK(twsi5, MMP2_TWSI5, 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);
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c
index d2060a1d1d68..e5c9932b7588 100644
--- a/arch/arm/mach-pxa/palmtx.c
+++ b/arch/arm/mach-pxa/palmtx.c
@@ -241,7 +241,8 @@ static inline void palmtx_keys_init(void) {}
 /******************************************************************************
 * 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,
                                 unsigned int ctrl)
 {
diff --git a/arch/arm/mm/cache-v6.S b/arch/arm/mm/cache-v6.S
index 99fa688dfadd..c96fa1b3f49f 100644
--- a/arch/arm/mm/cache-v6.S
+++ b/arch/arm/mm/cache-v6.S
@@ -203,6 +203,10 @@ ENTRY(v6_flush_kern_dcache_area)
 *      - end     - virtual end address of region
 */
 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
        bic     r0, r0, #D_CACHE_LINE_SIZE - 1
 #ifdef HARVARD_CACHE
@@ -211,6 +215,10 @@ v6_dma_inv_range:
        mcrne   p15, 0, r0, c7, c11, 1          @ clean unified line
 #endif
        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
 #ifdef HARVARD_CACHE
        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
 #endif
 1:
-#ifdef CONFIG_DMA_CACHE_RWFO
-        ldr     r2, [r0]                        @ read for ownership
-        str     r2, [r0]                        @ write for ownership
-#endif
 #ifdef HARVARD_CACHE
        mcr     p15, 0, r0, c7, c6, 1           @ invalidate D line
 #else
@@ -229,6 +233,10 @@ v6_dma_inv_range:
 #endif
        add     r0, r0, #D_CACHE_LINE_SIZE
        cmp     r0, r1
+#ifdef CONFIG_DMA_CACHE_RWFO
+        ldrlo   r2, [r0]                        @ read for ownership
+        strlo   r2, [r0]                        @ write for ownership
+#endif
        blo     1b
        mov     r0, #0
        mcr     p15, 0, r0, c7, c10, 4          @ drain write buffer
@@ -263,12 +271,12 @@ v6_dma_clean_range:
 *      - end     - virtual end address of region
 */
 ENTRY(v6_dma_flush_range)
-        bic     r0, r0, #D_CACHE_LINE_SIZE - 1
-1:
 #ifdef CONFIG_DMA_CACHE_RWFO
-        ldr     r2, [r0]                        @ read for ownership
+        ldrb    r2, [r0]                @ read for ownership
-        str     r2, [r0]                        @ write for ownership
+        strb    r2, [r0]                @ write for ownership
 #endif
+        bic     r0, r0, #D_CACHE_LINE_SIZE - 1
+1:
 #ifdef HARVARD_CACHE
        mcr     p15, 0, r0, c7, c14, 1          @ clean & invalidate D line
 #else
@@ -276,6 +284,10 @@ ENTRY(v6_dma_flush_range)
 #endif
        add     r0, r0, #D_CACHE_LINE_SIZE
        cmp     r0, r1
+#ifdef CONFIG_DMA_CACHE_RWFO
+        ldrlob  r2, [r0]                        @ read for ownership
+        strlob  r2, [r0]                        @ write for ownership
+#endif
        blo     1b
        mov     r0, #0
        mcr     p15, 0, r0, c7, c10, 4          @ drain write buffer
diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S
index a3ebf7a4f49b..6136e68ce953 100644
--- a/arch/arm/mm/cache-v7.S
+++ b/arch/arm/mm/cache-v7.S
@@ -173,15 +173,22 @@ ENTRY(v7_coherent_user_range)
 UNWIND(.fnstart                )
        dcache_line_size r2, r3
        sub     r3, r2, #1
-        bic     r0, r0, r3
+        bic     r12, r0, r3
 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
+        add     r12, r12, r2
+        cmp     r12, r1
+        blo     1b
        dsb
- USER(  mcr     p15, 0, r0, c7, c5, 1   )       @ invalidate I line
+        icache_line_size r2, r3
-        add     r0, r0, r2
+        sub     r3, r2, #1
+        bic     r12, r0, r3
 2:
-        cmp     r0, r1
+ USER(  mcr     p15, 0, r12, c7, c5, 1  )       @ invalidate I line
-        blo     1b
+        add     r12, r12, r2
+        cmp     r12, r1
+        blo     2b
+3:
        mov     r0, #0
        ALT_SMP(mcr     p15, 0, r0, c7, c1, 6)  @ invalidate BTB Inner Shareable
        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.
 */
 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          )
 ENDPROC(v7_coherent_kern_range)
 ENDPROC(v7_coherent_user_range)
diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S
index 7d63beaf9745..b795afd0a2c6 100644
--- a/arch/arm/mm/proc-macros.S
+++ b/arch/arm/mm/proc-macros.S
@@ -61,17 +61,27 @@
        .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
-        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
        .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
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index 55590a4d87c9..2fea897ebeb1 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -12,7 +12,7 @@
 #
 #   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
 #
@@ -2321,7 +2321,7 @@ mx31txtr		MACH_MX31TXTR		MX31TXTR		2332
 u380                    MACH_U380               U380                    2333
 oamp3_hualu             MACH_HUALU_BOARD        HUALU_BOARD             2334
 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
 riom                    MACH_RIOM               RIOM                    2338
 comcas                  MACH_COMCAS             COMCAS                  2339
@@ -2355,7 +2355,7 @@ at91sam9263cs		MACH_AT91SAM9263CS	AT91SAM9263CS		2366
 csb732                  MACH_CSB732             CSB732                  2367
 u8500                   MACH_U8500              U8500                   2368
 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
 htcelf                  MACH_HTCELF             HTCELF                  2372
 armadillo420            MACH_ARMADILLO420       ARMADILLO420            2373
@@ -2971,7 +2971,7 @@ premierwave_en		MACH_PREMIERWAVE_EN	PREMIERWAVE_EN		2985
 wasabi                  MACH_WASABI             WASABI                  2986
 vivow                   MACH_VIVOW              VIVOW                   2987
 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
 spx_sakura              MACH_SPX_SAKURA         SPX_SAKURA              2991
 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
 spear900                MACH_SPEAR900           SPEAR900                3061
 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
author	Linus Torvalds <torvalds@linux-foundation.org>	2010-12-14 20:36:10 -0500
committer	Linus Torvalds <torvalds@linux-foundation.org>	2010-12-14 20:36:10 -0500
commit	fc47e672ee2a8dfcde7673997c8b1e0cec38e2c9 (patch)
tree	28dea58dfef997fd9adfb637b04b5feaae9b8cc1 /arch
parent	478b2a34e7d496b0cc3ae7696362740f954c91ba (diff)
parent	85b093bcc5322baa811a03ec73de0909c157f181 (diff)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f1d9297b1050..d56d21c0573b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig
@@ -1311,7 +1311,7 @@ config HZ
1311		1311
1312	config THUMB2_KERNEL	1312	config THUMB2_KERNEL
1313	bool "Compile the kernel in Thumb-2 mode"	1313	bool "Compile the kernel in Thumb-2 mode"
1314	depends on CPU_V7 && EXPERIMENTAL	1314	depends on CPU_V7 && !CPU_V6 && EXPERIMENTAL
1315	select AEABI	1315	select AEABI
1316	select ARM_ASM_UNIFIED	1316	select ARM_ASM_UNIFIED
1317	help	1317	help
@@ -1759,7 +1759,7 @@ comment "At least one emulation must be selected"
1759		1759
1760	config FPE_NWFPE	1760	config FPE_NWFPE
1761	bool "NWFPE math emulation"	1761	bool "NWFPE math emulation"
1762	depends on !AEABI \|\| OABI_COMPAT	1762	depends on (!AEABI \|\| OABI_COMPAT) && !THUMB2_KERNEL
1763	---help---	1763	---help---
1764	Say Y to include the NWFPE floating point emulator in the kernel.	1764	Say Y to include the NWFPE floating point emulator in the kernel.
1765	This is necessary to run most binaries. Linux does not currently	1765	This is necessary to run most binaries. Linux does not currently


diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c index daf3993349f8..2e3dd08ccc3f 100644 --- a/arch/arm/mach-mmp/mmp2.c +++ b/arch/arm/mach-mmp/mmp2.c
@@ -126,7 +126,6 @@ static APBC_CLK(twsi3, MMP2_TWSI3, 0, 26000000);
126	static APBC_CLK(twsi4, MMP2_TWSI4, 0, 26000000);	126	static APBC_CLK(twsi4, MMP2_TWSI4, 0, 26000000);
127	static APBC_CLK(twsi5, MMP2_TWSI5, 0, 26000000);	127	static APBC_CLK(twsi5, MMP2_TWSI5, 0, 26000000);
128	static APBC_CLK(twsi6, MMP2_TWSI6, 0, 26000000);	128	static APBC_CLK(twsi6, MMP2_TWSI6, 0, 26000000);
129	static APBC_CLK(rtc, MMP2_RTC, 0, 32768);
130		129
131	static APMU_CLK(nand, NAND, 0xbf, 100000000);	130	static APMU_CLK(nand, NAND, 0xbf, 100000000);
132		131


diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c index d2060a1d1d68..e5c9932b7588 100644 --- a/arch/arm/mach-pxa/palmtx.c +++ b/arch/arm/mach-pxa/palmtx.c
@@ -241,7 +241,8 @@ static inline void palmtx_keys_init(void) {}
241	/******************************************************************************	241	/******************************************************************************
242	* NAND Flash	242	* NAND Flash
243	******************************************************************************/	243	******************************************************************************/
244	#if defined(CONFIG_MTD_NAND_GPIO) \|\| defined(CONFIG_MTD_NAND_GPIO_MODULE)	244	#if defined(CONFIG_MTD_NAND_PLATFORM) \|\| \
		245	defined(CONFIG_MTD_NAND_PLATFORM_MODULE)
245	static void palmtx_nand_cmd_ctl(struct mtd_info *mtd, int cmd,	246	static void palmtx_nand_cmd_ctl(struct mtd_info *mtd, int cmd,
246	unsigned int ctrl)	247	unsigned int ctrl)
247	{	248	{


diff --git a/arch/arm/mm/cache-v6.S b/arch/arm/mm/cache-v6.S index 99fa688dfadd..c96fa1b3f49f 100644 --- a/arch/arm/mm/cache-v6.S +++ b/arch/arm/mm/cache-v6.S
@@ -203,6 +203,10 @@ ENTRY(v6_flush_kern_dcache_area)
203	* - end - virtual end address of region	203	* - end - virtual end address of region
204	*/	204	*/
205	v6_dma_inv_range:	205	v6_dma_inv_range:
		206	#ifdef CONFIG_DMA_CACHE_RWFO
		207	ldrb r2, [r0] @ read for ownership
		208	strb r2, [r0] @ write for ownership
		209	#endif
206	tst r0, #D_CACHE_LINE_SIZE - 1	210	tst r0, #D_CACHE_LINE_SIZE - 1
207	bic r0, r0, #D_CACHE_LINE_SIZE - 1	211	bic r0, r0, #D_CACHE_LINE_SIZE - 1
208	#ifdef HARVARD_CACHE	212	#ifdef HARVARD_CACHE
@@ -211,6 +215,10 @@ v6_dma_inv_range:
211	mcrne p15, 0, r0, c7, c11, 1 @ clean unified line	215	mcrne p15, 0, r0, c7, c11, 1 @ clean unified line
212	#endif	216	#endif
213	tst r1, #D_CACHE_LINE_SIZE - 1	217	tst r1, #D_CACHE_LINE_SIZE - 1
		218	#ifdef CONFIG_DMA_CACHE_RWFO
		219	ldrneb r2, [r1, #-1] @ read for ownership
		220	strneb r2, [r1, #-1] @ write for ownership
		221	#endif
214	bic r1, r1, #D_CACHE_LINE_SIZE - 1	222	bic r1, r1, #D_CACHE_LINE_SIZE - 1
215	#ifdef HARVARD_CACHE	223	#ifdef HARVARD_CACHE
216	mcrne p15, 0, r1, c7, c14, 1 @ clean & invalidate D line	224	mcrne p15, 0, r1, c7, c14, 1 @ clean & invalidate D line
@@ -218,10 +226,6 @@ v6_dma_inv_range:
218	mcrne p15, 0, r1, c7, c15, 1 @ clean & invalidate unified line	226	mcrne p15, 0, r1, c7, c15, 1 @ clean & invalidate unified line
219	#endif	227	#endif
220	1:	228	1:
221	#ifdef CONFIG_DMA_CACHE_RWFO
222	ldr r2, [r0] @ read for ownership
223	str r2, [r0] @ write for ownership
224	#endif
225	#ifdef HARVARD_CACHE	229	#ifdef HARVARD_CACHE
226	mcr p15, 0, r0, c7, c6, 1 @ invalidate D line	230	mcr p15, 0, r0, c7, c6, 1 @ invalidate D line
227	#else	231	#else
@@ -229,6 +233,10 @@ v6_dma_inv_range:
229	#endif	233	#endif
230	add r0, r0, #D_CACHE_LINE_SIZE	234	add r0, r0, #D_CACHE_LINE_SIZE
231	cmp r0, r1	235	cmp r0, r1
		236	#ifdef CONFIG_DMA_CACHE_RWFO
		237	ldrlo r2, [r0] @ read for ownership
		238	strlo r2, [r0] @ write for ownership
		239	#endif
232	blo 1b	240	blo 1b
233	mov r0, #0	241	mov r0, #0
234	mcr p15, 0, r0, c7, c10, 4 @ drain write buffer	242	mcr p15, 0, r0, c7, c10, 4 @ drain write buffer
@@ -263,12 +271,12 @@ v6_dma_clean_range:
263	* - end - virtual end address of region	271	* - end - virtual end address of region
264	*/	272	*/
265	ENTRY(v6_dma_flush_range)	273	ENTRY(v6_dma_flush_range)
266	bic r0, r0, #D_CACHE_LINE_SIZE - 1
267	1:
268	#ifdef CONFIG_DMA_CACHE_RWFO	274	#ifdef CONFIG_DMA_CACHE_RWFO
269	ldr r2, [r0] @ read for ownership	275	ldrb r2, [r0] @ read for ownership
270	str r2, [r0] @ write for ownership	276	strb r2, [r0] @ write for ownership
271	#endif	277	#endif
		278	bic r0, r0, #D_CACHE_LINE_SIZE - 1
		279	1:
272	#ifdef HARVARD_CACHE	280	#ifdef HARVARD_CACHE
273	mcr p15, 0, r0, c7, c14, 1 @ clean & invalidate D line	281	mcr p15, 0, r0, c7, c14, 1 @ clean & invalidate D line
274	#else	282	#else
@@ -276,6 +284,10 @@ ENTRY(v6_dma_flush_range)
276	#endif	284	#endif
277	add r0, r0, #D_CACHE_LINE_SIZE	285	add r0, r0, #D_CACHE_LINE_SIZE
278	cmp r0, r1	286	cmp r0, r1
		287	#ifdef CONFIG_DMA_CACHE_RWFO
		288	ldrlob r2, [r0] @ read for ownership
		289	strlob r2, [r0] @ write for ownership
		290	#endif
279	blo 1b	291	blo 1b
280	mov r0, #0	292	mov r0, #0
281	mcr p15, 0, r0, c7, c10, 4 @ drain write buffer	293	mcr p15, 0, r0, c7, c10, 4 @ drain write buffer


diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S index a3ebf7a4f49b..6136e68ce953 100644 --- a/arch/arm/mm/cache-v7.S +++ b/arch/arm/mm/cache-v7.S
@@ -173,15 +173,22 @@ ENTRY(v7_coherent_user_range)
173	UNWIND(.fnstart )	173	UNWIND(.fnstart )
174	dcache_line_size r2, r3	174	dcache_line_size r2, r3
175	sub r3, r2, #1	175	sub r3, r2, #1
176	bic r0, r0, r3	176	bic r12, r0, r3
177	1:	177	1:
178	USER( mcr p15, 0, r0, c7, c11, 1 ) @ clean D line to the point of unification	178	USER( mcr p15, 0, r12, c7, c11, 1 ) @ clean D line to the point of unification
		179	add r12, r12, r2
		180	cmp r12, r1
		181	blo 1b
179	dsb	182	dsb
180	USER( mcr p15, 0, r0, c7, c5, 1 ) @ invalidate I line	183	icache_line_size r2, r3
181	add r0, r0, r2	184	sub r3, r2, #1
		185	bic r12, r0, r3
182	2:	186	2:
183	cmp r0, r1	187	USER( mcr p15, 0, r12, c7, c5, 1 ) @ invalidate I line
184	blo 1b	188	add r12, r12, r2
		189	cmp r12, r1
		190	blo 2b
		191	3:
185	mov r0, #0	192	mov r0, #0
186	ALT_SMP(mcr p15, 0, r0, c7, c1, 6) @ invalidate BTB Inner Shareable	193	ALT_SMP(mcr p15, 0, r0, c7, c1, 6) @ invalidate BTB Inner Shareable
187	ALT_UP(mcr p15, 0, r0, c7, c5, 6) @ invalidate BTB	194	ALT_UP(mcr p15, 0, r0, c7, c5, 6) @ invalidate BTB
@@ -194,10 +201,10 @@ ENTRY(v7_coherent_user_range)
194	* isn't mapped, just try the next page.	201	* isn't mapped, just try the next page.
195	*/	202	*/
196	9001:	203	9001:
197	mov r0, r0, lsr #12	204	mov r12, r12, lsr #12
198	mov r0, r0, lsl #12	205	mov r12, r12, lsl #12
199	add r0, r0, #4096	206	add r12, r12, #4096
200	b 2b	207	b 3b
201	UNWIND(.fnend )	208	UNWIND(.fnend )
202	ENDPROC(v7_coherent_kern_range)	209	ENDPROC(v7_coherent_kern_range)
203	ENDPROC(v7_coherent_user_range)	210	ENDPROC(v7_coherent_user_range)


diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S index 7d63beaf9745..b795afd0a2c6 100644 --- a/arch/arm/mm/proc-macros.S +++ b/arch/arm/mm/proc-macros.S
@@ -61,17 +61,27 @@
61	.endm	61	.endm
62		62
63	/*	63	/*
64	* cache_line_size - get the cache line size from the CSIDR register	64	* dcache_line_size - get the minimum D-cache line size from the CTR register
65	* (available on ARMv7+). It assumes that the CSSR register was configured	65	* on ARMv7.
66	* to access the L1 data cache CSIDR.
67	*/	66	*/
68	.macro dcache_line_size, reg, tmp	67	.macro dcache_line_size, reg, tmp
69	mrc p15, 1, \tmp, c0, c0, 0 @ read CSIDR	68	mrc p15, 0, \tmp, c0, c0, 1 @ read ctr
70	and \tmp, \tmp, #7 @ cache line size encoding	69	lsr \tmp, \tmp, #16
71	mov \reg, #16 @ size offset	70	and \tmp, \tmp, #0xf @ cache line size encoding
		71	mov \reg, #4 @ bytes per word
72	mov \reg, \reg, lsl \tmp @ actual cache line size	72	mov \reg, \reg, lsl \tmp @ actual cache line size
73	.endm	73	.endm
74		74
		75	/*
		76	* icache_line_size - get the minimum I-cache line size from the CTR register
		77	* on ARMv7.
		78	*/
		79	.macro icache_line_size, reg, tmp
		80	mrc p15, 0, \tmp, c0, c0, 1 @ read ctr
		81	and \tmp, \tmp, #0xf @ cache line size encoding
		82	mov \reg, #4 @ bytes per word
		83	mov \reg, \reg, lsl \tmp @ actual cache line size
		84	.endm
75		85
76	/*	86	/*
77	* Sanity check the PTE configuration for the code below - which makes	87	* Sanity check the PTE configuration for the code below - which makes


diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types index 55590a4d87c9..2fea897ebeb1 100644 --- a/arch/arm/tools/mach-types +++ b/arch/arm/tools/mach-types
@@ -12,7 +12,7 @@
12	#	12	#
13	# http://www.arm.linux.org.uk/developer/machines/?action=new	13	# http://www.arm.linux.org.uk/developer/machines/?action=new
14	#	14	#
15	# Last update: Thu Sep 9 22:43:01 2010	15	# Last update: Sun Dec 12 23:24:27 2010
16	#	16	#
17	# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number	17	# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
18	#	18	#
@@ -2321,7 +2321,7 @@ mx31txtr MACH_MX31TXTR MX31TXTR 2332
2321	u380 MACH_U380 U380 2333	2321	u380 MACH_U380 U380 2333
2322	oamp3_hualu MACH_HUALU_BOARD HUALU_BOARD 2334	2322	oamp3_hualu MACH_HUALU_BOARD HUALU_BOARD 2334
2323	npcmx50 MACH_NPCMX50 NPCMX50 2335	2323	npcmx50 MACH_NPCMX50 NPCMX50 2335
2324	mx51_lange51 MACH_MX51_LANGE51 MX51_LANGE51 2336	2324	mx51_efikamx MACH_MX51_EFIKAMX MX51_EFIKAMX 2336
2325	mx51_lange52 MACH_MX51_LANGE52 MX51_LANGE52 2337	2325	mx51_lange52 MACH_MX51_LANGE52 MX51_LANGE52 2337
2326	riom MACH_RIOM RIOM 2338	2326	riom MACH_RIOM RIOM 2338
2327	comcas MACH_COMCAS COMCAS 2339	2327	comcas MACH_COMCAS COMCAS 2339
@@ -2355,7 +2355,7 @@ at91sam9263cs MACH_AT91SAM9263CS AT91SAM9263CS 2366
2355	csb732 MACH_CSB732 CSB732 2367	2355	csb732 MACH_CSB732 CSB732 2367
2356	u8500 MACH_U8500 U8500 2368	2356	u8500 MACH_U8500 U8500 2368
2357	huqiu MACH_HUQIU HUQIU 2369	2357	huqiu MACH_HUQIU HUQIU 2369
2358	mx51_kunlun MACH_MX51_KUNLUN MX51_KUNLUN 2370	2358	mx51_efikasb MACH_MX51_EFIKASB MX51_EFIKASB 2370
2359	pmt1g MACH_PMT1G PMT1G 2371	2359	pmt1g MACH_PMT1G PMT1G 2371
2360	htcelf MACH_HTCELF HTCELF 2372	2360	htcelf MACH_HTCELF HTCELF 2372
2361	armadillo420 MACH_ARMADILLO420 ARMADILLO420 2373	2361	armadillo420 MACH_ARMADILLO420 ARMADILLO420 2373
@@ -2971,7 +2971,7 @@ premierwave_en MACH_PREMIERWAVE_EN PREMIERWAVE_EN 2985
2971	wasabi MACH_WASABI WASABI 2986	2971	wasabi MACH_WASABI WASABI 2986
2972	vivow MACH_VIVOW VIVOW 2987	2972	vivow MACH_VIVOW VIVOW 2987
2973	mx50_rdp MACH_MX50_RDP MX50_RDP 2988	2973	mx50_rdp MACH_MX50_RDP MX50_RDP 2988
2974	universal MACH_UNIVERSAL UNIVERSAL 2989	2974	universal_c210 MACH_UNIVERSAL_C210 UNIVERSAL_C210 2989
2975	real6410 MACH_REAL6410 REAL6410 2990	2975	real6410 MACH_REAL6410 REAL6410 2990
2976	spx_sakura MACH_SPX_SAKURA SPX_SAKURA 2991	2976	spx_sakura MACH_SPX_SAKURA SPX_SAKURA 2991
2977	ij3k_2440 MACH_IJ3K_2440 IJ3K_2440 2992	2977	ij3k_2440 MACH_IJ3K_2440 IJ3K_2440 2992
@@ -3044,3 +3044,178 @@ harvest_desoto MACH_HARVEST_DESOTO HARVEST_DESOTO 3059
3044	msm8x60_qrdc MACH_MSM8X60_QRDC MSM8X60_QRDC 3060	3044	msm8x60_qrdc MACH_MSM8X60_QRDC MSM8X60_QRDC 3060
3045	spear900 MACH_SPEAR900 SPEAR900 3061	3045	spear900 MACH_SPEAR900 SPEAR900 3061
3046	pcontrol_g20 MACH_PCONTROL_G20 PCONTROL_G20 3062	3046	pcontrol_g20 MACH_PCONTROL_G20 PCONTROL_G20 3062
		3047	rdstor MACH_RDSTOR RDSTOR 3063
		3048	usdloader MACH_USDLOADER USDLOADER 3064
		3049	tsoploader MACH_TSOPLOADER TSOPLOADER 3065
		3050	kronos MACH_KRONOS KRONOS 3066
		3051	ffcore MACH_FFCORE FFCORE 3067
		3052	mone MACH_MONE MONE 3068
		3053	unit2s MACH_UNIT2S UNIT2S 3069
		3054	acer_a5 MACH_ACER_A5 ACER_A5 3070
		3055	etherpro_isp MACH_ETHERPRO_ISP ETHERPRO_ISP 3071
		3056	stretchs7000 MACH_STRETCHS7000 STRETCHS7000 3072
		3057	p87_smartsim MACH_P87_SMARTSIM P87_SMARTSIM 3073
		3058	tulip MACH_TULIP TULIP 3074
		3059	sunflower MACH_SUNFLOWER SUNFLOWER 3075
		3060	rib MACH_RIB RIB 3076
		3061	clod MACH_CLOD CLOD 3077
		3062	rump MACH_RUMP RUMP 3078
		3063	tenderloin MACH_TENDERLOIN TENDERLOIN 3079
		3064	shortloin MACH_SHORTLOIN SHORTLOIN 3080
		3065	crespo MACH_CRESPO CRESPO 3081
		3066	antares MACH_ANTARES ANTARES 3082
		3067	wb40n MACH_WB40N WB40N 3083
		3068	herring MACH_HERRING HERRING 3084
		3069	naxy400 MACH_NAXY400 NAXY400 3085
		3070	naxy1200 MACH_NAXY1200 NAXY1200 3086
		3071	vpr200 MACH_VPR200 VPR200 3087
		3072	bug20 MACH_BUG20 BUG20 3088
		3073	goflexnet MACH_GOFLEXNET GOFLEXNET 3089
		3074	torbreck MACH_TORBRECK TORBRECK 3090
		3075	saarb_mg1 MACH_SAARB_MG1 SAARB_MG1 3091
		3076	callisto MACH_CALLISTO CALLISTO 3092
		3077	multhsu MACH_MULTHSU MULTHSU 3093
		3078	saluda MACH_SALUDA SALUDA 3094
		3079	pemp_omap3_apollo MACH_PEMP_OMAP3_APOLLO PEMP_OMAP3_APOLLO 3095
		3080	vc0718 MACH_VC0718 VC0718 3096
		3081	mvblx MACH_MVBLX MVBLX 3097
		3082	inhand_apeiron MACH_INHAND_APEIRON INHAND_APEIRON 3098
		3083	inhand_fury MACH_INHAND_FURY INHAND_FURY 3099
		3084	inhand_siren MACH_INHAND_SIREN INHAND_SIREN 3100
		3085	hdnvp MACH_HDNVP HDNVP 3101
		3086	softwinner MACH_SOFTWINNER SOFTWINNER 3102
		3087	prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103
		3088	nas6210 MACH_NAS6210 NAS6210 3104
		3089	unisdev MACH_UNISDEV UNISDEV 3105
		3090	sbca11 MACH_SBCA11 SBCA11 3106
		3091	saga MACH_SAGA SAGA 3107
		3092	ns_k330 MACH_NS_K330 NS_K330 3108
		3093	tanna MACH_TANNA TANNA 3109
		3094	imate8502 MACH_IMATE8502 IMATE8502 3110
		3095	aspen MACH_ASPEN ASPEN 3111
		3096	daintree_cwac MACH_DAINTREE_CWAC DAINTREE_CWAC 3112
		3097	zmx25 MACH_ZMX25 ZMX25 3113
		3098	maple1 MACH_MAPLE1 MAPLE1 3114
		3099	qsd8x72_surf MACH_QSD8X72_SURF QSD8X72_SURF 3115
		3100	qsd8x72_ffa MACH_QSD8X72_FFA QSD8X72_FFA 3116
		3101	abilene MACH_ABILENE ABILENE 3117
		3102	eigen_ttr MACH_EIGEN_TTR EIGEN_TTR 3118
		3103	iomega_ix2_200 MACH_IOMEGA_IX2_200 IOMEGA_IX2_200 3119
		3104	coretec_vcx7400 MACH_CORETEC_VCX7400 CORETEC_VCX7400 3120
		3105	santiago MACH_SANTIAGO SANTIAGO 3121
		3106	mx257sol MACH_MX257SOL MX257SOL 3122
		3107	strasbourg MACH_STRASBOURG STRASBOURG 3123
		3108	msm8x60_fluid MACH_MSM8X60_FLUID MSM8X60_FLUID 3124
		3109	smartqv5 MACH_SMARTQV5 SMARTQV5 3125
		3110	smartqv3 MACH_SMARTQV3 SMARTQV3 3126
		3111	smartqv7 MACH_SMARTQV7 SMARTQV7 3127
		3112	paz00 MACH_PAZ00 PAZ00 3128
		3113	acmenetusfoxg20 MACH_ACMENETUSFOXG20 ACMENETUSFOXG20 3129
		3114	htcwillow MACH_HTCWILLOW HTCWILLOW 3130
		3115	fwbd_0404 MACH_FWBD_0404 FWBD_0404 3131
		3116	hdgu MACH_HDGU HDGU 3132
		3117	pyramid MACH_PYRAMID PYRAMID 3133
		3118	epiphan MACH_EPIPHAN EPIPHAN 3134
		3119	omap_bender MACH_OMAP_BENDER OMAP_BENDER 3135
		3120	gurnard MACH_GURNARD GURNARD 3136
		3121	gtl_it5100 MACH_GTL_IT5100 GTL_IT5100 3137
		3122	bcm2708 MACH_BCM2708 BCM2708 3138
		3123	mx51_ggc MACH_MX51_GGC MX51_GGC 3139
		3124	sharespace MACH_SHARESPACE SHARESPACE 3140
		3125	haba_knx_explorer MACH_HABA_KNX_EXPLORER HABA_KNX_EXPLORER 3141
		3126	simtec_kirkmod MACH_SIMTEC_KIRKMOD SIMTEC_KIRKMOD 3142
		3127	crux MACH_CRUX CRUX 3143
		3128	mx51_bravo MACH_MX51_BRAVO MX51_BRAVO 3144
		3129	charon MACH_CHARON CHARON 3145
		3130	picocom3 MACH_PICOCOM3 PICOCOM3 3146
		3131	picocom4 MACH_PICOCOM4 PICOCOM4 3147
		3132	serrano MACH_SERRANO SERRANO 3148
		3133	doubleshot MACH_DOUBLESHOT DOUBLESHOT 3149
		3134	evsy MACH_EVSY EVSY 3150
		3135	huashan MACH_HUASHAN HUASHAN 3151
		3136	lausanne MACH_LAUSANNE LAUSANNE 3152
		3137	emerald MACH_EMERALD EMERALD 3153
		3138	tqma35 MACH_TQMA35 TQMA35 3154
		3139	marvel MACH_MARVEL MARVEL 3155
		3140	manuae MACH_MANUAE MANUAE 3156
		3141	chacha MACH_CHACHA CHACHA 3157
		3142	lemon MACH_LEMON LEMON 3158
		3143	csc MACH_CSC CSC 3159
		3144	gira_knxip_router MACH_GIRA_KNXIP_ROUTER GIRA_KNXIP_ROUTER 3160
		3145	t20 MACH_T20 T20 3161
		3146	hdmini MACH_HDMINI HDMINI 3162
		3147	sciphone_g2 MACH_SCIPHONE_G2 SCIPHONE_G2 3163
		3148	express MACH_EXPRESS EXPRESS 3164
		3149	express_kt MACH_EXPRESS_KT EXPRESS_KT 3165
		3150	maximasp MACH_MAXIMASP MAXIMASP 3166
		3151	nitrogen_imx51 MACH_NITROGEN_IMX51 NITROGEN_IMX51 3167
		3152	nitrogen_imx53 MACH_NITROGEN_IMX53 NITROGEN_IMX53 3168
		3153	sunfire MACH_SUNFIRE SUNFIRE 3169
		3154	arowana MACH_AROWANA AROWANA 3170
		3155	tegra_daytona MACH_TEGRA_DAYTONA TEGRA_DAYTONA 3171
		3156	tegra_swordfish MACH_TEGRA_SWORDFISH TEGRA_SWORDFISH 3172
		3157	edison MACH_EDISON EDISON 3173
		3158	svp8500v1 MACH_SVP8500V1 SVP8500V1 3174
		3159	svp8500v2 MACH_SVP8500V2 SVP8500V2 3175
		3160	svp5500 MACH_SVP5500 SVP5500 3176
		3161	b5500 MACH_B5500 B5500 3177
		3162	s5500 MACH_S5500 S5500 3178
		3163	icon MACH_ICON ICON 3179
		3164	elephant MACH_ELEPHANT ELEPHANT 3180
		3165	msm8x60_fusion MACH_MSM8X60_FUSION MSM8X60_FUSION 3181
		3166	shooter MACH_SHOOTER SHOOTER 3182
		3167	spade_lte MACH_SPADE_LTE SPADE_LTE 3183
		3168	philhwani MACH_PHILHWANI PHILHWANI 3184
		3169	gsncomm MACH_GSNCOMM GSNCOMM 3185
		3170	strasbourg_a2 MACH_STRASBOURG_A2 STRASBOURG_A2 3186
		3171	mmm MACH_MMM MMM 3187
		3172	davinci_dm365_bv MACH_DAVINCI_DM365_BV DAVINCI_DM365_BV 3188
		3173	ag5evm MACH_AG5EVM AG5EVM 3189
		3174	sc575plc MACH_SC575PLC SC575PLC 3190
		3175	sc575hmi MACH_SC575IPC SC575IPC 3191
		3176	omap3_tdm3730 MACH_OMAP3_TDM3730 OMAP3_TDM3730 3192
		3177	g7 MACH_G7 G7 3193
		3178	top9000_eval MACH_TOP9000_EVAL TOP9000_EVAL 3194
		3179	top9000_su MACH_TOP9000_SU TOP9000_SU 3195
		3180	utm300 MACH_UTM300 UTM300 3196
		3181	tsunagi MACH_TSUNAGI TSUNAGI 3197
		3182	ts75xx MACH_TS75XX TS75XX 3198
		3183	msm8x60_fusn_ffa MACH_MSM8X60_FUSN_FFA MSM8X60_FUSN_FFA 3199
		3184	ts47xx MACH_TS47XX TS47XX 3200
		3185	da850_k5 MACH_DA850_K5 DA850_K5 3201
		3186	ax502 MACH_AX502 AX502 3202
		3187	igep0032 MACH_IGEP0032 IGEP0032 3203
		3188	antero MACH_ANTERO ANTERO 3204
		3189	synergy MACH_SYNERGY SYNERGY 3205
		3190	ics_if_voip MACH_ICS_IF_VOIP ICS_IF_VOIP 3206
		3191	wlf_cragg_6410 MACH_WLF_CRAGG_6410 WLF_CRAGG_6410 3207
		3192	punica MACH_PUNICA PUNICA 3208
		3193	sbc_nt250 MACH_SBC_NT250 SBC_NT250 3209
		3194	mx27_wmultra MACH_MX27_WMULTRA MX27_WMULTRA 3210
		3195	mackerel MACH_MACKEREL MACKEREL 3211
		3196	fa9x27 MACH_FA9X27 FA9X27 3213
		3197	ns2816tb MACH_NS2816TB NS2816TB 3214
		3198	ns2816_ntpad MACH_NS2816_NTPAD NS2816_NTPAD 3215
		3199	ns2816_ntnb MACH_NS2816_NTNB NS2816_NTNB 3216
		3200	kaen MACH_KAEN KAEN 3217
		3201	nv1000 MACH_NV1000 NV1000 3218
		3202	nuc950ts MACH_NUC950TS NUC950TS 3219
		3203	nokia_rm680 MACH_NOKIA_RM680 NOKIA_RM680 3220
		3204	ast2200 MACH_AST2200 AST2200 3221
		3205	lead MACH_LEAD LEAD 3222
		3206	unino1 MACH_UNINO1 UNINO1 3223
		3207	greeco MACH_GREECO GREECO 3224
		3208	verdi MACH_VERDI VERDI 3225
		3209	dm6446_adbox MACH_DM6446_ADBOX DM6446_ADBOX 3226
		3210	quad_salsa MACH_QUAD_SALSA QUAD_SALSA 3227
		3211	abb_gma_1_1 MACH_ABB_GMA_1_1 ABB_GMA_1_1 3228
		3212	svcid MACH_SVCID SVCID 3229
		3213	msm8960_sim MACH_MSM8960_SIM MSM8960_SIM 3230
		3214	msm8960_rumi3 MACH_MSM8960_RUMI3 MSM8960_RUMI3 3231
		3215	icon_g MACH_ICON_G ICON_G 3232
		3216	mb3 MACH_MB3 MB3 3233
		3217	gsia18s MACH_GSIA18S GSIA18S 3234
		3218	pivicc MACH_PIVICC PIVICC 3235
		3219	pcm048 MACH_PCM048 PCM048 3236
		3220	dds MACH_DDS DDS 3237
		3221	chalten_xa1 MACH_CHALTEN_XA1 CHALTEN_XA1 3238