diff options
| author | Eric Nelson <eric.nelson@boundarydevices.com> | 2012-10-03 15:09:04 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-02-12 10:46:51 -0700 |
| commit | ece5aa7de11df34d89215415938408832ccf8773 (patch) | |
| tree | 037b95aa838d4d831e258b87506be688a8329073 | |
| parent | d6ae7baae8751d6ebf073cd6e2526c02b615e132 (diff) | |
i.MX6: mx6qsabrelite: add weak pull-up on RGB touch screen interrupt line (GP4:20)
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabrelite.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_sabrelite.c b/arch/arm/mach-mx6/board-mx6q_sabrelite.c index c620768541b7..b9749d456276 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabrelite.c +++ b/arch/arm/mach-mx6/board-mx6q_sabrelite.c @@ -109,6 +109,9 @@ PAD_CTL_PUS_22K_UP | PAD_CTL_SPEED_MED | \ PAD_CTL_DSE_40ohm | PAD_CTL_HYS) +#define WEAK_PULLUP (PAD_CTL_HYS | PAD_CTL_PKE \ + | PAD_CTL_PUE | PAD_CTL_PUS_100K_UP) + #define N6_IRQ_TEST_PADCFG (PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_PUS_100K_DOWN | PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS) #define N6_IRQ_PADCFG (PAD_CTL_PUE | PAD_CTL_PUS_100K_DOWN | PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS) #define N6_EN_PADCFG (PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm) @@ -275,7 +278,8 @@ static iomux_v3_cfg_t mx6q_sabrelite_pads[] = { MX6Q_PAD_DI0_PIN15__IPU1_DI0_PIN15, /* DE */ MX6Q_PAD_DI0_PIN2__IPU1_DI0_PIN2, /* HSync */ MX6Q_PAD_DI0_PIN3__IPU1_DI0_PIN3, /* VSync */ - MX6Q_PAD_DI0_PIN4__GPIO_4_20, /* I2C Touch IRQ */ + NEW_PAD_CTRL(MX6Q_PAD_DI0_PIN4__GPIO_4_20, + WEAK_PULLUP), /* I2C Touch IRQ */ MX6Q_PAD_DISP0_DAT0__IPU1_DISP0_DAT_0, MX6Q_PAD_DISP0_DAT1__IPU1_DISP0_DAT_1, MX6Q_PAD_DISP0_DAT2__IPU1_DISP0_DAT_2, |