evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel

Browse source
This commit is contained in:
Russell King 2009-03-28 14:15:43 +00:00 • committed by Russell King
commit dc52b5bf2c
5 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-pxa/colibri-pxa300.c
View file

@ -172,7 +172,7 @@ void __init colibri_pxa300_init(void)
colibri_pxa300_init_eth(); colibri_pxa300_init_eth();
colibri_pxa300_init_ohci(); colibri_pxa300_init_ohci();
colibri_pxa300_init_lcd(); colibri_pxa300_init_lcd();
colibri_pxa3xx_init_lcd(mfp_to_gpio(GPIO49_GPIO)); colibri_pxa3xx_init_lcd(mfp_to_gpio(GPIO39_GPIO));
colibri_pxa310_init_ac97(); colibri_pxa310_init_ac97();
colibri_pxa3xx_init_mmc(ARRAY_AND_SIZE(colibri_pxa300_mmc_pin_config), colibri_pxa3xx_init_mmc(ARRAY_AND_SIZE(colibri_pxa300_mmc_pin_config),
mfp_to_gpio(MFP_PIN_GPIO13)); mfp_to_gpio(MFP_PIN_GPIO13));

2
arch/arm/mach-pxa/colibri-pxa320.c
View file

@ -169,7 +169,7 @@ void __init colibri_pxa320_init(void)
colibri_pxa320_init_eth(); colibri_pxa320_init_eth();
colibri_pxa320_init_ohci(); colibri_pxa320_init_ohci();
colibri_pxa320_init_lcd(); colibri_pxa320_init_lcd();
colibri_pxa3xx_init_lcd(mfp_to_gpio(GPIO39_GPIO)); colibri_pxa3xx_init_lcd(mfp_to_gpio(GPIO49_GPIO));
colibri_pxa320_init_ac97(); colibri_pxa320_init_ac97();
colibri_pxa3xx_init_mmc(ARRAY_AND_SIZE(colibri_pxa320_mmc_pin_config), colibri_pxa3xx_init_mmc(ARRAY_AND_SIZE(colibri_pxa320_mmc_pin_config),
mfp_to_gpio(MFP_PIN_GPIO28)); mfp_to_gpio(MFP_PIN_GPIO28));

4
arch/arm/plat-pxa/Makefile
View file

@ -2,6 +2,8 @@
# Makefile for code common across different PXA processor families # Makefile for code common across different PXA processor families
# #
obj-y := dma.o mfp.o obj-y := dma.o
obj-$(CONFIG_GENERIC_GPIO) += gpio.o obj-$(CONFIG_GENERIC_GPIO) += gpio.o
obj-$(CONFIG_PXA3xx) += mfp.o
obj-$(CONFIG_ARCH_MMP) += mfp.o

4
drivers/pcmcia/pxa2xx_base.c
View file

@ -214,7 +214,7 @@ static void pxa2xx_configure_sockets(struct device *dev)
MECR |= MECR_CIT; MECR |= MECR_CIT;
/* Set MECR:NOS (Number Of Sockets) */ /* Set MECR:NOS (Number Of Sockets) */
if (ops->nr > 1 || machine_is_viper()) if ((ops->first + ops->nr) > 1 || machine_is_viper())
MECR |= MECR_NOS; MECR |= MECR_NOS;
else else
MECR &= ~MECR_NOS; MECR &= ~MECR_NOS;
@ -250,7 +250,7 @@ int __pxa2xx_drv_pcmcia_probe(struct device *dev)
for (i = 0; i < ops->nr; i++) { for (i = 0; i < ops->nr; i++) {
skt = &sinfo->skt[i]; skt = &sinfo->skt[i];
skt->nr = i; skt->nr = ops->first + i;
skt->irq = NO_IRQ; skt->irq = NO_IRQ;
skt->res_skt.start = _PCMCIA(skt->nr); skt->res_skt.start = _PCMCIA(skt->nr);

4
drivers/pcmcia/pxa2xx_palmld.c
View file

@ -98,8 +98,8 @@ static void palmld_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
static struct pcmcia_low_level palmld_pcmcia_ops = { static struct pcmcia_low_level palmld_pcmcia_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.first = 0, .first = 1,
.nr = 2, .nr = 1,
.hw_init = palmld_pcmcia_hw_init, .hw_init = palmld_pcmcia_hw_init,
.hw_shutdown = palmld_pcmcia_hw_shutdown, .hw_shutdown = palmld_pcmcia_hw_shutdown,