From 9ea13f98f9e43dcef89af5e6399483c13e20ea02 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 8 Jul 2011 14:59:49 -0300 Subject: [PATCH] --- yaml --- r: 258655 b: refs/heads/master c: 0bd70c023cc7f58b605ca6bed284588b77144f75 h: refs/heads/master i: 258653: d7dc891a216d6816479b5420fc8c3de3b84b492c 258651: 669f1dccba8ef2cb17e8673c9c32a04ab2bfb724 258647: cd3603ab3109dda72be20459fc1c595dfcff43c9 258639: 263dc346d3d4fea131a15caf3fc5ba050c2bbc64 258623: 65bcdb3601018180026d156283b1090d22412c25 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-mxc/include/mach/iomux-mx25.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index aaddf784d4cd..d23a7661fabe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec51f2f1cf1eb7b7c4ca88ad89eaf1508742a19c +refs/heads/master: 0bd70c023cc7f58b605ca6bed284588b77144f75 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 2e5244de7ff5..bf64e1e594ed 100644 --- a/trunk/arch/arm/plat-mxc/include/mach/iomux-mx25.h +++ b/trunk/arch/arm/plat-mxc/include/mach/iomux-mx25.h @@ -457,7 +457,7 @@ #define MX25_PAD_GPIO_A__USBOTG_PWR IOMUX_PAD(0x3f0, 0x1f4, 0x12, 0, 0, PAD_CTL_PKE) #define MX25_PAD_GPIO_B__GPIO_B IOMUX_PAD(0x3f4, 0x1f8, 0x10, 0, 0, NO_PAD_CTRL) -#define MX25_PAD_GPIO_B__CAN1_RX IOMUX_PAD(0x3f4, 0x1f8, 0x16, 0x480, 1, PAD_CTL_PUS_22K) +#define MX25_PAD_GPIO_B__CAN1_RX IOMUX_PAD(0x3f4, 0x1f8, 0x16, 0x480, 1, PAD_CTL_PUS_22K_UP) #define MX25_PAD_GPIO_B__USBOTG_OC IOMUX_PAD(0x3f4, 0x1f8, 0x12, 0x57c, 1, PAD_CTL_PUS_100K_UP) #define MX25_PAD_GPIO_C__GPIO_C IOMUX_PAD(0x3f8, 0x1fc, 0x10, 0, 0, NO_PAD_CTRL)