Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: ALSA: AACI: allow writes to MAINCR to take effect ARM: Update mach-types ARM: 6652/1: ep93xx: correct the end address of the AC97 memory resource ARM: mxs/imx28: remove now unused clock lookup "fec.0" ARM: mxs: fix clock base address missing ARM: mxs: acknowledge gpio irq ARM: mach-imx/mach-mx25_3ds: Fix section type ARM: imx: Add VPR200 and MX51_3DS entries to uncompress.h ARM i.MX23: use correct register for setting the rate ARM i.MX23/28: remove secondary field from struct clk. It's unused ARM i.MX28: use correct register for setting the rate ARM i.MX28: fix bit operation
This commit is contained in:
commit
65d9055ea3
|
@ -838,7 +838,7 @@ EXPORT_SYMBOL(ep93xx_i2s_release);
|
||||||
static struct resource ep93xx_ac97_resources[] = {
|
static struct resource ep93xx_ac97_resources[] = {
|
||||||
{
|
{
|
||||||
.start = EP93XX_AAC_PHYS_BASE,
|
.start = EP93XX_AAC_PHYS_BASE,
|
||||||
.end = EP93XX_AAC_PHYS_BASE + 0xb0 - 1,
|
.end = EP93XX_AAC_PHYS_BASE + 0xac - 1,
|
||||||
.flags = IORESOURCE_MEM,
|
.flags = IORESOURCE_MEM,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -180,7 +180,7 @@ static const uint32_t mx25pdk_keymap[] = {
|
||||||
KEY(3, 3, KEY_POWER),
|
KEY(3, 3, KEY_POWER),
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct matrix_keymap_data mx25pdk_keymap_data __initdata = {
|
static const struct matrix_keymap_data mx25pdk_keymap_data __initconst = {
|
||||||
.keymap = mx25pdk_keymap,
|
.keymap = mx25pdk_keymap,
|
||||||
.keymap_size = ARRAY_SIZE(mx25pdk_keymap),
|
.keymap_size = ARRAY_SIZE(mx25pdk_keymap),
|
||||||
};
|
};
|
||||||
|
|
|
@ -304,7 +304,7 @@ static int name##_set_rate(struct clk *clk, unsigned long rate) \
|
||||||
reg = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_##dr); \
|
reg = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_##dr); \
|
||||||
reg &= ~BM_CLKCTRL_##dr##_DIV; \
|
reg &= ~BM_CLKCTRL_##dr##_DIV; \
|
||||||
reg |= div << BP_CLKCTRL_##dr##_DIV; \
|
reg |= div << BP_CLKCTRL_##dr##_DIV; \
|
||||||
if (reg | (1 << clk->enable_shift)) { \
|
if (reg & (1 << clk->enable_shift)) { \
|
||||||
pr_err("%s: clock is gated\n", __func__); \
|
pr_err("%s: clock is gated\n", __func__); \
|
||||||
return -EINVAL; \
|
return -EINVAL; \
|
||||||
} \
|
} \
|
||||||
|
@ -347,7 +347,7 @@ static int name##_set_parent(struct clk *clk, struct clk *parent) \
|
||||||
{ \
|
{ \
|
||||||
if (parent != clk->parent) { \
|
if (parent != clk->parent) { \
|
||||||
__raw_writel(BM_CLKCTRL_CLKSEQ_BYPASS_##bit, \
|
__raw_writel(BM_CLKCTRL_CLKSEQ_BYPASS_##bit, \
|
||||||
HW_CLKCTRL_CLKSEQ_TOG); \
|
CLKCTRL_BASE_ADDR + HW_CLKCTRL_CLKSEQ_TOG); \
|
||||||
clk->parent = parent; \
|
clk->parent = parent; \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
|
|
|
@ -355,12 +355,12 @@ static int name##_set_rate(struct clk *clk, unsigned long rate) \
|
||||||
} else { \
|
} else { \
|
||||||
reg &= ~BM_CLKCTRL_##dr##_DIV; \
|
reg &= ~BM_CLKCTRL_##dr##_DIV; \
|
||||||
reg |= div << BP_CLKCTRL_##dr##_DIV; \
|
reg |= div << BP_CLKCTRL_##dr##_DIV; \
|
||||||
if (reg | (1 << clk->enable_shift)) { \
|
if (reg & (1 << clk->enable_shift)) { \
|
||||||
pr_err("%s: clock is gated\n", __func__); \
|
pr_err("%s: clock is gated\n", __func__); \
|
||||||
return -EINVAL; \
|
return -EINVAL; \
|
||||||
} \
|
} \
|
||||||
} \
|
} \
|
||||||
__raw_writel(reg, CLKCTRL_BASE_ADDR + HW_CLKCTRL_CPU); \
|
__raw_writel(reg, CLKCTRL_BASE_ADDR + HW_CLKCTRL_##dr); \
|
||||||
\
|
\
|
||||||
for (i = 10000; i; i--) \
|
for (i = 10000; i; i--) \
|
||||||
if (!(__raw_readl(CLKCTRL_BASE_ADDR + \
|
if (!(__raw_readl(CLKCTRL_BASE_ADDR + \
|
||||||
|
@ -483,7 +483,7 @@ static int name##_set_parent(struct clk *clk, struct clk *parent) \
|
||||||
{ \
|
{ \
|
||||||
if (parent != clk->parent) { \
|
if (parent != clk->parent) { \
|
||||||
__raw_writel(BM_CLKCTRL_CLKSEQ_BYPASS_##bit, \
|
__raw_writel(BM_CLKCTRL_CLKSEQ_BYPASS_##bit, \
|
||||||
HW_CLKCTRL_CLKSEQ_TOG); \
|
CLKCTRL_BASE_ADDR + HW_CLKCTRL_CLKSEQ_TOG); \
|
||||||
clk->parent = parent; \
|
clk->parent = parent; \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
|
@ -609,7 +609,6 @@ static struct clk_lookup lookups[] = {
|
||||||
_REGISTER_CLOCK("duart", NULL, uart_clk)
|
_REGISTER_CLOCK("duart", NULL, uart_clk)
|
||||||
_REGISTER_CLOCK("imx28-fec.0", NULL, fec_clk)
|
_REGISTER_CLOCK("imx28-fec.0", NULL, fec_clk)
|
||||||
_REGISTER_CLOCK("imx28-fec.1", NULL, fec_clk)
|
_REGISTER_CLOCK("imx28-fec.1", NULL, fec_clk)
|
||||||
_REGISTER_CLOCK("fec.0", NULL, fec_clk)
|
|
||||||
_REGISTER_CLOCK("rtc", NULL, rtc_clk)
|
_REGISTER_CLOCK("rtc", NULL, rtc_clk)
|
||||||
_REGISTER_CLOCK("pll2", NULL, pll2_clk)
|
_REGISTER_CLOCK("pll2", NULL, pll2_clk)
|
||||||
_REGISTER_CLOCK(NULL, "hclk", hbus_clk)
|
_REGISTER_CLOCK(NULL, "hclk", hbus_clk)
|
||||||
|
|
|
@ -57,7 +57,6 @@ static void __clk_disable(struct clk *clk)
|
||||||
if (clk->disable)
|
if (clk->disable)
|
||||||
clk->disable(clk);
|
clk->disable(clk);
|
||||||
__clk_disable(clk->parent);
|
__clk_disable(clk->parent);
|
||||||
__clk_disable(clk->secondary);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -68,7 +67,6 @@ static int __clk_enable(struct clk *clk)
|
||||||
|
|
||||||
if (clk->usecount++ == 0) {
|
if (clk->usecount++ == 0) {
|
||||||
__clk_enable(clk->parent);
|
__clk_enable(clk->parent);
|
||||||
__clk_enable(clk->secondary);
|
|
||||||
|
|
||||||
if (clk->enable)
|
if (clk->enable)
|
||||||
clk->enable(clk);
|
clk->enable(clk);
|
||||||
|
|
|
@ -139,6 +139,8 @@ static void mxs_gpio_irq_handler(u32 irq, struct irq_desc *desc)
|
||||||
struct mxs_gpio_port *port = (struct mxs_gpio_port *)get_irq_data(irq);
|
struct mxs_gpio_port *port = (struct mxs_gpio_port *)get_irq_data(irq);
|
||||||
u32 gpio_irq_no_base = port->virtual_irq_start;
|
u32 gpio_irq_no_base = port->virtual_irq_start;
|
||||||
|
|
||||||
|
desc->irq_data.chip->irq_ack(&desc->irq_data);
|
||||||
|
|
||||||
irq_stat = __raw_readl(port->base + PINCTRL_IRQSTAT(port->id)) &
|
irq_stat = __raw_readl(port->base + PINCTRL_IRQSTAT(port->id)) &
|
||||||
__raw_readl(port->base + PINCTRL_IRQEN(port->id));
|
__raw_readl(port->base + PINCTRL_IRQEN(port->id));
|
||||||
|
|
||||||
|
|
|
@ -29,8 +29,6 @@ struct clk {
|
||||||
int id;
|
int id;
|
||||||
/* Source clock this clk depends on */
|
/* Source clock this clk depends on */
|
||||||
struct clk *parent;
|
struct clk *parent;
|
||||||
/* Secondary clock to enable/disable with this clock */
|
|
||||||
struct clk *secondary;
|
|
||||||
/* Reference count of clock enable/disable */
|
/* Reference count of clock enable/disable */
|
||||||
__s8 usecount;
|
__s8 usecount;
|
||||||
/* Register bit position for clock's enable/disable control. */
|
/* Register bit position for clock's enable/disable control. */
|
||||||
|
|
|
@ -95,6 +95,7 @@ static __inline__ void __arch_decomp_setup(unsigned long arch_id)
|
||||||
case MACH_TYPE_MX35_3DS:
|
case MACH_TYPE_MX35_3DS:
|
||||||
case MACH_TYPE_PCM043:
|
case MACH_TYPE_PCM043:
|
||||||
case MACH_TYPE_LILLY1131:
|
case MACH_TYPE_LILLY1131:
|
||||||
|
case MACH_TYPE_VPR200:
|
||||||
uart_base = MX3X_UART1_BASE_ADDR;
|
uart_base = MX3X_UART1_BASE_ADDR;
|
||||||
break;
|
break;
|
||||||
case MACH_TYPE_MAGX_ZN5:
|
case MACH_TYPE_MAGX_ZN5:
|
||||||
|
@ -102,6 +103,7 @@ static __inline__ void __arch_decomp_setup(unsigned long arch_id)
|
||||||
break;
|
break;
|
||||||
case MACH_TYPE_MX51_BABBAGE:
|
case MACH_TYPE_MX51_BABBAGE:
|
||||||
case MACH_TYPE_EUKREA_CPUIMX51SD:
|
case MACH_TYPE_EUKREA_CPUIMX51SD:
|
||||||
|
case MACH_TYPE_MX51_3DS:
|
||||||
uart_base = MX51_UART1_BASE_ADDR;
|
uart_base = MX51_UART1_BASE_ADDR;
|
||||||
break;
|
break;
|
||||||
case MACH_TYPE_MX50_RDP:
|
case MACH_TYPE_MX50_RDP:
|
||||||
|
|
|
@ -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: Sun Dec 12 23:24:27 2010
|
# Last update: Mon Feb 7 08:59:27 2011
|
||||||
#
|
#
|
||||||
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
|
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
|
||||||
#
|
#
|
||||||
|
@ -2240,7 +2240,7 @@ arm_ultimator2 MACH_ARM_ULTIMATOR2 ARM_ULTIMATOR2 2250
|
||||||
vs_v210 MACH_VS_V210 VS_V210 2252
|
vs_v210 MACH_VS_V210 VS_V210 2252
|
||||||
vs_v212 MACH_VS_V212 VS_V212 2253
|
vs_v212 MACH_VS_V212 VS_V212 2253
|
||||||
hmt MACH_HMT HMT 2254
|
hmt MACH_HMT HMT 2254
|
||||||
suen3 MACH_SUEN3 SUEN3 2255
|
km_kirkwood MACH_KM_KIRKWOOD KM_KIRKWOOD 2255
|
||||||
vesper MACH_VESPER VESPER 2256
|
vesper MACH_VESPER VESPER 2256
|
||||||
str9 MACH_STR9 STR9 2257
|
str9 MACH_STR9 STR9 2257
|
||||||
omap3_wl_ff MACH_OMAP3_WL_FF OMAP3_WL_FF 2258
|
omap3_wl_ff MACH_OMAP3_WL_FF OMAP3_WL_FF 2258
|
||||||
|
@ -2987,7 +2987,7 @@ pxwnas_500_1000 MACH_PXWNAS_500_1000 PXWNAS_500_1000 3001
|
||||||
ea20 MACH_EA20 EA20 3002
|
ea20 MACH_EA20 EA20 3002
|
||||||
awm2 MACH_AWM2 AWM2 3003
|
awm2 MACH_AWM2 AWM2 3003
|
||||||
ti8148evm MACH_TI8148EVM TI8148EVM 3004
|
ti8148evm MACH_TI8148EVM TI8148EVM 3004
|
||||||
tegra_seaboard MACH_TEGRA_SEABOARD TEGRA_SEABOARD 3005
|
seaboard MACH_SEABOARD SEABOARD 3005
|
||||||
linkstation_chlv2 MACH_LINKSTATION_CHLV2 LINKSTATION_CHLV2 3006
|
linkstation_chlv2 MACH_LINKSTATION_CHLV2 LINKSTATION_CHLV2 3006
|
||||||
tera_pro2_rack MACH_TERA_PRO2_RACK TERA_PRO2_RACK 3007
|
tera_pro2_rack MACH_TERA_PRO2_RACK TERA_PRO2_RACK 3007
|
||||||
rubys MACH_RUBYS RUBYS 3008
|
rubys MACH_RUBYS RUBYS 3008
|
||||||
|
@ -3190,7 +3190,7 @@ synergy MACH_SYNERGY SYNERGY 3205
|
||||||
ics_if_voip MACH_ICS_IF_VOIP ICS_IF_VOIP 3206
|
ics_if_voip MACH_ICS_IF_VOIP ICS_IF_VOIP 3206
|
||||||
wlf_cragg_6410 MACH_WLF_CRAGG_6410 WLF_CRAGG_6410 3207
|
wlf_cragg_6410 MACH_WLF_CRAGG_6410 WLF_CRAGG_6410 3207
|
||||||
punica MACH_PUNICA PUNICA 3208
|
punica MACH_PUNICA PUNICA 3208
|
||||||
sbc_nt250 MACH_SBC_NT250 SBC_NT250 3209
|
trimslice MACH_TRIMSLICE TRIMSLICE 3209
|
||||||
mx27_wmultra MACH_MX27_WMULTRA MX27_WMULTRA 3210
|
mx27_wmultra MACH_MX27_WMULTRA MX27_WMULTRA 3210
|
||||||
mackerel MACH_MACKEREL MACKEREL 3211
|
mackerel MACH_MACKEREL MACKEREL 3211
|
||||||
fa9x27 MACH_FA9X27 FA9X27 3213
|
fa9x27 MACH_FA9X27 FA9X27 3213
|
||||||
|
@ -3219,3 +3219,100 @@ pivicc MACH_PIVICC PIVICC 3235
|
||||||
pcm048 MACH_PCM048 PCM048 3236
|
pcm048 MACH_PCM048 PCM048 3236
|
||||||
dds MACH_DDS DDS 3237
|
dds MACH_DDS DDS 3237
|
||||||
chalten_xa1 MACH_CHALTEN_XA1 CHALTEN_XA1 3238
|
chalten_xa1 MACH_CHALTEN_XA1 CHALTEN_XA1 3238
|
||||||
|
ts48xx MACH_TS48XX TS48XX 3239
|
||||||
|
tonga2_tfttimer MACH_TONGA2_TFTTIMER TONGA2_TFTTIMER 3240
|
||||||
|
whistler MACH_WHISTLER WHISTLER 3241
|
||||||
|
asl_phoenix MACH_ASL_PHOENIX ASL_PHOENIX 3242
|
||||||
|
at91sam9263otlite MACH_AT91SAM9263OTLITE AT91SAM9263OTLITE 3243
|
||||||
|
ddplug MACH_DDPLUG DDPLUG 3244
|
||||||
|
d2plug MACH_D2PLUG D2PLUG 3245
|
||||||
|
kzm9d MACH_KZM9D KZM9D 3246
|
||||||
|
verdi_lte MACH_VERDI_LTE VERDI_LTE 3247
|
||||||
|
nanozoom MACH_NANOZOOM NANOZOOM 3248
|
||||||
|
dm3730_som_lv MACH_DM3730_SOM_LV DM3730_SOM_LV 3249
|
||||||
|
dm3730_torpedo MACH_DM3730_TORPEDO DM3730_TORPEDO 3250
|
||||||
|
anchovy MACH_ANCHOVY ANCHOVY 3251
|
||||||
|
re2rev20 MACH_RE2REV20 RE2REV20 3253
|
||||||
|
re2rev21 MACH_RE2REV21 RE2REV21 3254
|
||||||
|
cns21xx MACH_CNS21XX CNS21XX 3255
|
||||||
|
rider MACH_RIDER RIDER 3257
|
||||||
|
nsk330 MACH_NSK330 NSK330 3258
|
||||||
|
cns2133evb MACH_CNS2133EVB CNS2133EVB 3259
|
||||||
|
z3_816x_mod MACH_Z3_816X_MOD Z3_816X_MOD 3260
|
||||||
|
z3_814x_mod MACH_Z3_814X_MOD Z3_814X_MOD 3261
|
||||||
|
beect MACH_BEECT BEECT 3262
|
||||||
|
dma_thunderbug MACH_DMA_THUNDERBUG DMA_THUNDERBUG 3263
|
||||||
|
omn_at91sam9g20 MACH_OMN_AT91SAM9G20 OMN_AT91SAM9G20 3264
|
||||||
|
mx25_e2s_uc MACH_MX25_E2S_UC MX25_E2S_UC 3265
|
||||||
|
mione MACH_MIONE MIONE 3266
|
||||||
|
top9000_tcu MACH_TOP9000_TCU TOP9000_TCU 3267
|
||||||
|
top9000_bsl MACH_TOP9000_BSL TOP9000_BSL 3268
|
||||||
|
kingdom MACH_KINGDOM KINGDOM 3269
|
||||||
|
armadillo460 MACH_ARMADILLO460 ARMADILLO460 3270
|
||||||
|
lq2 MACH_LQ2 LQ2 3271
|
||||||
|
sweda_tms2 MACH_SWEDA_TMS2 SWEDA_TMS2 3272
|
||||||
|
mx53_loco MACH_MX53_LOCO MX53_LOCO 3273
|
||||||
|
acer_a8 MACH_ACER_A8 ACER_A8 3275
|
||||||
|
acer_gauguin MACH_ACER_GAUGUIN ACER_GAUGUIN 3276
|
||||||
|
guppy MACH_GUPPY GUPPY 3277
|
||||||
|
mx61_ard MACH_MX61_ARD MX61_ARD 3278
|
||||||
|
tx53 MACH_TX53 TX53 3279
|
||||||
|
omapl138_case_a3 MACH_OMAPL138_CASE_A3 OMAPL138_CASE_A3 3280
|
||||||
|
uemd MACH_UEMD UEMD 3281
|
||||||
|
ccwmx51mut MACH_CCWMX51MUT CCWMX51MUT 3282
|
||||||
|
rockhopper MACH_ROCKHOPPER ROCKHOPPER 3283
|
||||||
|
nookcolor MACH_NOOKCOLOR NOOKCOLOR 3284
|
||||||
|
hkdkc100 MACH_HKDKC100 HKDKC100 3285
|
||||||
|
ts42xx MACH_TS42XX TS42XX 3286
|
||||||
|
aebl MACH_AEBL AEBL 3287
|
||||||
|
wario MACH_WARIO WARIO 3288
|
||||||
|
gfs_spm MACH_GFS_SPM GFS_SPM 3289
|
||||||
|
cm_t3730 MACH_CM_T3730 CM_T3730 3290
|
||||||
|
isc3 MACH_ISC3 ISC3 3291
|
||||||
|
rascal MACH_RASCAL RASCAL 3292
|
||||||
|
hrefv60 MACH_HREFV60 HREFV60 3293
|
||||||
|
tpt_2_0 MACH_TPT_2_0 TPT_2_0 3294
|
||||||
|
pyramid_td MACH_PYRAMID_TD PYRAMID_TD 3295
|
||||||
|
splendor MACH_SPLENDOR SPLENDOR 3296
|
||||||
|
guf_planet MACH_GUF_PLANET GUF_PLANET 3297
|
||||||
|
msm8x60_qt MACH_MSM8X60_QT MSM8X60_QT 3298
|
||||||
|
htc_hd_mini MACH_HTC_HD_MINI HTC_HD_MINI 3299
|
||||||
|
athene MACH_ATHENE ATHENE 3300
|
||||||
|
deep_r_ek_1 MACH_DEEP_R_EK_1 DEEP_R_EK_1 3301
|
||||||
|
vivow_ct MACH_VIVOW_CT VIVOW_CT 3302
|
||||||
|
nery_1000 MACH_NERY_1000 NERY_1000 3303
|
||||||
|
rfl109145_ssrv MACH_RFL109145_SSRV RFL109145_SSRV 3304
|
||||||
|
nmh MACH_NMH NMH 3305
|
||||||
|
wn802t MACH_WN802T WN802T 3306
|
||||||
|
dragonet MACH_DRAGONET DRAGONET 3307
|
||||||
|
geneva_b MACH_GENEVA_B GENEVA_B 3308
|
||||||
|
at91sam9263desk16l MACH_AT91SAM9263DESK16L AT91SAM9263DESK16L 3309
|
||||||
|
bcmhana_sv MACH_BCMHANA_SV BCMHANA_SV 3310
|
||||||
|
bcmhana_tablet MACH_BCMHANA_TABLET BCMHANA_TABLET 3311
|
||||||
|
koi MACH_KOI KOI 3312
|
||||||
|
ts4800 MACH_TS4800 TS4800 3313
|
||||||
|
tqma9263 MACH_TQMA9263 TQMA9263 3314
|
||||||
|
holiday MACH_HOLIDAY HOLIDAY 3315
|
||||||
|
dma_6410 MACH_DMA6410 DMA6410 3316
|
||||||
|
pcats_overlay MACH_PCATS_OVERLAY PCATS_OVERLAY 3317
|
||||||
|
hwgw6410 MACH_HWGW6410 HWGW6410 3318
|
||||||
|
shenzhou MACH_SHENZHOU SHENZHOU 3319
|
||||||
|
cwme9210 MACH_CWME9210 CWME9210 3320
|
||||||
|
cwme9210js MACH_CWME9210JS CWME9210JS 3321
|
||||||
|
pgs_v1 MACH_PGS_SITARA PGS_SITARA 3322
|
||||||
|
colibri_tegra2 MACH_COLIBRI_TEGRA2 COLIBRI_TEGRA2 3323
|
||||||
|
w21 MACH_W21 W21 3324
|
||||||
|
polysat1 MACH_POLYSAT1 POLYSAT1 3325
|
||||||
|
dataway MACH_DATAWAY DATAWAY 3326
|
||||||
|
cobral138 MACH_COBRAL138 COBRAL138 3327
|
||||||
|
roverpcs8 MACH_ROVERPCS8 ROVERPCS8 3328
|
||||||
|
marvelc MACH_MARVELC MARVELC 3329
|
||||||
|
navefihid MACH_NAVEFIHID NAVEFIHID 3330
|
||||||
|
dm365_cv100 MACH_DM365_CV100 DM365_CV100 3331
|
||||||
|
able MACH_ABLE ABLE 3332
|
||||||
|
legacy MACH_LEGACY LEGACY 3333
|
||||||
|
icong MACH_ICONG ICONG 3334
|
||||||
|
rover_g8 MACH_ROVER_G8 ROVER_G8 3335
|
||||||
|
t5388p MACH_T5388P T5388P 3336
|
||||||
|
dingo MACH_DINGO DINGO 3337
|
||||||
|
goflexhome MACH_GOFLEXHOME GOFLEXHOME 3338
|
||||||
|
|
|
@ -50,7 +50,11 @@ static void aaci_ac97_select_codec(struct aaci *aaci, struct snd_ac97 *ac97)
|
||||||
if (v & SLFR_1RXV)
|
if (v & SLFR_1RXV)
|
||||||
readl(aaci->base + AACI_SL1RX);
|
readl(aaci->base + AACI_SL1RX);
|
||||||
|
|
||||||
|
if (maincr != readl(aaci->base + AACI_MAINCR)) {
|
||||||
writel(maincr, aaci->base + AACI_MAINCR);
|
writel(maincr, aaci->base + AACI_MAINCR);
|
||||||
|
readl(aaci->base + AACI_MAINCR);
|
||||||
|
udelay(1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -993,6 +997,8 @@ static unsigned int __devinit aaci_size_fifo(struct aaci *aaci)
|
||||||
* disabling the channel doesn't clear the FIFO.
|
* disabling the channel doesn't clear the FIFO.
|
||||||
*/
|
*/
|
||||||
writel(aaci->maincr & ~MAINCR_IE, aaci->base + AACI_MAINCR);
|
writel(aaci->maincr & ~MAINCR_IE, aaci->base + AACI_MAINCR);
|
||||||
|
readl(aaci->base + AACI_MAINCR);
|
||||||
|
udelay(1);
|
||||||
writel(aaci->maincr, aaci->base + AACI_MAINCR);
|
writel(aaci->maincr, aaci->base + AACI_MAINCR);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue