tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
avr32: favr-32 build fix
ATSTK1006: Fix boot from NAND flash
avr32: remove .note.gnu.build-id section when making vmlinux.bin
avr32: Enable pullup on USART TX lines

Linus Torvalds 69098bac b3806c3b

+107 -47
+1 -1
arch/avr32/boards/favr-32/flash.c
··· 13 13 #include <linux/mtd/partitions.h> 14 14 #include <linux/mtd/physmap.h> 15 15 16 - #include <asm/arch/smc.h> 16 + #include <mach/smc.h> 17 17 18 18 static struct smc_timing flash_timing __initdata = { 19 19 .ncs_read_setup = 0,
+4 -4
arch/avr32/boards/favr-32/setup.c
··· 25 25 26 26 #include <asm/setup.h> 27 27 28 - #include <asm/arch/at32ap700x.h> 29 - #include <asm/arch/init.h> 30 - #include <asm/arch/board.h> 31 - #include <asm/arch/portmux.h> 28 + #include <mach/at32ap700x.h> 29 + #include <mach/init.h> 30 + #include <mach/board.h> 31 + #include <mach/portmux.h> 32 32 33 33 /* Oscillator frequencies. These are board-specific */ 34 34 unsigned long at32_board_osc_rates[3] = {
+1 -1
arch/avr32/boot/images/Makefile
··· 10 10 11 11 extra-y := vmlinux.bin vmlinux.gz 12 12 13 - OBJCOPYFLAGS_vmlinux.bin := -O binary 13 + OBJCOPYFLAGS_vmlinux.bin := -O binary -R .note.gnu.build-id 14 14 $(obj)/vmlinux.bin: vmlinux FORCE 15 15 $(call if_changed,objcopy) 16 16
+97 -37
arch/avr32/configs/atstk1006_defconfig
··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.27-rc1 4 - # Tue Aug 5 15:40:26 2008 3 + # Linux kernel version: 2.6.28-rc8 4 + # Thu Dec 18 11:22:23 2008 5 5 # 6 6 CONFIG_AVR32=y 7 7 CONFIG_GENERIC_GPIO=y ··· 67 67 CONFIG_TIMERFD=y 68 68 CONFIG_EVENTFD=y 69 69 CONFIG_SHMEM=y 70 + CONFIG_AIO=y 70 71 CONFIG_VM_EVENT_COUNTERS=y 71 72 CONFIG_SLUB_DEBUG=y 72 73 # CONFIG_SLAB is not set ··· 78 77 CONFIG_OPROFILE=m 79 78 CONFIG_HAVE_OPROFILE=y 80 79 CONFIG_KPROBES=y 81 - # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set 82 - # CONFIG_HAVE_IOREMAP_PROT is not set 83 80 CONFIG_HAVE_KPROBES=y 84 - # CONFIG_HAVE_KRETPROBES is not set 85 - # CONFIG_HAVE_ARCH_TRACEHOOK is not set 86 - # CONFIG_HAVE_DMA_ATTRS is not set 87 - # CONFIG_USE_GENERIC_SMP_HELPERS is not set 88 81 CONFIG_HAVE_CLK=y 89 - CONFIG_PROC_PAGE_MONITOR=y 90 82 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 91 83 CONFIG_SLABINFO=y 92 84 CONFIG_RT_MUTEXES=y ··· 112 118 # CONFIG_DEFAULT_NOOP is not set 113 119 CONFIG_DEFAULT_IOSCHED="cfq" 114 120 CONFIG_CLASSIC_RCU=y 121 + CONFIG_FREEZER=y 115 122 116 123 # 117 124 # System Type and features ··· 129 134 CONFIG_CPU_AT32AP7000=y 130 135 CONFIG_BOARD_ATSTK1000=y 131 136 # CONFIG_BOARD_ATNGW100 is not set 137 + # CONFIG_BOARD_FAVR_32 is not set 138 + # CONFIG_BOARD_MIMC200 is not set 132 139 # CONFIG_BOARD_ATSTK1002 is not set 133 140 # CONFIG_BOARD_ATSTK1003 is not set 134 141 # CONFIG_BOARD_ATSTK1004 is not set ··· 168 171 # CONFIG_SPARSEMEM_MANUAL is not set 169 172 CONFIG_FLATMEM=y 170 173 CONFIG_FLAT_NODE_MEM_MAP=y 171 - # CONFIG_SPARSEMEM_STATIC is not set 172 - # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set 173 174 CONFIG_PAGEFLAGS_EXTENDED=y 174 175 CONFIG_SPLIT_PTLOCK_CPUS=4 175 176 # CONFIG_RESOURCES_64BIT is not set 177 + # CONFIG_PHYS_ADDR_T_64BIT is not set 176 178 CONFIG_ZONE_DMA_FLAG=0 177 179 CONFIG_NR_QUICK=2 178 180 CONFIG_VIRT_TO_BUS=y 181 + CONFIG_UNEVICTABLE_LRU=y 179 182 # CONFIG_OWNERSHIP_TRACE is not set 180 183 CONFIG_NMI_DEBUGGING=y 181 184 # CONFIG_HZ_100 is not set ··· 183 186 # CONFIG_HZ_300 is not set 184 187 # CONFIG_HZ_1000 is not set 185 188 CONFIG_HZ=250 186 - # CONFIG_SCHED_HRTICK is not set 189 + CONFIG_SCHED_HRTICK=y 187 190 CONFIG_CMDLINE="" 188 191 189 192 # ··· 225 228 # Executable file formats 226 229 # 227 230 CONFIG_BINFMT_ELF=y 231 + CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y 232 + # CONFIG_HAVE_AOUT is not set 228 233 # CONFIG_BINFMT_MISC is not set 229 234 CONFIG_NET=y 230 235 ··· 298 299 # CONFIG_ATM is not set 299 300 CONFIG_STP=m 300 301 CONFIG_BRIDGE=m 302 + # CONFIG_NET_DSA is not set 301 303 # CONFIG_VLAN_8021Q is not set 302 304 # CONFIG_DECNET is not set 303 305 CONFIG_LLC=m ··· 321 321 # CONFIG_IRDA is not set 322 322 # CONFIG_BT is not set 323 323 # CONFIG_AF_RXRPC is not set 324 - 325 - # 326 - # Wireless 327 - # 328 - # CONFIG_CFG80211 is not set 329 - # CONFIG_WIRELESS_EXT is not set 330 - # CONFIG_MAC80211 is not set 331 - # CONFIG_IEEE80211 is not set 324 + # CONFIG_PHONET is not set 325 + # CONFIG_WIRELESS is not set 332 326 # CONFIG_RFKILL is not set 333 327 # CONFIG_NET_9P is not set 334 328 ··· 353 359 # User Modules And Translation Layers 354 360 # 355 361 CONFIG_MTD_CHAR=y 362 + CONFIG_HAVE_MTD_OTP=y 356 363 CONFIG_MTD_BLKDEVS=y 357 364 CONFIG_MTD_BLOCK=y 358 365 # CONFIG_FTL is not set ··· 402 407 # Self-contained MTD device drivers 403 408 # 404 409 CONFIG_MTD_DATAFLASH=m 410 + # CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set 411 + CONFIG_MTD_DATAFLASH_OTP=y 405 412 CONFIG_MTD_M25P80=m 406 413 CONFIG_M25PXX_USE_FAST_READ=y 407 414 # CONFIG_MTD_SLRAM is not set ··· 461 464 CONFIG_ATMEL_TCB_CLKSRC=y 462 465 CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 463 466 # CONFIG_EEPROM_93CX6 is not set 467 + # CONFIG_ICS932S401 is not set 464 468 CONFIG_ATMEL_SSC=m 465 469 # CONFIG_ENCLOSURE_SERVICES is not set 466 - # CONFIG_HAVE_IDE is not set 470 + # CONFIG_C2PORT is not set 467 471 468 472 # 469 473 # SCSI device support ··· 546 548 # CONFIG_IBM_NEW_EMAC_RGMII is not set 547 549 # CONFIG_IBM_NEW_EMAC_TAH is not set 548 550 # CONFIG_IBM_NEW_EMAC_EMAC4 is not set 551 + # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set 552 + # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 553 + # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 549 554 # CONFIG_B44 is not set 550 555 # CONFIG_NETDEV_1000 is not set 551 556 # CONFIG_NETDEV_10000 is not set ··· 654 653 CONFIG_I2C=m 655 654 CONFIG_I2C_BOARDINFO=y 656 655 CONFIG_I2C_CHARDEV=m 656 + CONFIG_I2C_HELPER_AUTO=y 657 657 CONFIG_I2C_ALGOBIT=m 658 658 659 659 # ··· 719 717 CONFIG_GPIO_SYSFS=y 720 718 721 719 # 720 + # Memory mapped GPIO expanders: 721 + # 722 + 723 + # 722 724 # I2C GPIO expanders: 723 725 # 724 726 # CONFIG_GPIO_MAX732X is not set ··· 751 745 # 752 746 # CONFIG_SOFT_WATCHDOG is not set 753 747 CONFIG_AT32AP700X_WDT=y 748 + CONFIG_SSB_POSSIBLE=y 754 749 755 750 # 756 751 # Sonics Silicon Backplane 757 752 # 758 - CONFIG_SSB_POSSIBLE=y 759 753 # CONFIG_SSB is not set 760 754 761 755 # ··· 764 758 # CONFIG_MFD_CORE is not set 765 759 # CONFIG_MFD_SM501 is not set 766 760 # CONFIG_HTC_PASIC3 is not set 761 + # CONFIG_MFD_TMIO is not set 762 + # CONFIG_MFD_WM8400 is not set 763 + # CONFIG_MFD_WM8350_I2C is not set 764 + # CONFIG_REGULATOR is not set 767 765 768 766 # 769 767 # Multimedia devices ··· 793 783 CONFIG_FB=y 794 784 # CONFIG_FIRMWARE_EDID is not set 795 785 # CONFIG_FB_DDC is not set 786 + # CONFIG_FB_BOOT_VESA_SUPPORT is not set 796 787 CONFIG_FB_CFB_FILLRECT=y 797 788 CONFIG_FB_CFB_COPYAREA=y 798 789 CONFIG_FB_CFB_IMAGEBLIT=y ··· 815 804 # CONFIG_FB_S1D13XXX is not set 816 805 CONFIG_FB_ATMEL=y 817 806 # CONFIG_FB_VIRTUAL is not set 807 + # CONFIG_FB_METRONOME is not set 808 + # CONFIG_FB_MB862XX is not set 818 809 CONFIG_BACKLIGHT_LCD_SUPPORT=y 819 810 CONFIG_LCD_CLASS_DEVICE=y 820 811 CONFIG_LCD_LTV350QV=y 821 812 # CONFIG_LCD_ILI9320 is not set 813 + # CONFIG_LCD_TDO24M is not set 822 814 # CONFIG_LCD_VGG2432A4 is not set 823 815 # CONFIG_LCD_PLATFORM is not set 824 816 # CONFIG_BACKLIGHT_CLASS_DEVICE is not set ··· 832 818 # CONFIG_DISPLAY_SUPPORT is not set 833 819 # CONFIG_LOGO is not set 834 820 CONFIG_SOUND=m 821 + CONFIG_SOUND_OSS_CORE=y 835 822 CONFIG_SND=m 836 823 CONFIG_SND_TIMER=m 837 824 CONFIG_SND_PCM=m ··· 863 848 # CONFIG_USB_ARCH_HAS_EHCI is not set 864 849 # CONFIG_USB_OTG_WHITELIST is not set 865 850 # CONFIG_USB_OTG_BLACKLIST_HUB is not set 851 + # CONFIG_USB_MUSB_HDRC is not set 852 + # CONFIG_USB_GADGET_MUSB_HDRC is not set 866 853 867 854 # 868 - # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 855 + # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 869 856 # 870 857 CONFIG_USB_GADGET=y 871 858 # CONFIG_USB_GADGET_DEBUG is not set 872 859 # CONFIG_USB_GADGET_DEBUG_FILES is not set 873 860 # CONFIG_USB_GADGET_DEBUG_FS is not set 861 + CONFIG_USB_GADGET_VBUS_DRAW=2 874 862 CONFIG_USB_GADGET_SELECTED=y 875 - # CONFIG_USB_GADGET_AMD5536UDC is not set 863 + # CONFIG_USB_GADGET_AT91 is not set 876 864 CONFIG_USB_GADGET_ATMEL_USBA=y 877 865 CONFIG_USB_ATMEL_USBA=y 878 866 # CONFIG_USB_GADGET_FSL_USB2 is not set 879 - # CONFIG_USB_GADGET_NET2280 is not set 880 - # CONFIG_USB_GADGET_PXA25X is not set 881 - # CONFIG_USB_GADGET_M66592 is not set 882 - # CONFIG_USB_GADGET_PXA27X is not set 883 - # CONFIG_USB_GADGET_GOKU is not set 884 867 # CONFIG_USB_GADGET_LH7A40X is not set 885 868 # CONFIG_USB_GADGET_OMAP is not set 869 + # CONFIG_USB_GADGET_PXA25X is not set 870 + # CONFIG_USB_GADGET_PXA27X is not set 886 871 # CONFIG_USB_GADGET_S3C2410 is not set 887 - # CONFIG_USB_GADGET_AT91 is not set 872 + # CONFIG_USB_GADGET_M66592 is not set 873 + # CONFIG_USB_GADGET_AMD5536UDC is not set 874 + # CONFIG_USB_GADGET_FSL_QE is not set 875 + # CONFIG_USB_GADGET_NET2280 is not set 876 + # CONFIG_USB_GADGET_GOKU is not set 888 877 # CONFIG_USB_GADGET_DUMMY_HCD is not set 889 878 CONFIG_USB_GADGET_DUALSPEED=y 890 879 CONFIG_USB_ZERO=m ··· 906 887 # CONFIG_MMC_UNSAFE_RESUME is not set 907 888 908 889 # 909 - # MMC/SD Card Drivers 890 + # MMC/SD/SDIO Card Drivers 910 891 # 911 892 CONFIG_MMC_BLOCK=y 912 893 CONFIG_MMC_BLOCK_BOUNCE=y ··· 914 895 # CONFIG_MMC_TEST is not set 915 896 916 897 # 917 - # MMC/SD Host Controller Drivers 898 + # MMC/SD/SDIO Host Controller Drivers 918 899 # 919 900 # CONFIG_MMC_SDHCI is not set 920 901 CONFIG_MMC_ATMELMCI=y 902 + # CONFIG_MMC_ATMELMCI_DMA is not set 921 903 CONFIG_MMC_SPI=m 922 904 # CONFIG_MEMSTICK is not set 923 905 CONFIG_NEW_LEDS=y ··· 938 918 CONFIG_LEDS_TRIGGERS=y 939 919 CONFIG_LEDS_TRIGGER_TIMER=m 940 920 CONFIG_LEDS_TRIGGER_HEARTBEAT=m 921 + # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set 941 922 CONFIG_LEDS_TRIGGER_DEFAULT_ON=m 942 923 # CONFIG_ACCESSIBILITY is not set 943 924 CONFIG_RTC_LIB=y ··· 971 950 # CONFIG_RTC_DRV_M41T80 is not set 972 951 # CONFIG_RTC_DRV_S35390A is not set 973 952 # CONFIG_RTC_DRV_FM3130 is not set 953 + # CONFIG_RTC_DRV_RX8581 is not set 974 954 975 955 # 976 956 # SPI RTC drivers 977 957 # 978 958 # CONFIG_RTC_DRV_M41T94 is not set 979 959 # CONFIG_RTC_DRV_DS1305 is not set 960 + # CONFIG_RTC_DRV_DS1390 is not set 980 961 # CONFIG_RTC_DRV_MAX6902 is not set 981 962 # CONFIG_RTC_DRV_R9701 is not set 982 963 # CONFIG_RTC_DRV_RS5C348 is not set 964 + # CONFIG_RTC_DRV_DS3234 is not set 983 965 984 966 # 985 967 # Platform RTC drivers 986 968 # 969 + # CONFIG_RTC_DRV_DS1286 is not set 987 970 # CONFIG_RTC_DRV_DS1511 is not set 988 971 # CONFIG_RTC_DRV_DS1553 is not set 989 972 # CONFIG_RTC_DRV_DS1742 is not set 990 973 # CONFIG_RTC_DRV_STK17TA8 is not set 991 974 # CONFIG_RTC_DRV_M48T86 is not set 975 + # CONFIG_RTC_DRV_M48T35 is not set 992 976 # CONFIG_RTC_DRV_M48T59 is not set 977 + # CONFIG_RTC_DRV_BQ4802 is not set 993 978 # CONFIG_RTC_DRV_V3020 is not set 994 979 995 980 # ··· 1016 989 # CONFIG_NET_DMA is not set 1017 990 CONFIG_DMATEST=m 1018 991 # CONFIG_UIO is not set 992 + # CONFIG_STAGING is not set 993 + CONFIG_STAGING_EXCLUDE_BUILD=y 1019 994 1020 995 # 1021 996 # File systems ··· 1027 998 # CONFIG_EXT2_FS_XIP is not set 1028 999 CONFIG_EXT3_FS=m 1029 1000 # CONFIG_EXT3_FS_XATTR is not set 1030 - # CONFIG_EXT4DEV_FS is not set 1001 + CONFIG_EXT4_FS=m 1002 + CONFIG_EXT4DEV_COMPAT=y 1003 + # CONFIG_EXT4_FS_XATTR is not set 1031 1004 CONFIG_JBD=m 1032 1005 # CONFIG_JBD_DEBUG is not set 1006 + CONFIG_JBD2=m 1007 + # CONFIG_JBD2_DEBUG is not set 1033 1008 # CONFIG_REISERFS_FS is not set 1034 1009 # CONFIG_JFS_FS is not set 1035 1010 # CONFIG_FS_POSIX_ACL is not set 1011 + CONFIG_FILE_LOCKING=y 1036 1012 # CONFIG_XFS_FS is not set 1037 1013 # CONFIG_OCFS2_FS is not set 1038 1014 # CONFIG_DNOTIFY is not set ··· 1070 1036 CONFIG_PROC_FS=y 1071 1037 CONFIG_PROC_KCORE=y 1072 1038 CONFIG_PROC_SYSCTL=y 1039 + CONFIG_PROC_PAGE_MONITOR=y 1073 1040 CONFIG_SYSFS=y 1074 1041 CONFIG_TMPFS=y 1075 1042 # CONFIG_TMPFS_POSIX_ACL is not set ··· 1089 1054 # CONFIG_EFS_FS is not set 1090 1055 CONFIG_JFFS2_FS=y 1091 1056 CONFIG_JFFS2_FS_DEBUG=0 1092 - # CONFIG_JFFS2_FS_WRITEBUFFER is not set 1057 + CONFIG_JFFS2_FS_WRITEBUFFER=y 1058 + # CONFIG_JFFS2_FS_WBUF_VERIFY is not set 1093 1059 # CONFIG_JFFS2_SUMMARY is not set 1094 1060 # CONFIG_JFFS2_FS_XATTR is not set 1095 1061 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set ··· 1124 1088 CONFIG_LOCKD_V4=y 1125 1089 CONFIG_NFS_COMMON=y 1126 1090 CONFIG_SUNRPC=y 1091 + # CONFIG_SUNRPC_REGISTER_V4 is not set 1127 1092 # CONFIG_RPCSEC_GSS_KRB5 is not set 1128 1093 # CONFIG_RPCSEC_GSS_SPKM3 is not set 1129 1094 # CONFIG_SMB_FS is not set ··· 1222 1185 CONFIG_FRAME_POINTER=y 1223 1186 # CONFIG_BOOT_PRINTK_DELAY is not set 1224 1187 # CONFIG_RCU_TORTURE_TEST is not set 1188 + # CONFIG_RCU_CPU_STALL_DETECTOR is not set 1225 1189 # CONFIG_KPROBES_SANITY_TEST is not set 1226 1190 # CONFIG_BACKTRACE_SELF_TEST is not set 1191 + # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1227 1192 # CONFIG_LKDTM is not set 1228 1193 # CONFIG_FAULT_INJECTION is not set 1194 + 1195 + # 1196 + # Tracers 1197 + # 1198 + # CONFIG_IRQSOFF_TRACER is not set 1199 + # CONFIG_SCHED_TRACER is not set 1200 + # CONFIG_CONTEXT_SWITCH_TRACER is not set 1201 + # CONFIG_BOOT_TRACER is not set 1202 + # CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1229 1203 # CONFIG_SAMPLES is not set 1230 1204 1231 1205 # ··· 1244 1196 # 1245 1197 # CONFIG_KEYS is not set 1246 1198 # CONFIG_SECURITY is not set 1199 + # CONFIG_SECURITYFS is not set 1247 1200 # CONFIG_SECURITY_FILE_CAPABILITIES is not set 1248 1201 CONFIG_CRYPTO=y 1249 1202 1250 1203 # 1251 1204 # Crypto core or helper 1252 1205 # 1206 + CONFIG_CRYPTO_FIPS=y 1253 1207 CONFIG_CRYPTO_ALGAPI=y 1208 + CONFIG_CRYPTO_ALGAPI2=y 1254 1209 CONFIG_CRYPTO_AEAD=m 1210 + CONFIG_CRYPTO_AEAD2=y 1255 1211 CONFIG_CRYPTO_BLKCIPHER=m 1212 + CONFIG_CRYPTO_BLKCIPHER2=y 1256 1213 CONFIG_CRYPTO_HASH=m 1214 + CONFIG_CRYPTO_HASH2=y 1215 + CONFIG_CRYPTO_RNG=m 1216 + CONFIG_CRYPTO_RNG2=y 1257 1217 CONFIG_CRYPTO_MANAGER=m 1218 + CONFIG_CRYPTO_MANAGER2=y 1258 1219 # CONFIG_CRYPTO_GF128MUL is not set 1259 1220 # CONFIG_CRYPTO_NULL is not set 1260 1221 # CONFIG_CRYPTO_CRYPTD is not set ··· 1314 1257 # 1315 1258 # Ciphers 1316 1259 # 1317 - # CONFIG_CRYPTO_AES is not set 1260 + CONFIG_CRYPTO_AES=m 1318 1261 # CONFIG_CRYPTO_ANUBIS is not set 1319 1262 # CONFIG_CRYPTO_ARC4 is not set 1320 1263 # CONFIG_CRYPTO_BLOWFISH is not set ··· 1335 1278 # 1336 1279 CONFIG_CRYPTO_DEFLATE=y 1337 1280 CONFIG_CRYPTO_LZO=y 1281 + 1282 + # 1283 + # Random Number Generation 1284 + # 1285 + CONFIG_CRYPTO_ANSI_CPRNG=m 1338 1286 # CONFIG_CRYPTO_HW is not set 1339 1287 1340 1288 # 1341 1289 # Library routines 1342 1290 # 1343 1291 CONFIG_BITREVERSE=y 1344 - # CONFIG_GENERIC_FIND_FIRST_BIT is not set 1345 - # CONFIG_GENERIC_FIND_NEXT_BIT is not set 1346 1292 CONFIG_CRC_CCITT=m 1347 1293 CONFIG_CRC16=y 1348 1294 CONFIG_CRC_T10DIF=m
+4 -4
arch/avr32/mach-at32ap/at32ap700x.c
··· 967 967 { 968 968 u32 pin_mask = (1 << 8) | (1 << 9); /* RXD & TXD */ 969 969 970 - select_peripheral(PIOA, pin_mask, PERIPH_B, 0); 970 + select_peripheral(PIOA, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP); 971 971 } 972 972 973 973 static inline void configure_usart1_pins(void) 974 974 { 975 975 u32 pin_mask = (1 << 17) | (1 << 18); /* RXD & TXD */ 976 976 977 - select_peripheral(PIOA, pin_mask, PERIPH_A, 0); 977 + select_peripheral(PIOA, pin_mask, PERIPH_A, AT32_GPIOF_PULLUP); 978 978 } 979 979 980 980 static inline void configure_usart2_pins(void) 981 981 { 982 982 u32 pin_mask = (1 << 26) | (1 << 27); /* RXD & TXD */ 983 983 984 - select_peripheral(PIOB, pin_mask, PERIPH_B, 0); 984 + select_peripheral(PIOB, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP); 985 985 } 986 986 987 987 static inline void configure_usart3_pins(void) 988 988 { 989 989 u32 pin_mask = (1 << 18) | (1 << 17); /* RXD & TXD */ 990 990 991 - select_peripheral(PIOB, pin_mask, PERIPH_B, 0); 991 + select_peripheral(PIOB, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP); 992 992 } 993 993 994 994 static struct platform_device *__initdata at32_usarts[4];