Merge master.kernel.org:/home/rmk/linux-2.6-arm

+1 -1

arch/arm/mach-ep93xx/core.c

··· 838 838 static struct resource ep93xx_ac97_resources[] = { 839 839 { 840 840 .start = EP93XX_AAC_PHYS_BASE, 841 - .end = EP93XX_AAC_PHYS_BASE + 0xb0 - 1, 841 + .end = EP93XX_AAC_PHYS_BASE + 0xac - 1, 842 842 .flags = IORESOURCE_MEM, 843 843 }, 844 844 {

+1 -1

arch/arm/mach-imx/mach-mx25_3ds.c

··· 180 180 KEY(3, 3, KEY_POWER), 181 181 }; 182 182 183 - static const struct matrix_keymap_data mx25pdk_keymap_data __initdata = { 183 + static const struct matrix_keymap_data mx25pdk_keymap_data __initconst = { 184 184 .keymap = mx25pdk_keymap, 185 185 .keymap_size = ARRAY_SIZE(mx25pdk_keymap), 186 186 };

+2 -2

arch/arm/mach-mxs/clock-mx23.c

··· 304 304 reg = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_##dr); \ 305 305 reg &= ~BM_CLKCTRL_##dr##_DIV; \ 306 306 reg |= div << BP_CLKCTRL_##dr##_DIV; \ 307 - if (reg | (1 << clk->enable_shift)) { \ 307 + if (reg & (1 << clk->enable_shift)) { \ 308 308 pr_err("%s: clock is gated\n", __func__); \ 309 309 return -EINVAL; \ 310 310 } \ ··· 347 347 { \ 348 348 if (parent != clk->parent) { \ 349 349 __raw_writel(BM_CLKCTRL_CLKSEQ_BYPASS_##bit, \ 350 - HW_CLKCTRL_CLKSEQ_TOG); \ 350 + CLKCTRL_BASE_ADDR + HW_CLKCTRL_CLKSEQ_TOG); \ 351 351 clk->parent = parent; \ 352 352 } \ 353 353 \

+3 -4

arch/arm/mach-mxs/clock-mx28.c

··· 355 355 } else { \ 356 356 reg &= ~BM_CLKCTRL_##dr##_DIV; \ 357 357 reg |= div << BP_CLKCTRL_##dr##_DIV; \ 358 - if (reg | (1 << clk->enable_shift)) { \ 358 + if (reg & (1 << clk->enable_shift)) { \ 359 359 pr_err("%s: clock is gated\n", __func__); \ 360 360 return -EINVAL; \ 361 361 } \ 362 362 } \ 363 - __raw_writel(reg, CLKCTRL_BASE_ADDR + HW_CLKCTRL_CPU); \ 363 + __raw_writel(reg, CLKCTRL_BASE_ADDR + HW_CLKCTRL_##dr); \ 364 364 \ 365 365 for (i = 10000; i; i--) \ 366 366 if (!(__raw_readl(CLKCTRL_BASE_ADDR + \ ··· 483 483 { \ 484 484 if (parent != clk->parent) { \ 485 485 __raw_writel(BM_CLKCTRL_CLKSEQ_BYPASS_##bit, \ 486 - HW_CLKCTRL_CLKSEQ_TOG); \ 486 + CLKCTRL_BASE_ADDR + HW_CLKCTRL_CLKSEQ_TOG); \ 487 487 clk->parent = parent; \ 488 488 } \ 489 489 \ ··· 609 609 _REGISTER_CLOCK("duart", NULL, uart_clk) 610 610 _REGISTER_CLOCK("imx28-fec.0", NULL, fec_clk) 611 611 _REGISTER_CLOCK("imx28-fec.1", NULL, fec_clk) 612 - _REGISTER_CLOCK("fec.0", NULL, fec_clk) 613 612 _REGISTER_CLOCK("rtc", NULL, rtc_clk) 614 613 _REGISTER_CLOCK("pll2", NULL, pll2_clk) 615 614 _REGISTER_CLOCK(NULL, "hclk", hbus_clk)

-2

arch/arm/mach-mxs/clock.c

··· 57 57 if (clk->disable) 58 58 clk->disable(clk); 59 59 __clk_disable(clk->parent); 60 - __clk_disable(clk->secondary); 61 60 } 62 61 } 63 62 ··· 67 68 68 69 if (clk->usecount++ == 0) { 69 70 __clk_enable(clk->parent); 70 - __clk_enable(clk->secondary); 71 71 72 72 if (clk->enable) 73 73 clk->enable(clk);

+2

arch/arm/mach-mxs/gpio.c

··· 139 139 struct mxs_gpio_port *port = (struct mxs_gpio_port *)get_irq_data(irq); 140 140 u32 gpio_irq_no_base = port->virtual_irq_start; 141 141 142 + desc->irq_data.chip->irq_ack(&desc->irq_data); 143 + 142 144 irq_stat = __raw_readl(port->base + PINCTRL_IRQSTAT(port->id)) & 143 145 __raw_readl(port->base + PINCTRL_IRQEN(port->id)); 144 146

-2

arch/arm/mach-mxs/include/mach/clock.h

··· 29 29 int id; 30 30 /* Source clock this clk depends on */ 31 31 struct clk *parent; 32 - /* Secondary clock to enable/disable with this clock */ 33 - struct clk *secondary; 34 32 /* Reference count of clock enable/disable */ 35 33 __s8 usecount; 36 34 /* Register bit position for clock's enable/disable control. */

+2

arch/arm/plat-mxc/include/mach/uncompress.h

··· 95 95 case MACH_TYPE_MX35_3DS: 96 96 case MACH_TYPE_PCM043: 97 97 case MACH_TYPE_LILLY1131: 98 + case MACH_TYPE_VPR200: 98 99 uart_base = MX3X_UART1_BASE_ADDR; 99 100 break; 100 101 case MACH_TYPE_MAGX_ZN5: ··· 103 102 break; 104 103 case MACH_TYPE_MX51_BABBAGE: 105 104 case MACH_TYPE_EUKREA_CPUIMX51SD: 105 + case MACH_TYPE_MX51_3DS: 106 106 uart_base = MX51_UART1_BASE_ADDR; 107 107 break; 108 108 case MACH_TYPE_MX50_RDP:

+101 -4

arch/arm/tools/mach-types

··· 12 12 # 13 13 # http://www.arm.linux.org.uk/developer/machines/?action=new 14 14 # 15 - # Last update: Sun Dec 12 23:24:27 2010 15 + # Last update: Mon Feb 7 08:59:27 2011 16 16 # 17 17 # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number 18 18 # ··· 2240 2240 vs_v210 MACH_VS_V210 VS_V210 2252 2241 2241 vs_v212 MACH_VS_V212 VS_V212 2253 2242 2242 hmt MACH_HMT HMT 2254 2243 - suen3 MACH_SUEN3 SUEN3 2255 2243 + km_kirkwood MACH_KM_KIRKWOOD KM_KIRKWOOD 2255 2244 2244 vesper MACH_VESPER VESPER 2256 2245 2245 str9 MACH_STR9 STR9 2257 2246 2246 omap3_wl_ff MACH_OMAP3_WL_FF OMAP3_WL_FF 2258 ··· 2987 2987 ea20 MACH_EA20 EA20 3002 2988 2988 awm2 MACH_AWM2 AWM2 3003 2989 2989 ti8148evm MACH_TI8148EVM TI8148EVM 3004 2990 - tegra_seaboard MACH_TEGRA_SEABOARD TEGRA_SEABOARD 3005 2990 + seaboard MACH_SEABOARD SEABOARD 3005 2991 2991 linkstation_chlv2 MACH_LINKSTATION_CHLV2 LINKSTATION_CHLV2 3006 2992 2992 tera_pro2_rack MACH_TERA_PRO2_RACK TERA_PRO2_RACK 3007 2993 2993 rubys MACH_RUBYS RUBYS 3008 ··· 3190 3190 ics_if_voip MACH_ICS_IF_VOIP ICS_IF_VOIP 3206 3191 3191 wlf_cragg_6410 MACH_WLF_CRAGG_6410 WLF_CRAGG_6410 3207 3192 3192 punica MACH_PUNICA PUNICA 3208 3193 - sbc_nt250 MACH_SBC_NT250 SBC_NT250 3209 3193 + trimslice MACH_TRIMSLICE TRIMSLICE 3209 3194 3194 mx27_wmultra MACH_MX27_WMULTRA MX27_WMULTRA 3210 3195 3195 mackerel MACH_MACKEREL MACKEREL 3211 3196 3196 fa9x27 MACH_FA9X27 FA9X27 3213 ··· 3219 3219 pcm048 MACH_PCM048 PCM048 3236 3220 3220 dds MACH_DDS DDS 3237 3221 3221 chalten_xa1 MACH_CHALTEN_XA1 CHALTEN_XA1 3238 3222 + ts48xx MACH_TS48XX TS48XX 3239 3223 + tonga2_tfttimer MACH_TONGA2_TFTTIMER TONGA2_TFTTIMER 3240 3224 + whistler MACH_WHISTLER WHISTLER 3241 3225 + asl_phoenix MACH_ASL_PHOENIX ASL_PHOENIX 3242 3226 + at91sam9263otlite MACH_AT91SAM9263OTLITE AT91SAM9263OTLITE 3243 3227 + ddplug MACH_DDPLUG DDPLUG 3244 3228 + d2plug MACH_D2PLUG D2PLUG 3245 3229 + kzm9d MACH_KZM9D KZM9D 3246 3230 + verdi_lte MACH_VERDI_LTE VERDI_LTE 3247 3231 + nanozoom MACH_NANOZOOM NANOZOOM 3248 3232 + dm3730_som_lv MACH_DM3730_SOM_LV DM3730_SOM_LV 3249 3233 + dm3730_torpedo MACH_DM3730_TORPEDO DM3730_TORPEDO 3250 3234 + anchovy MACH_ANCHOVY ANCHOVY 3251 3235 + re2rev20 MACH_RE2REV20 RE2REV20 3253 3236 + re2rev21 MACH_RE2REV21 RE2REV21 3254 3237 + cns21xx MACH_CNS21XX CNS21XX 3255 3238 + rider MACH_RIDER RIDER 3257 3239 + nsk330 MACH_NSK330 NSK330 3258 3240 + cns2133evb MACH_CNS2133EVB CNS2133EVB 3259 3241 + z3_816x_mod MACH_Z3_816X_MOD Z3_816X_MOD 3260 3242 + z3_814x_mod MACH_Z3_814X_MOD Z3_814X_MOD 3261 3243 + beect MACH_BEECT BEECT 3262 3244 + dma_thunderbug MACH_DMA_THUNDERBUG DMA_THUNDERBUG 3263 3245 + omn_at91sam9g20 MACH_OMN_AT91SAM9G20 OMN_AT91SAM9G20 3264 3246 + mx25_e2s_uc MACH_MX25_E2S_UC MX25_E2S_UC 3265 3247 + mione MACH_MIONE MIONE 3266 3248 + top9000_tcu MACH_TOP9000_TCU TOP9000_TCU 3267 3249 + top9000_bsl MACH_TOP9000_BSL TOP9000_BSL 3268 3250 + kingdom MACH_KINGDOM KINGDOM 3269 3251 + armadillo460 MACH_ARMADILLO460 ARMADILLO460 3270 3252 + lq2 MACH_LQ2 LQ2 3271 3253 + sweda_tms2 MACH_SWEDA_TMS2 SWEDA_TMS2 3272 3254 + mx53_loco MACH_MX53_LOCO MX53_LOCO 3273 3255 + acer_a8 MACH_ACER_A8 ACER_A8 3275 3256 + acer_gauguin MACH_ACER_GAUGUIN ACER_GAUGUIN 3276 3257 + guppy MACH_GUPPY GUPPY 3277 3258 + mx61_ard MACH_MX61_ARD MX61_ARD 3278 3259 + tx53 MACH_TX53 TX53 3279 3260 + omapl138_case_a3 MACH_OMAPL138_CASE_A3 OMAPL138_CASE_A3 3280 3261 + uemd MACH_UEMD UEMD 3281 3262 + ccwmx51mut MACH_CCWMX51MUT CCWMX51MUT 3282 3263 + rockhopper MACH_ROCKHOPPER ROCKHOPPER 3283 3264 + nookcolor MACH_NOOKCOLOR NOOKCOLOR 3284 3265 + hkdkc100 MACH_HKDKC100 HKDKC100 3285 3266 + ts42xx MACH_TS42XX TS42XX 3286 3267 + aebl MACH_AEBL AEBL 3287 3268 + wario MACH_WARIO WARIO 3288 3269 + gfs_spm MACH_GFS_SPM GFS_SPM 3289 3270 + cm_t3730 MACH_CM_T3730 CM_T3730 3290 3271 + isc3 MACH_ISC3 ISC3 3291 3272 + rascal MACH_RASCAL RASCAL 3292 3273 + hrefv60 MACH_HREFV60 HREFV60 3293 3274 + tpt_2_0 MACH_TPT_2_0 TPT_2_0 3294 3275 + pyramid_td MACH_PYRAMID_TD PYRAMID_TD 3295 3276 + splendor MACH_SPLENDOR SPLENDOR 3296 3277 + guf_planet MACH_GUF_PLANET GUF_PLANET 3297 3278 + msm8x60_qt MACH_MSM8X60_QT MSM8X60_QT 3298 3279 + htc_hd_mini MACH_HTC_HD_MINI HTC_HD_MINI 3299 3280 + athene MACH_ATHENE ATHENE 3300 3281 + deep_r_ek_1 MACH_DEEP_R_EK_1 DEEP_R_EK_1 3301 3282 + vivow_ct MACH_VIVOW_CT VIVOW_CT 3302 3283 + nery_1000 MACH_NERY_1000 NERY_1000 3303 3284 + rfl109145_ssrv MACH_RFL109145_SSRV RFL109145_SSRV 3304 3285 + nmh MACH_NMH NMH 3305 3286 + wn802t MACH_WN802T WN802T 3306 3287 + dragonet MACH_DRAGONET DRAGONET 3307 3288 + geneva_b MACH_GENEVA_B GENEVA_B 3308 3289 + at91sam9263desk16l MACH_AT91SAM9263DESK16L AT91SAM9263DESK16L 3309 3290 + bcmhana_sv MACH_BCMHANA_SV BCMHANA_SV 3310 3291 + bcmhana_tablet MACH_BCMHANA_TABLET BCMHANA_TABLET 3311 3292 + koi MACH_KOI KOI 3312 3293 + ts4800 MACH_TS4800 TS4800 3313 3294 + tqma9263 MACH_TQMA9263 TQMA9263 3314 3295 + holiday MACH_HOLIDAY HOLIDAY 3315 3296 + dma_6410 MACH_DMA6410 DMA6410 3316 3297 + pcats_overlay MACH_PCATS_OVERLAY PCATS_OVERLAY 3317 3298 + hwgw6410 MACH_HWGW6410 HWGW6410 3318 3299 + shenzhou MACH_SHENZHOU SHENZHOU 3319 3300 + cwme9210 MACH_CWME9210 CWME9210 3320 3301 + cwme9210js MACH_CWME9210JS CWME9210JS 3321 3302 + pgs_v1 MACH_PGS_SITARA PGS_SITARA 3322 3303 + colibri_tegra2 MACH_COLIBRI_TEGRA2 COLIBRI_TEGRA2 3323 3304 + w21 MACH_W21 W21 3324 3305 + polysat1 MACH_POLYSAT1 POLYSAT1 3325 3306 + dataway MACH_DATAWAY DATAWAY 3326 3307 + cobral138 MACH_COBRAL138 COBRAL138 3327 3308 + roverpcs8 MACH_ROVERPCS8 ROVERPCS8 3328 3309 + marvelc MACH_MARVELC MARVELC 3329 3310 + navefihid MACH_NAVEFIHID NAVEFIHID 3330 3311 + dm365_cv100 MACH_DM365_CV100 DM365_CV100 3331 3312 + able MACH_ABLE ABLE 3332 3313 + legacy MACH_LEGACY LEGACY 3333 3314 + icong MACH_ICONG ICONG 3334 3315 + rover_g8 MACH_ROVER_G8 ROVER_G8 3335 3316 + t5388p MACH_T5388P T5388P 3336 3317 + dingo MACH_DINGO DINGO 3337 3318 + goflexhome MACH_GOFLEXHOME GOFLEXHOME 3338

+7 -1

sound/arm/aaci.c

··· 50 50 if (v & SLFR_1RXV) 51 51 readl(aaci->base + AACI_SL1RX); 52 52 53 - writel(maincr, aaci->base + AACI_MAINCR); 53 + if (maincr != readl(aaci->base + AACI_MAINCR)) { 54 + writel(maincr, aaci->base + AACI_MAINCR); 55 + readl(aaci->base + AACI_MAINCR); 56 + udelay(1); 57 + } 54 58 } 55 59 56 60 /* ··· 997 993 * disabling the channel doesn't clear the FIFO. 998 994 */ 999 995 writel(aaci->maincr & ~MAINCR_IE, aaci->base + AACI_MAINCR); 996 + readl(aaci->base + AACI_MAINCR); 997 + udelay(1); 1000 998 writel(aaci->maincr, aaci->base + AACI_MAINCR); 1001 999 1002 1000 /*

Configure Feed

Configure Feed