From 1262ccbb2ac8ef2309a0848cfd080fd9d4bfb3fa Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 24 Jun 2010 11:57:03 +0300 Subject: [PATCH] --- yaml --- r: 201599 b: refs/heads/master c: 6b6322676add0fa2713d0ec89a28390fd4d907f5 h: refs/heads/master i: 201597: 019bf621b768976a9188d941799015d2cab73230 201595: fb86590365927170d0cbe8001b2e67e89607a92f 201591: 8689db0cafbbd17fe76d8d4eae9c8b364651133b 201583: 0dfca6c960e8f3ce4dfac99083b05fecfed54d8e 201567: e75ce4a25a0b70e61331e58e1f06d00559b53d50 201535: a33193c74edf933eece849fdd69f7fc69e7236d9 201471: a90e29614ea0e44241216af0bec0ba31fe52054f v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-mxc/include/mach/iomux-mx25.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ff354f816745..6da253f75500 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b04102bd345ccc8aeeff8b5acf999ce9a567d9b0 +refs/heads/master: 6b6322676add0fa2713d0ec89a28390fd4d907f5 diff --git a/trunk/arch/arm/plat-mxc/include/mach/iomux-mx25.h b/trunk/arch/arm/plat-mxc/include/mach/iomux-mx25.h index 80c44c23ee1f..d7f52c91f82e 100644 --- a/trunk/arch/arm/plat-mxc/include/mach/iomux-mx25.h +++ b/trunk/arch/arm/plat-mxc/include/mach/iomux-mx25.h @@ -252,6 +252,7 @@ #define MX25_PAD_OE_ACD__GPIO_1_25 IOMUX_PAD(0x30c, 0x114, 0x15, 0, 0, NO_PAD_CTRL) #define MX25_PAD_CONTRAST__CONTRAST IOMUX_PAD(0x310, 0x118, 0x10, 0, 0, NO_PAD_CTRL) +#define MX25_PAD_CONTRAST__PWM4_PWMO IOMUX_PAD(0x310, 0x118, 0x14, 0, 0, NO_PAD_CTRL) #define MX25_PAD_CONTRAST__FEC_CRS IOMUX_PAD(0x310, 0x118, 0x15, 0x508, 1, NO_PAD_CTRL) #define MX25_PAD_PWM__PWM IOMUX_PAD(0x314, 0x11c, 0x10, 0, 0, NO_PAD_CTRL)