summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHector Palacios <hector.palacios@digi.com>2012-02-10 13:30:25 +0100
committerHector Palacios <hector.palacios@digi.com>2012-02-10 13:39:24 +0100
commitb01448521b64f9bbc800227e104acec3f8a3897c (patch)
tree9d5cef7d6b15fac4bce09f73eb7b4faa9840edd3
parent88df5e9d66a432014e9c947d38412a1cd92987a8 (diff)
iomux mx53: set SION for user LEDs gpios
Test of idigibuttonled on ccwmx53js revealed that the status of the user LEDs (gpios as outputs) always read as 0, independently of their real status. Investigation led to the SION (Software Input On Field) bit on the MUX_CTL_PAD register. From the manual: Software Input On Field. Force the selected mux mode Input path no matter of MUX_MODE functionality. 1 Force input path 0 Input Path is determined by functionality of the selected mux mode (regular). Default value of SION is 0, which makes the Linux driver always reads 0 on the PSR (pad status register) of the gpio pins configured as outputs, no matter the real value of the pin. For the UserLEDs we want SION to be set, so that we can read the real value of the pins. This fixes vantive 42103. Signed-off-by: Hector Palacios <hector.palacios@digi.com>
-rw-r--r--arch/arm/plat-mxc/include/mach/iomux-mx53.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx53.h b/arch/arm/plat-mxc/include/mach/iomux-mx53.h
index bb5d4b604fb1..c18273d6c60e 100644
--- a/arch/arm/plat-mxc/include/mach/iomux-mx53.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-mx53.h
@@ -359,7 +359,7 @@
#define _MX53_PAD_CSI0_MCLK__EMI_EMI_DEBUG_30 IOMUX_PAD(0x3F0, 0xC4, 6, 0x0, 0, 0)
#define _MX53_PAD_CSI0_MCLK__TPIU_TRCTL IOMUX_PAD(0x3F0, 0xC4, 7, 0x0, 0, 0)
#define _MX53_PAD_CSI0_DATA_EN__IPU_CSI0_DATA_EN IOMUX_PAD(0x3F4, 0xC8, 0, 0x0, 0, 0)
-#define _MX53_PAD_CSI0_DATA_EN__GPIO5_20 IOMUX_PAD(0x3F4, 0xC8, 1, 0x0, 0, 0)
+#define _MX53_PAD_CSI0_DATA_EN__GPIO5_20 IOMUX_PAD(0x3F4, 0xC8, 1 | IOMUX_CONFIG_SION, 0x0, 0, 0)
#define _MX53_PAD_CSI0_DATA_EN__SDMA_DEBUG_PC_2 IOMUX_PAD(0x3F4, 0xC8, 5, 0x0, 0, 0)
#define _MX53_PAD_CSI0_DATA_EN__EMI_EMI_DEBUG_31 IOMUX_PAD(0x3F4, 0xC8, 6, 0x0, 0, 0)
#define _MX53_PAD_CSI0_DATA_EN__TPIU_TRCLK IOMUX_PAD(0x3F4, 0xC8, 7, 0x0, 0, 0)
@@ -1234,7 +1234,7 @@
#define _MX53_PAD_GPIO_16__I2C3_SDA IOMUX_PAD(0x6CC, 0x33C, 6 | IOMUX_CONFIG_SION, 0x828, 2, 0)
#define _MX53_PAD_GPIO_16__SJC_DE_B IOMUX_PAD(0x6CC, 0x33C, 7, 0x0, 0, 0)
#define _MX53_PAD_GPIO_17__ESAI1_TX0 IOMUX_PAD(0x6D0, 0x340, 0, 0x7E4, 1, 0)
-#define _MX53_PAD_GPIO_17__GPIO7_12 IOMUX_PAD(0x6D0, 0x340, 1, 0x0, 0, 0)
+#define _MX53_PAD_GPIO_17__GPIO7_12 IOMUX_PAD(0x6D0, 0x340, 1 | IOMUX_CONFIG_SION, 0x0, 0, 0)
#define _MX53_PAD_GPIO_17__SDMA_EXT_EVENT_0 IOMUX_PAD(0x6D0, 0x340, 2, 0x868, 1, 0)
#define _MX53_PAD_GPIO_17__GPC_PMIC_RDY IOMUX_PAD(0x6D0, 0x340, 3, 0x810, 1, 0)
#define _MX53_PAD_GPIO_17__RTC_CE_RTC_FSV_TRIG IOMUX_PAD(0x6D0, 0x340, 4, 0x0, 0, 0)