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

Commit 355532bd authored by Russell King's avatar Russell King Committed by Russell King
Browse files

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

parents 2528ed11 6ec04f43

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

+5 −0
Original line number Diff line number Diff line
@@ -3,6 +3,11 @@ 


#include <mach/mfp.h>



#define MFP_DRIVE_VERY_SLOW	(0x0 << 13)

#define MFP_DRIVE_SLOW		(0x1 << 13)

#define MFP_DRIVE_MEDIUM	(0x2 << 13)

#define MFP_DRIVE_FAST		(0x3 << 13)



/* GPIO */

#define GPIO0_GPIO		MFP_CFG(GPIO0, AF5)

#define GPIO1_GPIO		MFP_CFG(GPIO1, AF5)

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

+5 −0
Original line number Diff line number Diff line
@@ -3,6 +3,11 @@ 


#include <mach/mfp.h>



#define MFP_DRIVE_VERY_SLOW	(0x0 << 13)

#define MFP_DRIVE_SLOW		(0x2 << 13)

#define MFP_DRIVE_MEDIUM	(0x4 << 13)

#define MFP_DRIVE_FAST		(0x8 << 13)



/* UART2 */

#define GPIO47_UART2_RXD	MFP_CFG(GPIO47, AF6)

#define GPIO48_UART2_TXD	MFP_CFG(GPIO48, AF6)

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

+3 −6
Original line number Diff line number Diff line
@@ -12,16 +12,13 @@ 
 * possible, we make the following compromise:

 *

 * 1. SLEEP_OE_N will always be programmed to '1' (by MFP_LPM_FLOAT)

 * 2. DRIVE strength definitions redefined to include the reserved bit10

 * 2. DRIVE strength definitions redefined to include the reserved bit

 *    - the reserved bit differs between pxa168 and pxa910, and the

 *      MFP_DRIVE_* macros are individually defined in mfp-pxa{168,910}.h

 * 3. Override MFP_CFG() and MFP_CFG_DRV()

 * 4. Drop the use of MFP_CFG_LPM() and MFP_CFG_X()

 */



#define MFP_DRIVE_VERY_SLOW	(0x0 << 13)

#define MFP_DRIVE_SLOW		(0x2 << 13)

#define MFP_DRIVE_MEDIUM	(0x4 << 13)

#define MFP_DRIVE_FAST		(0x8 << 13)



#undef MFP_CFG

#undef MFP_CFG_DRV

#undef MFP_CFG_LPM

arch/arm/mach-mmp/time.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static struct clock_event_device ckevt = { 
	.set_mode	= timer_set_mode,

};



static cycle_t clksrc_read(void)

static cycle_t clksrc_read(struct clocksource *cs)

{

	return timer_read();

}

arch/arm/mach-pxa/ezx.c

+18 −18
Original line number Diff line number Diff line
@@ -111,9 +111,9 @@ static unsigned long ezx_pin_config[] __initdata = { 
	GPIO25_SSP1_TXD,

	GPIO26_SSP1_RXD,

	GPIO24_GPIO,				/* pcap chip select */

	GPIO1_GPIO,				/* pcap interrupt */

	GPIO4_GPIO,				/* WDI_AP */

	GPIO55_GPIO,				/* SYS_RESTART */

	GPIO1_GPIO | WAKEUP_ON_EDGE_RISE,	/* pcap interrupt */

	GPIO4_GPIO | MFP_LPM_DRIVE_HIGH,	/* WDI_AP */

	GPIO55_GPIO | MFP_LPM_DRIVE_HIGH,	/* SYS_RESTART */



	/* MMC */

	GPIO32_MMC_CLK,
@@ -144,20 +144,20 @@ static unsigned long ezx_pin_config[] __initdata = { 
#if defined(CONFIG_MACH_EZX_A780) || defined(CONFIG_MACH_EZX_E680)

static unsigned long gen1_pin_config[] __initdata = {

	/* flip / lockswitch */

	GPIO12_GPIO,

	GPIO12_GPIO | WAKEUP_ON_EDGE_BOTH,



	/* bluetooth (bcm2035) */

	GPIO14_GPIO | WAKEUP_ON_LEVEL_HIGH,	/* HOSTWAKE */

	GPIO14_GPIO | WAKEUP_ON_EDGE_RISE,	/* HOSTWAKE */

	GPIO48_GPIO,				/* RESET */

	GPIO28_GPIO,				/* WAKEUP */



	/* Neptune handshake */

	GPIO0_GPIO | WAKEUP_ON_LEVEL_HIGH,	/* BP_RDY */

	GPIO57_GPIO,				/* AP_RDY */

	GPIO13_GPIO | WAKEUP_ON_LEVEL_HIGH,	/* WDI */

	GPIO3_GPIO | WAKEUP_ON_LEVEL_HIGH,	/* WDI2 */

	GPIO82_GPIO,				/* RESET */

	GPIO99_GPIO,				/* TC_MM_EN */

	GPIO0_GPIO | WAKEUP_ON_EDGE_FALL,	/* BP_RDY */

	GPIO57_GPIO | MFP_LPM_DRIVE_HIGH,	/* AP_RDY */

	GPIO13_GPIO | WAKEUP_ON_EDGE_BOTH,	/* WDI */

	GPIO3_GPIO | WAKEUP_ON_EDGE_BOTH,	/* WDI2 */

	GPIO82_GPIO | MFP_LPM_DRIVE_HIGH,	/* RESET */

	GPIO99_GPIO | MFP_LPM_DRIVE_HIGH,	/* TC_MM_EN */



	/* sound */

	GPIO52_SSP3_SCLK,
@@ -199,21 +199,21 @@ static unsigned long gen1_pin_config[] __initdata = { 
	defined(CONFIG_MACH_EZX_E2) || defined(CONFIG_MACH_EZX_E6)

static unsigned long gen2_pin_config[] __initdata = {

	/* flip / lockswitch */

	GPIO15_GPIO,

	GPIO15_GPIO | WAKEUP_ON_EDGE_BOTH,



	/* EOC */

	GPIO10_GPIO,

	GPIO10_GPIO | WAKEUP_ON_EDGE_RISE,



	/* bluetooth (bcm2045) */

	GPIO13_GPIO | WAKEUP_ON_LEVEL_HIGH,	/* HOSTWAKE */

	GPIO13_GPIO | WAKEUP_ON_EDGE_RISE,	/* HOSTWAKE */

	GPIO37_GPIO,				/* RESET */

	GPIO57_GPIO,				/* WAKEUP */



	/* Neptune handshake */

	GPIO0_GPIO | WAKEUP_ON_LEVEL_HIGH,	/* BP_RDY */

	GPIO96_GPIO,				/* AP_RDY */

	GPIO3_GPIO | WAKEUP_ON_LEVEL_HIGH,	/* WDI */

	GPIO116_GPIO,				/* RESET */

	GPIO0_GPIO | WAKEUP_ON_EDGE_FALL,	/* BP_RDY */

	GPIO96_GPIO | MFP_LPM_DRIVE_HIGH,	/* AP_RDY */

	GPIO3_GPIO | WAKEUP_ON_EDGE_FALL,	/* WDI */

	GPIO116_GPIO | MFP_LPM_DRIVE_HIGH,	/* RESET */

	GPIO41_GPIO,				/* BP_FLASH */



	/* sound */