Commit d7b5ccc9 authored by Alexander Kurz's avatar Alexander Kurz Committed by Shawn Guo
Browse files

ARM: i.MX31 iomux: remove duplicates with alternate name 



Three iomux were accessinble with two distinct names, typo?
Remove the unused duplicates and fix the typo.

Signed-off-by: default avatarAlexander Kurz <akurz@blala.de>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent dd19e828

arch/arm/mach-imx/iomux-mx3.h

+0 −3
Original line number Diff line number Diff line
@@ -598,10 +598,7 @@ enum iomux_pins { 
#define MX31_PIN_CONTRAST__CONTRAST	IOMUX_MODE(MX31_PIN_CONTRAST, IOMUX_CONFIG_FUNC)

#define MX31_PIN_D3_SPL__D3_SPL		IOMUX_MODE(MX31_PIN_D3_SPL, IOMUX_CONFIG_FUNC)

#define MX31_PIN_D3_CLS__D3_CLS		IOMUX_MODE(MX31_PIN_D3_CLS, IOMUX_CONFIG_FUNC)

#define MX31_PIN_LCS0__GPI03_23		IOMUX_MODE(MX31_PIN_LCS0, IOMUX_CONFIG_GPIO)

#define MX31_PIN_GPIO1_1__GPIO          IOMUX_MODE(MX31_PIN_GPIO1_1, IOMUX_CONFIG_GPIO)

#define MX31_PIN_I2C_CLK__SCL		IOMUX_MODE(MX31_PIN_I2C_CLK, IOMUX_CONFIG_FUNC)

#define MX31_PIN_I2C_DAT__SDA		IOMUX_MODE(MX31_PIN_I2C_DAT, IOMUX_CONFIG_FUNC)

#define MX31_PIN_DCD_DTE1__I2C2_SDA	IOMUX_MODE(MX31_PIN_DCD_DTE1, IOMUX_CONFIG_ALT2)

#define MX31_PIN_RI_DTE1__I2C2_SCL	IOMUX_MODE(MX31_PIN_RI_DTE1, IOMUX_CONFIG_ALT2)

#define MX31_PIN_CSPI2_SS2__I2C3_SDA	IOMUX_MODE(MX31_PIN_CSPI2_SS2, IOMUX_CONFIG_ALT1)

arch/arm/mach-imx/mach-pcm037.c

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static unsigned int pcm037_pins[] = { 
	MX31_PIN_CONTRAST__CONTRAST,

	MX31_PIN_D3_SPL__D3_SPL,

	MX31_PIN_D3_CLS__D3_CLS,

	MX31_PIN_LCS0__GPI03_23,

	MX31_PIN_LCS0__GPIO3_23,

	/* CSI */

	IOMUX_MODE(MX31_PIN_CSI_D5, IOMUX_CONFIG_GPIO),

	MX31_PIN_CSI_D6__CSI_D6,

CRA Git | Maintained and supported by SUSTech CRA and CCSE