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

Commit 112a674f 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 e12399fe 7df56c25

arch/arm/mach-mmp/include/mach/mfp-pxa910.h

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ 
#define MMC1_WP_MMC1_WP		MFP_CFG_DRV(MMC1_WP, AF0, MEDIUM)



/* PWM */

#define GPIO27 PWM3 AF2		MFP_CFG(GPIO27, AF2)

#define GPIO27_PWM3_AF2		MFP_CFG(GPIO27, AF2)

#define GPIO51_PWM2_OUT		MFP_CFG(GPIO51, AF2)

#define GPIO117_PWM1_OUT	MFP_CFG(GPIO117, AF2)

#define GPIO118_PWM2_OUT	MFP_CFG(GPIO118, AF2)

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

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

#include <mach/pxafb.h>

#include <mach/ohci.h>

#include <mach/audio.h>



#include "generic.h"

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

#endif



#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_pxa320_ac97_pin_config[] __initdata = {

	GPIO34_AC97_SYSCLK,

	GPIO35_AC97_SDATA_IN_0,

arch/arm/mach-pxa/hx4700.c

+1 −1
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ static struct platform_device gpio_vbus = { 
static const struct ads7846_platform_data tsc2046_info = {

	.model            = 7846,

	.vref_delay_usecs = 100,

	.pressure_max     = 512,

	.pressure_max     = 1024,

	.debounce_max     = 10,

	.debounce_tol     = 3,

	.debounce_rep     = 1,

arch/arm/mach-pxa/include/mach/entry-macro.S

+1 −0
Original line number Diff line number Diff line
@@ -46,5 +46,6 @@ 
		beq	1001f

		bic	\irqstat, \irqstat, #0x80000000

		mov	\irqnr, \irqstat, lsr #16

		add	\irqnr, \irqnr, #(PXA_IRQ(0))

1001:

		.endm

arch/arm/plat-pxa/include/plat/mfp.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#ifndef __ASM_PLAT_MFP_H

#define __ASM_PLAT_MFP_H



#define mfp_to_gpio(m)	((m) % 128)

#define mfp_to_gpio(m)	((m) % 256)



/* list of all the configurable MFP pins */

enum {