Skip to content

Commit 28efb9e

Browse files
torvaldstorvalds
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6: avr32: Make atstk1006_nand_data definition static avr32: Reduce DataFlash bus speed to 8 MHz on ATNGW100 avr32: Update defconfigs avr32: Clean up HMATRIX code avr32: Add MMIO address definitions for certain controllers avr32: Introduce <mach/chip.h> avr32: Remove include/asm-avr32/arch-at32ap
2 parents 796aade + 33f197a commit 28efb9e

File tree

29 files changed

+1807
-930
lines changed

29 files changed

+1807
-930
lines changed

‎arch/avr32/Makefile

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,6 @@ core-y += arch/avr32/mm/
3939
drivers-$(CONFIG_OPROFILE) += arch/avr32/oprofile/
4040
libs-y += arch/avr32/lib/
4141

42-
archincdir-$(CONFIG_PLATFORM_AT32AP) := arch-at32ap
43-
44-
include/asm-avr32/.arch: $(wildcard include/config/platform/*.h) include/config/auto.conf
45-
@echo ' SYMLINK include/asm-avr32/arch -> include/asm-avr32/$(archincdir-y)'
46-
ifneq ($(KBUILD_SRC),)
47-
$(Q)mkdir -p include/asm-avr32
48-
$(Q)ln -fsn $(srctree)/include/asm-avr32/$(archincdir-y) include/asm-avr32/arch
49-
else
50-
$(Q)ln -fsn $(archincdir-y) include/asm-avr32/arch
51-
endif
52-
@touch $@
53-
54-
archprepare: include/asm-avr32/.arch
55-
5642
CLEAN_FILES += include/asm-avr32/.arch include/asm-avr32/arch
5743

5844
BOOT_TARGETS := vmlinux.elf vmlinux.bin uImage uImage.srec

‎arch/avr32/boards/atngw100/setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ static struct eth_platform_data __initdata eth_data[2];
4747
static struct spi_board_info spi0_board_info[] __initdata = {
4848
{
4949
.modalias = "mtd_dataflash",
50-
.max_speed_hz = 10000000,
50+
.max_speed_hz = 8000000,
5151
.chip_select = 0,
5252
},
5353
};

‎arch/avr32/boards/atstk1000/atstk1002.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ static struct mtd_partition *nand_part_info(int size, int *num_partitions)
9696
return nand_partitions;
9797
}
9898

99-
struct atmel_nand_data atstk1006_nand_data __initdata = {
99+
static struct atmel_nand_data atstk1006_nand_data __initdata = {
100100
.cle = 21,
101101
.ale = 22,
102102
.rdy_pin = GPIO_PIN_PB(30),

‎arch/avr32/configs/atngw100_defconfig

Lines changed: 82 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Automatically generated make config: don't edit
3-
# Linux kernel version: 2.6.26-rc3
4-
# Mon May 26 13:30:59 2008
3+
# Linux kernel version: 2.6.27-rc1
4+
# Tue Aug 5 16:00:47 2008
55
#
66
CONFIG_AVR32=y
77
CONFIG_GENERIC_GPIO=y
@@ -78,10 +78,16 @@ CONFIG_PROFILING=y
7878
CONFIG_OPROFILE=m
7979
CONFIG_HAVE_OPROFILE=y
8080
CONFIG_KPROBES=y
81+
# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
82+
# CONFIG_HAVE_IOREMAP_PROT is not set
8183
CONFIG_HAVE_KPROBES=y
8284
# CONFIG_HAVE_KRETPROBES is not set
85+
# CONFIG_HAVE_ARCH_TRACEHOOK is not set
8386
# CONFIG_HAVE_DMA_ATTRS is not set
87+
# CONFIG_USE_GENERIC_SMP_HELPERS is not set
88+
CONFIG_HAVE_CLK=y
8489
CONFIG_PROC_PAGE_MONITOR=y
90+
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
8591
CONFIG_SLABINFO=y
8692
CONFIG_RT_MUTEXES=y
8793
# CONFIG_TINY_SHMEM is not set
@@ -98,6 +104,7 @@ CONFIG_BLOCK=y
98104
# CONFIG_BLK_DEV_IO_TRACE is not set
99105
# CONFIG_LSF is not set
100106
# CONFIG_BLK_DEV_BSG is not set
107+
# CONFIG_BLK_DEV_INTEGRITY is not set
101108

102109
#
103110
# IO Schedulers
@@ -142,6 +149,7 @@ CONFIG_PHYS_OFFSET=0x10000000
142149
CONFIG_PREEMPT_NONE=y
143150
# CONFIG_PREEMPT_VOLUNTARY is not set
144151
# CONFIG_PREEMPT is not set
152+
CONFIG_QUICKLIST=y
145153
# CONFIG_HAVE_ARCH_BOOTMEM_NODE is not set
146154
# CONFIG_ARCH_HAVE_MEMORY_PRESENT is not set
147155
# CONFIG_NEED_NODE_MEMMAP_SIZE is not set
@@ -160,6 +168,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
160168
CONFIG_SPLIT_PTLOCK_CPUS=4
161169
# CONFIG_RESOURCES_64BIT is not set
162170
CONFIG_ZONE_DMA_FLAG=0
171+
CONFIG_NR_QUICK=2
163172
CONFIG_VIRT_TO_BUS=y
164173
# CONFIG_OWNERSHIP_TRACE is not set
165174
CONFIG_NMI_DEBUGGING=y
@@ -174,6 +183,12 @@ CONFIG_CMDLINE=""
174183
#
175184
# Power management options
176185
#
186+
CONFIG_PM=y
187+
# CONFIG_PM_DEBUG is not set
188+
CONFIG_PM_SLEEP=y
189+
CONFIG_SUSPEND=y
190+
CONFIG_SUSPEND_FREEZER=y
191+
CONFIG_ARCH_SUSPEND_POSSIBLE=y
177192

178193
#
179194
# CPU Frequency scaling
@@ -205,10 +220,6 @@ CONFIG_CPU_FREQ_AT32AP=y
205220
#
206221
CONFIG_BINFMT_ELF=y
207222
# CONFIG_BINFMT_MISC is not set
208-
209-
#
210-
# Networking
211-
#
212223
CONFIG_NET=y
213224

214225
#
@@ -222,6 +233,7 @@ CONFIG_XFRM_USER=y
222233
# CONFIG_XFRM_SUB_POLICY is not set
223234
# CONFIG_XFRM_MIGRATE is not set
224235
# CONFIG_XFRM_STATISTICS is not set
236+
CONFIG_XFRM_IPCOMP=y
225237
CONFIG_NET_KEY=y
226238
# CONFIG_NET_KEY_MIGRATE is not set
227239
CONFIG_INET=y
@@ -339,8 +351,10 @@ CONFIG_IP6_NF_MANGLE=m
339351
# CONFIG_IP_SCTP is not set
340352
# CONFIG_TIPC is not set
341353
# CONFIG_ATM is not set
354+
CONFIG_STP=m
342355
CONFIG_BRIDGE=m
343356
CONFIG_VLAN_8021Q=m
357+
# CONFIG_VLAN_8021Q_GVRP is not set
344358
# CONFIG_DECNET is not set
345359
CONFIG_LLC=m
346360
# CONFIG_LLC2 is not set
@@ -499,7 +513,6 @@ CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0
499513
# CONFIG_ATA is not set
500514
# CONFIG_MD is not set
501515
CONFIG_NETDEVICES=y
502-
# CONFIG_NETDEVICES_MULTIQUEUE is not set
503516
# CONFIG_DUMMY is not set
504517
# CONFIG_BONDING is not set
505518
# CONFIG_MACVLAN is not set
@@ -607,21 +620,35 @@ CONFIG_I2C_ALGOBIT=m
607620
#
608621
# I2C Hardware Bus support
609622
#
623+
624+
#
625+
# I2C system bus drivers (mostly embedded / system-on-chip)
626+
#
610627
CONFIG_I2C_GPIO=m
611628
# CONFIG_I2C_OCORES is not set
612-
# CONFIG_I2C_PARPORT_LIGHT is not set
613629
# CONFIG_I2C_SIMTEC is not set
630+
631+
#
632+
# External I2C/SMBus adapter drivers
633+
#
634+
# CONFIG_I2C_PARPORT_LIGHT is not set
614635
# CONFIG_I2C_TAOS_EVM is not set
615-
# CONFIG_I2C_STUB is not set
636+
637+
#
638+
# Other I2C/SMBus bus drivers
639+
#
616640
# CONFIG_I2C_PCA_PLATFORM is not set
641+
# CONFIG_I2C_STUB is not set
617642

618643
#
619644
# Miscellaneous I2C Chip support
620645
#
621646
# CONFIG_DS1682 is not set
647+
CONFIG_AT24=m
622648
# CONFIG_SENSORS_EEPROM is not set
623649
# CONFIG_SENSORS_PCF8574 is not set
624650
# CONFIG_PCF8575 is not set
651+
# CONFIG_SENSORS_PCA9539 is not set
625652
# CONFIG_SENSORS_PCF8591 is not set
626653
# CONFIG_TPS65010 is not set
627654
# CONFIG_SENSORS_MAX6875 is not set
@@ -646,27 +673,32 @@ CONFIG_SPI_ATMEL=y
646673
# CONFIG_SPI_AT25 is not set
647674
CONFIG_SPI_SPIDEV=m
648675
# CONFIG_SPI_TLE62X0 is not set
649-
CONFIG_HAVE_GPIO_LIB=y
650-
651-
#
652-
# GPIO Support
653-
#
676+
CONFIG_ARCH_REQUIRE_GPIOLIB=y
677+
CONFIG_GPIOLIB=y
654678
# CONFIG_DEBUG_GPIO is not set
679+
CONFIG_GPIO_SYSFS=y
655680

656681
#
657682
# I2C GPIO expanders:
658683
#
684+
# CONFIG_GPIO_MAX732X is not set
659685
# CONFIG_GPIO_PCA953X is not set
660686
# CONFIG_GPIO_PCF857X is not set
661687

688+
#
689+
# PCI GPIO expanders:
690+
#
691+
662692
#
663693
# SPI GPIO expanders:
664694
#
695+
# CONFIG_GPIO_MAX7301 is not set
665696
# CONFIG_GPIO_MCP23S08 is not set
666697
# CONFIG_W1 is not set
667698
# CONFIG_POWER_SUPPLY is not set
668699
# CONFIG_HWMON is not set
669700
# CONFIG_THERMAL is not set
701+
# CONFIG_THERMAL_HWMON is not set
670702
CONFIG_WATCHDOG=y
671703
# CONFIG_WATCHDOG_NOWAYOUT is not set
672704

@@ -685,6 +717,7 @@ CONFIG_SSB_POSSIBLE=y
685717
#
686718
# Multifunction device drivers
687719
#
720+
# CONFIG_MFD_CORE is not set
688721
# CONFIG_MFD_SM501 is not set
689722
# CONFIG_HTC_PASIC3 is not set
690723

@@ -716,10 +749,6 @@ CONFIG_SSB_POSSIBLE=y
716749
# Display device support
717750
#
718751
# CONFIG_DISPLAY_SUPPORT is not set
719-
720-
#
721-
# Sound
722-
#
723752
# CONFIG_SOUND is not set
724753
CONFIG_USB_SUPPORT=y
725754
# CONFIG_USB_ARCH_HAS_HCD is not set
@@ -740,7 +769,7 @@ CONFIG_USB_GADGET_ATMEL_USBA=y
740769
CONFIG_USB_ATMEL_USBA=y
741770
# CONFIG_USB_GADGET_FSL_USB2 is not set
742771
# CONFIG_USB_GADGET_NET2280 is not set
743-
# CONFIG_USB_GADGET_PXA2XX is not set
772+
# CONFIG_USB_GADGET_PXA25X is not set
744773
# CONFIG_USB_GADGET_M66592 is not set
745774
# CONFIG_USB_GADGET_PXA27X is not set
746775
# CONFIG_USB_GADGET_GOKU is not set
@@ -759,21 +788,24 @@ CONFIG_USB_FILE_STORAGE=m
759788
CONFIG_USB_G_SERIAL=m
760789
# CONFIG_USB_MIDI_GADGET is not set
761790
# CONFIG_USB_G_PRINTER is not set
762-
CONFIG_MMC=m
791+
CONFIG_USB_CDC_COMPOSITE=m
792+
CONFIG_MMC=y
763793
# CONFIG_MMC_DEBUG is not set
764794
# CONFIG_MMC_UNSAFE_RESUME is not set
765795

766796
#
767797
# MMC/SD Card Drivers
768798
#
769-
CONFIG_MMC_BLOCK=m
799+
CONFIG_MMC_BLOCK=y
770800
CONFIG_MMC_BLOCK_BOUNCE=y
771801
# CONFIG_SDIO_UART is not set
772-
# CONFIG_MMC_TEST is not set
802+
CONFIG_MMC_TEST=m
773803

774804
#
775805
# MMC/SD Host Controller Drivers
776806
#
807+
# CONFIG_MMC_SDHCI is not set
808+
CONFIG_MMC_ATMELMCI=y
777809
CONFIG_MMC_SPI=m
778810
# CONFIG_MEMSTICK is not set
779811
CONFIG_NEW_LEDS=y
@@ -783,6 +815,7 @@ CONFIG_LEDS_CLASS=y
783815
# LED drivers
784816
#
785817
CONFIG_LEDS_GPIO=y
818+
# CONFIG_LEDS_PCA955X is not set
786819

787820
#
788821
# LED Triggers
@@ -821,10 +854,13 @@ CONFIG_RTC_INTF_DEV=y
821854
# CONFIG_RTC_DRV_PCF8583 is not set
822855
# CONFIG_RTC_DRV_M41T80 is not set
823856
# CONFIG_RTC_DRV_S35390A is not set
857+
# CONFIG_RTC_DRV_FM3130 is not set
824858

825859
#
826860
# SPI RTC drivers
827861
#
862+
# CONFIG_RTC_DRV_M41T94 is not set
863+
# CONFIG_RTC_DRV_DS1305 is not set
828864
# CONFIG_RTC_DRV_MAX6902 is not set
829865
# CONFIG_RTC_DRV_R9701 is not set
830866
# CONFIG_RTC_DRV_RS5C348 is not set
@@ -844,6 +880,19 @@ CONFIG_RTC_INTF_DEV=y
844880
# on-CPU RTC drivers
845881
#
846882
CONFIG_RTC_DRV_AT32AP700X=y
883+
CONFIG_DMADEVICES=y
884+
885+
#
886+
# DMA Devices
887+
#
888+
CONFIG_DW_DMAC=y
889+
CONFIG_DMA_ENGINE=y
890+
891+
#
892+
# DMA Clients
893+
#
894+
# CONFIG_NET_DMA is not set
895+
CONFIG_DMATEST=m
847896
# CONFIG_UIO is not set
848897

849898
#
@@ -921,6 +970,7 @@ CONFIG_JFFS2_RTIME=y
921970
# CONFIG_CRAMFS is not set
922971
# CONFIG_VXFS_FS is not set
923972
# CONFIG_MINIX_FS is not set
973+
# CONFIG_OMFS_FS is not set
924974
# CONFIG_HPFS_FS is not set
925975
# CONFIG_QNX4FS_FS is not set
926976
# CONFIG_ROMFS_FS is not set
@@ -931,17 +981,16 @@ CONFIG_NFS_FS=y
931981
CONFIG_NFS_V3=y
932982
# CONFIG_NFS_V3_ACL is not set
933983
# CONFIG_NFS_V4 is not set
984+
CONFIG_ROOT_NFS=y
934985
CONFIG_NFSD=m
935986
CONFIG_NFSD_V3=y
936987
# CONFIG_NFSD_V3_ACL is not set
937988
# CONFIG_NFSD_V4 is not set
938-
CONFIG_ROOT_NFS=y
939989
CONFIG_LOCKD=y
940990
CONFIG_LOCKD_V4=y
941991
CONFIG_EXPORTFS=m
942992
CONFIG_NFS_COMMON=y
943993
CONFIG_SUNRPC=y
944-
# CONFIG_SUNRPC_BIND34 is not set
945994
# CONFIG_RPCSEC_GSS_KRB5 is not set
946995
# CONFIG_RPCSEC_GSS_SPKM3 is not set
947996
CONFIG_SMB_FS=m
@@ -1017,6 +1066,8 @@ CONFIG_MAGIC_SYSRQ=y
10171066
CONFIG_DEBUG_KERNEL=y
10181067
# CONFIG_DEBUG_SHIRQ is not set
10191068
CONFIG_DETECT_SOFTLOCKUP=y
1069+
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1070+
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
10201071
CONFIG_SCHED_DEBUG=y
10211072
# CONFIG_SCHEDSTATS is not set
10221073
# CONFIG_TIMER_STATS is not set
@@ -1037,6 +1088,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
10371088
# CONFIG_DEBUG_INFO is not set
10381089
# CONFIG_DEBUG_VM is not set
10391090
# CONFIG_DEBUG_WRITECOUNT is not set
1091+
# CONFIG_DEBUG_MEMORY_INIT is not set
10401092
# CONFIG_DEBUG_LIST is not set
10411093
# CONFIG_DEBUG_SG is not set
10421094
CONFIG_FRAME_POINTER=y
@@ -1101,6 +1153,10 @@ CONFIG_CRYPTO_HMAC=y
11011153
# CONFIG_CRYPTO_MD4 is not set
11021154
CONFIG_CRYPTO_MD5=y
11031155
# CONFIG_CRYPTO_MICHAEL_MIC is not set
1156+
# CONFIG_CRYPTO_RMD128 is not set
1157+
# CONFIG_CRYPTO_RMD160 is not set
1158+
# CONFIG_CRYPTO_RMD256 is not set
1159+
# CONFIG_CRYPTO_RMD320 is not set
11041160
CONFIG_CRYPTO_SHA1=y
11051161
# CONFIG_CRYPTO_SHA256 is not set
11061162
# CONFIG_CRYPTO_SHA512 is not set
@@ -1141,12 +1197,14 @@ CONFIG_BITREVERSE=y
11411197
# CONFIG_GENERIC_FIND_NEXT_BIT is not set
11421198
CONFIG_CRC_CCITT=m
11431199
# CONFIG_CRC16 is not set
1200+
# CONFIG_CRC_T10DIF is not set
11441201
CONFIG_CRC_ITU_T=m
11451202
CONFIG_CRC32=y
11461203
CONFIG_CRC7=m
11471204
# CONFIG_LIBCRC32C is not set
11481205
CONFIG_ZLIB_INFLATE=y
11491206
CONFIG_ZLIB_DEFLATE=y
1207+
CONFIG_GENERIC_ALLOCATOR=y
11501208
CONFIG_PLIST=y
11511209
CONFIG_HAS_IOMEM=y
11521210
CONFIG_HAS_IOPORT=y

0 commit comments

Comments
 (0)