Commit a10476d4 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] pxa: Add zylonite MFP wakeup configurations 



Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d4fc858f

arch/arm/mach-pxa/zylonite_pxa300.c

+19 −19
Original line number Diff line number Diff line
@@ -53,13 +53,13 @@ static mfp_cfg_t common_mfp_cfg[] __initdata = { 


	/* BTUART */

	GPIO111_UART2_RTS,

	GPIO112_UART2_RXD,

	GPIO112_UART2_RXD | MFP_LPM_EDGE_FALL,

	GPIO113_UART2_TXD,

	GPIO114_UART2_CTS,

	GPIO114_UART2_CTS | MFP_LPM_EDGE_BOTH,



	/* STUART */

	GPIO109_UART3_TXD,

	GPIO110_UART3_RXD,

	GPIO110_UART3_RXD | MFP_LPM_EDGE_FALL,



	/* AC97 */

	GPIO23_AC97_nACRESET,
@@ -70,16 +70,16 @@ static mfp_cfg_t common_mfp_cfg[] __initdata = { 
	GPIO28_AC97_SYNC,



	/* Keypad */

	GPIO107_KP_DKIN_0,

	GPIO108_KP_DKIN_1,

	GPIO115_KP_MKIN_0,

	GPIO116_KP_MKIN_1,

	GPIO117_KP_MKIN_2,

	GPIO118_KP_MKIN_3,

	GPIO119_KP_MKIN_4,

	GPIO120_KP_MKIN_5,

	GPIO2_2_KP_MKIN_6,

	GPIO3_2_KP_MKIN_7,

	GPIO107_KP_DKIN_0 | MFP_LPM_EDGE_BOTH,

	GPIO108_KP_DKIN_1 | MFP_LPM_EDGE_BOTH,

	GPIO115_KP_MKIN_0 | MFP_LPM_EDGE_BOTH,

	GPIO116_KP_MKIN_1 | MFP_LPM_EDGE_BOTH,

	GPIO117_KP_MKIN_2 | MFP_LPM_EDGE_BOTH,

	GPIO118_KP_MKIN_3 | MFP_LPM_EDGE_BOTH,

	GPIO119_KP_MKIN_4 | MFP_LPM_EDGE_BOTH,

	GPIO120_KP_MKIN_5 | MFP_LPM_EDGE_BOTH,

	GPIO2_2_KP_MKIN_6 | MFP_LPM_EDGE_BOTH,

	GPIO3_2_KP_MKIN_7 | MFP_LPM_EDGE_BOTH,

	GPIO121_KP_MKOUT_0,

	GPIO122_KP_MKOUT_1,

	GPIO123_KP_MKOUT_2,
@@ -91,7 +91,7 @@ static mfp_cfg_t common_mfp_cfg[] __initdata = { 


	/* MMC1 */

	GPIO3_MMC1_DAT0,

	GPIO4_MMC1_DAT1,

	GPIO4_MMC1_DAT1 | MFP_LPM_EDGE_BOTH,

	GPIO5_MMC1_DAT2,

	GPIO6_MMC1_DAT3,

	GPIO7_MMC1_CLK,
@@ -100,7 +100,7 @@ static mfp_cfg_t common_mfp_cfg[] __initdata = { 


	/* MMC2 */

	GPIO9_MMC2_DAT0,

	GPIO10_MMC2_DAT1,

	GPIO10_MMC2_DAT1 | MFP_LPM_EDGE_BOTH,

	GPIO11_MMC2_DAT2,

	GPIO12_MMC2_DAT3,

	GPIO13_MMC2_CLK,
@@ -109,12 +109,12 @@ static mfp_cfg_t common_mfp_cfg[] __initdata = { 


static mfp_cfg_t pxa300_mfp_cfg[] __initdata = {

	/* FFUART */

	GPIO30_UART1_RXD,

	GPIO30_UART1_RXD | MFP_LPM_EDGE_FALL,

	GPIO31_UART1_TXD,

	GPIO32_UART1_CTS,

	GPIO37_UART1_RTS,

	GPIO33_UART1_DCD,

	GPIO34_UART1_DSR,

	GPIO34_UART1_DSR | MFP_LPM_EDGE_FALL,

	GPIO35_UART1_RI,

	GPIO36_UART1_DTR,
@@ -125,7 +125,7 @@ static mfp_cfg_t pxa300_mfp_cfg[] __initdata = { 


static mfp_cfg_t pxa310_mfp_cfg[] __initdata = {

	/* FFUART */

	GPIO99_UART1_RXD,

	GPIO99_UART1_RXD | MFP_LPM_EDGE_FALL,

	GPIO100_UART1_TXD,

	GPIO101_UART1_CTS,

	GPIO106_UART1_RTS,
@@ -136,7 +136,7 @@ static mfp_cfg_t pxa310_mfp_cfg[] __initdata = { 


	/* MMC3 */

	GPIO7_2_MMC3_DAT0,

	GPIO8_2_MMC3_DAT1,

	GPIO8_2_MMC3_DAT1 | MFP_LPM_EDGE_BOTH,

	GPIO9_2_MMC3_DAT2,

	GPIO10_2_MMC3_DAT3,

	GPIO103_MMC3_CLK,

arch/arm/mach-pxa/zylonite_pxa320.c

+14 −14
Original line number Diff line number Diff line
@@ -51,11 +51,11 @@ static mfp_cfg_t mfp_cfg[] __initdata = { 
	GPIO17_2_LCD_BIAS,



	/* FFUART */

	GPIO41_UART1_RXD,

	GPIO41_UART1_RXD | MFP_LPM_EDGE_FALL,

	GPIO42_UART1_TXD,

	GPIO43_UART1_CTS,

	GPIO44_UART1_DCD,

	GPIO45_UART1_DSR,

	GPIO45_UART1_DSR | MFP_LPM_EDGE_FALL,

	GPIO46_UART1_RI,

	GPIO47_UART1_DTR,

	GPIO48_UART1_RTS,
@@ -73,16 +73,16 @@ static mfp_cfg_t mfp_cfg[] __initdata = { 
	GPIO33_I2C_SDA,



	/* Keypad */

	GPIO105_KP_DKIN_0,

	GPIO106_KP_DKIN_1,

	GPIO113_KP_MKIN_0,

	GPIO114_KP_MKIN_1,

	GPIO115_KP_MKIN_2,

	GPIO116_KP_MKIN_3,

	GPIO117_KP_MKIN_4,

	GPIO118_KP_MKIN_5,

	GPIO119_KP_MKIN_6,

	GPIO120_KP_MKIN_7,

	GPIO105_KP_DKIN_0 | MFP_LPM_EDGE_BOTH,

	GPIO106_KP_DKIN_1 | MFP_LPM_EDGE_BOTH,

	GPIO113_KP_MKIN_0 | MFP_LPM_EDGE_BOTH,

	GPIO114_KP_MKIN_1 | MFP_LPM_EDGE_BOTH,

	GPIO115_KP_MKIN_2 | MFP_LPM_EDGE_BOTH,

	GPIO116_KP_MKIN_3 | MFP_LPM_EDGE_BOTH,

	GPIO117_KP_MKIN_4 | MFP_LPM_EDGE_BOTH,

	GPIO118_KP_MKIN_5 | MFP_LPM_EDGE_BOTH,

	GPIO119_KP_MKIN_6 | MFP_LPM_EDGE_BOTH,

	GPIO120_KP_MKIN_7 | MFP_LPM_EDGE_BOTH,

	GPIO121_KP_MKOUT_0,

	GPIO122_KP_MKOUT_1,

	GPIO123_KP_MKOUT_2,
@@ -98,7 +98,7 @@ static mfp_cfg_t mfp_cfg[] __initdata = { 


	/* MMC1 */

	GPIO18_MMC1_DAT0,

	GPIO19_MMC1_DAT1,

	GPIO19_MMC1_DAT1 | MFP_LPM_EDGE_BOTH,

	GPIO20_MMC1_DAT2,

	GPIO21_MMC1_DAT3,

	GPIO22_MMC1_CLK,
@@ -107,7 +107,7 @@ static mfp_cfg_t mfp_cfg[] __initdata = { 


	/* MMC2 */

	GPIO24_MMC2_DAT0,

	GPIO25_MMC2_DAT1,

	GPIO25_MMC2_DAT1 | MFP_LPM_EDGE_BOTH,

	GPIO26_MMC2_DAT2,

	GPIO27_MMC2_DAT3,

	GPIO28_MMC2_CLK,