Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52d90145 authored by Russell King's avatar Russell King
Browse files

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

parents f4b23cc2 59376cc3

arch/arm/mach-pxa/colibri-pxa300.c

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <mach/colibri.h>

#include <mach/ohci.h>

#include <mach/pxafb.h>

#include <mach/audio.h>



#include "generic.h"

#include "devices.h"
@@ -145,7 +146,7 @@ static void __init colibri_pxa300_init_lcd(void) 
static inline void colibri_pxa300_init_lcd(void) {}

#endif /* CONFIG_FB_PXA || CONFIG_FB_PXA_MODULE */



#if defined(SND_AC97_CODEC) || defined(SND_AC97_CODEC_MODULE)

#if defined(CONFIG_SND_AC97_CODEC) || defined(CONFIG_SND_AC97_CODEC_MODULE)

static mfp_cfg_t colibri_pxa310_ac97_pin_config[] __initdata = {

	GPIO24_AC97_SYSCLK,

	GPIO23_AC97_nACRESET,

arch/arm/mach-pxa/corgi.c

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ static struct platform_device corgiled_device = { 
static struct pxamci_platform_data corgi_mci_platform_data = {

	.detect_delay_ms	= 250,

	.ocr_mask		= MMC_VDD_32_33|MMC_VDD_33_34,

	.gpio_card_detect	= -1,

	.gpio_card_detect	= CORGI_GPIO_nSD_DETECT,

	.gpio_card_ro		= CORGI_GPIO_nSD_WP,

	.gpio_power		= CORGI_GPIO_SD_PWR,

};

arch/arm/mach-pxa/cpufreq-pxa2xx.c

+2 −6
Original line number Diff line number Diff line
@@ -256,13 +256,9 @@ static void init_sdram_rows(void) 


static u32 mdrefr_dri(unsigned int freq)

{

	u32 dri = 0;

	u32 interval = freq * SDRAM_TREF / sdram_rows;



	if (cpu_is_pxa25x())

		dri = ((freq * SDRAM_TREF) / (sdram_rows * 32));

	if (cpu_is_pxa27x())

		dri = ((freq * SDRAM_TREF) / (sdram_rows - 31)) / 32;

	return dri;

	return (interval - (cpu_is_pxa27x() ? 31 : 0)) / 32;

}



/* find a valid frequency point */

arch/arm/mach-pxa/pxa27x.c

+3 −3
Original line number Diff line number Diff line
@@ -41,10 +41,10 @@ void pxa27x_clear_otgph(void) 
EXPORT_SYMBOL(pxa27x_clear_otgph);



static unsigned long ac97_reset_config[] = {

	GPIO95_AC97_nRESET,

	GPIO95_GPIO,

	GPIO113_AC97_nRESET,

	GPIO113_GPIO,

	GPIO113_AC97_nRESET,

	GPIO95_GPIO,

	GPIO95_AC97_nRESET,

};



void pxa27x_assert_ac97reset(int reset_gpio, int on)

drivers/pcmcia/pxa2xx_base.c

+2 −3
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ pxa2xx_pcmcia_frequency_change(struct soc_pcmcia_socket *skt, 
			       unsigned long val,

			       struct cpufreq_freqs *freqs)

{

#warning "it's not clear if this is right since the core CPU (N) clock has no effect on the memory (L) clock"

	switch (val) {

	case CPUFREQ_PRECHANGE:

		if (freqs->new > freqs->old) {
@@ -186,7 +185,7 @@ pxa2xx_pcmcia_frequency_change(struct soc_pcmcia_socket *skt, 
			       "pre-updating\n",

			       freqs->new / 1000, (freqs->new / 100) % 10,

			       freqs->old / 1000, (freqs->old / 100) % 10);

			pxa2xx_pcmcia_set_mcxx(skt, freqs->new);

			pxa2xx_pcmcia_set_timing(skt);

		}

		break;
@@ -196,7 +195,7 @@ pxa2xx_pcmcia_frequency_change(struct soc_pcmcia_socket *skt, 
			       "post-updating\n",

			       freqs->new / 1000, (freqs->new / 100) % 10,

			       freqs->old / 1000, (freqs->old / 100) % 10);

			pxa2xx_pcmcia_set_mcxx(skt, freqs->new);

			pxa2xx_pcmcia_set_timing(skt);

		}

		break;

	}