diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 06:13:00 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 06:13:00 -0400 |
| commit | 9ae21ca362679757786f5abe556c7943e9001426 (patch) | |
| tree | db4ab371195fed9d327745eaf12c912f3f74f0e2 /arch/arm/plat-mxc/include/mach/iomux-mx51.h | |
| parent | 12ba8d1e9262ce81a695795410bd9ee5c9407ba1 (diff) | |
| parent | a3484ffd2acc196ca934369395fe9aac63ed1a47 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/iomux-mx51.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-mx51.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx51.h b/arch/arm/plat-mxc/include/mach/iomux-mx51.h index e46b1c2836d4..d7a41e9a2605 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-mx51.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mx51.h | |||
| @@ -45,6 +45,8 @@ typedef enum iomux_config { | |||
| 45 | PAD_CTL_PKE | PAD_CTL_HYS) | 45 | PAD_CTL_PKE | PAD_CTL_HYS) |
| 46 | #define MX51_GPIO_PAD_CTRL (PAD_CTL_DSE_HIGH | PAD_CTL_PKE | \ | 46 | #define MX51_GPIO_PAD_CTRL (PAD_CTL_DSE_HIGH | PAD_CTL_PKE | \ |
| 47 | PAD_CTL_SRE_FAST) | 47 | PAD_CTL_SRE_FAST) |
| 48 | #define MX51_GPIO_PAD_CTRL_2 (PAD_CTL_SRE_FAST | PAD_CTL_DSE_HIGH | \ | ||
| 49 | PAD_CTL_PUS_100K_UP) | ||
| 48 | #define MX51_ECSPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PKE | PAD_CTL_DSE_HIGH | \ | 50 | #define MX51_ECSPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PKE | PAD_CTL_DSE_HIGH | \ |
| 49 | PAD_CTL_SRE_FAST) | 51 | PAD_CTL_SRE_FAST) |
| 50 | #define MX51_SDHCI_PAD_CTRL (PAD_CTL_DSE_HIGH | PAD_CTL_PUS_47K_UP | \ | 52 | #define MX51_SDHCI_PAD_CTRL (PAD_CTL_DSE_HIGH | PAD_CTL_PUS_47K_UP | \ |