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

Commit 266a2458 authored by Benjamin Zores's avatar Benjamin Zores Committed by Nicolas Pitre
Browse files

[ARM] Kirkwood: update MPP definition. 



Add MPP definitions for Marvell Kirkwood 88F6282 revision.
Update some defines to reflect datasheet's MPP names.

Signed-off-by: default avatarBenjamin Zores <benjamin.zores@alcatel-lucent.com>
Signed-off-by: default avatarNicolas Pitre <nico@fluxnic.net>
parent f8e00530

arch/arm/mach-kirkwood/mpp.h

+323 −273

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-kirkwood/netspace_v2-setup.c

+2 −2
Original line number Diff line number Diff line
@@ -249,8 +249,8 @@ static unsigned int netspace_v2_mpp_config[] __initdata = { 
	MPP4_NF_IO6,

	MPP5_NF_IO7,

	MPP6_SYSRST_OUTn,

	MPP8_TW_SDA,

	MPP9_TW_SCK,

	MPP8_TW0_SDA,

	MPP9_TW0_SCK,

	MPP10_UART0_TXD,

	MPP11_UART0_RXD,

	MPP12_GPO,		/* Red led */

arch/arm/mach-kirkwood/netxbig_v2-setup.c

+16 −16
Original line number Diff line number Diff line
@@ -270,8 +270,8 @@ static unsigned int net2big_v2_mpp_config[] __initdata = { 
	MPP3_SPI_MISO,

	MPP6_SYSRST_OUTn,

	MPP7_GPO,		/* Request power-off */

	MPP8_TW_SDA,

	MPP9_TW_SCK,

	MPP8_TW0_SDA,

	MPP9_TW0_SCK,

	MPP10_UART0_TXD,

	MPP11_UART0_RXD,

	MPP13_GPIO,		/* Rear power switch (on|auto) */
@@ -306,8 +306,8 @@ static unsigned int net5big_v2_mpp_config[] __initdata = { 
	MPP3_SPI_MISO,

	MPP6_SYSRST_OUTn,

	MPP7_GPO,		/* Request power-off */

	MPP8_TW_SDA,

	MPP9_TW_SCK,

	MPP8_TW0_SDA,

	MPP9_TW0_SCK,

	MPP10_UART0_TXD,

	MPP11_UART0_RXD,

	MPP13_GPIO,		/* Rear power switch (on|auto) */
@@ -315,20 +315,20 @@ static unsigned int net5big_v2_mpp_config[] __initdata = { 
	MPP15_GPIO,		/* Rear power switch (auto|off) */

	MPP16_GPIO,		/* SATA HDD1 power */

	MPP17_GPIO,		/* SATA HDD2 power */

	MPP20_GE1_0,

	MPP21_GE1_1,

	MPP22_GE1_2,

	MPP23_GE1_3,

	MPP24_GE1_4,

	MPP25_GE1_5,

	MPP26_GE1_6,

	MPP27_GE1_7,

	MPP20_GE1_TXD0,

	MPP21_GE1_TXD1,

	MPP22_GE1_TXD2,

	MPP23_GE1_TXD3,

	MPP24_GE1_RXD0,

	MPP25_GE1_RXD1,

	MPP26_GE1_RXD2,

	MPP27_GE1_RXD3,

	MPP28_GPIO,		/* USB enable host vbus */

	MPP29_GPIO,		/* CPLD extension ALE */

	MPP30_GE1_10,

	MPP31_GE1_11,

	MPP32_GE1_12,

	MPP33_GE1_13,

	MPP30_GE1_RXCTL,

	MPP31_GE1_RXCLK,

	MPP32_GE1_TCLKOUT,

	MPP33_GE1_TXCTL,

	MPP34_GPIO,		/* Rear Push button */

	MPP35_GPIO,		/* Inhibit switch power-off */

	MPP36_GPIO,		/* SATA HDD1 presence */

arch/arm/mach-kirkwood/ts219-setup.c

+2 −2
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ static unsigned int qnap_ts219_mpp_config[] __initdata = { 
	MPP3_SPI_MISO,

	MPP4_SATA1_ACTn,

	MPP5_SATA0_ACTn,

	MPP8_TW_SDA,

	MPP9_TW_SCK,

	MPP8_TW0_SDA,

	MPP9_TW0_SCK,

	MPP10_UART0_TXD,

	MPP11_UART0_RXD,

	MPP13_UART1_TXD,	/* PIC controller */

arch/arm/mach-kirkwood/ts41x-setup.c

+14 −14
Original line number Diff line number Diff line
@@ -81,26 +81,26 @@ static unsigned int qnap_ts41x_mpp_config[] __initdata = { 
	MPP3_SPI_MISO,

	MPP6_SYSRST_OUTn,

	MPP7_PEX_RST_OUTn,

	MPP8_TW_SDA,

	MPP9_TW_SCK,

	MPP8_TW0_SDA,

	MPP9_TW0_SCK,

	MPP10_UART0_TXD,

	MPP11_UART0_RXD,

	MPP13_UART1_TXD,	/* PIC controller */

	MPP14_UART1_RXD,	/* PIC controller */

	MPP15_SATA0_ACTn,

	MPP16_SATA1_ACTn,

	MPP20_GE1_0,

	MPP21_GE1_1,

	MPP22_GE1_2,

	MPP23_GE1_3,

	MPP24_GE1_4,

	MPP25_GE1_5,

	MPP26_GE1_6,

	MPP27_GE1_7,

	MPP30_GE1_10,

	MPP31_GE1_11,

	MPP32_GE1_12,

	MPP33_GE1_13,

	MPP20_GE1_TXD0,

	MPP21_GE1_TXD1,

	MPP22_GE1_TXD2,

	MPP23_GE1_TXD3,

	MPP24_GE1_RXD0,

	MPP25_GE1_RXD1,

	MPP26_GE1_RXD2,

	MPP27_GE1_RXD3,

	MPP30_GE1_RXCTL,

	MPP31_GE1_RXCLK,

	MPP32_GE1_TCLKOUT,

	MPP33_GE1_TXCTL,

	MPP36_GPIO,		/* RAM: 0: 256 MB, 1: 512 MB */

	MPP37_GPIO,		/* Reset button */

	MPP43_GPIO,		/* USB Copy button */