aboutsummaryrefslogtreecommitdiffstats
path: root/arch/avr32
diff options
context:
space:
mode:
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2009-03-27 11:14:38 -0400
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2009-03-27 11:14:38 -0400
commitb92efa9abffc4a634cd2e7a0f81f8aa6310d67c9 (patch)
tree9847508d9b8d4e585f90db4a453bfbc3700c997e /arch/avr32
parenta16fffdd8eb95ebab7dc22414896fe6493951e0e (diff)
parentbe0ea69674ed95e1e98cb3687a241badc756d228 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into avr32-arch
Diffstat (limited to 'arch/avr32')
-rw-r--r--arch/avr32/configs/atngw100_defconfig6
-rw-r--r--arch/avr32/configs/atngw100_evklcd100_defconfig4
-rw-r--r--arch/avr32/configs/atngw100_evklcd101_defconfig4
-rw-r--r--arch/avr32/configs/atstk1002_defconfig6
-rw-r--r--arch/avr32/configs/atstk1003_defconfig6
-rw-r--r--arch/avr32/configs/atstk1004_defconfig2
-rw-r--r--arch/avr32/configs/atstk1006_defconfig6
-rw-r--r--arch/avr32/configs/favr-32_defconfig6
-rw-r--r--arch/avr32/configs/hammerhead_defconfig6
-rw-r--r--arch/avr32/configs/mimc200_defconfig6
-rw-r--r--arch/avr32/include/asm/socket.h3
-rw-r--r--arch/avr32/include/asm/swab.h2
-rw-r--r--arch/avr32/kernel/irq.c2
-rw-r--r--arch/avr32/mach-at32ap/include/mach/board.h1
14 files changed, 32 insertions, 28 deletions
diff --git a/arch/avr32/configs/atngw100_defconfig b/arch/avr32/configs/atngw100_defconfig
index 164e2814ae78..574aca975334 100644
--- a/arch/avr32/configs/atngw100_defconfig
+++ b/arch/avr32/configs/atngw100_defconfig
@@ -644,8 +644,8 @@ CONFIG_I2C_GPIO=m
644# Miscellaneous I2C Chip support 644# Miscellaneous I2C Chip support
645# 645#
646# CONFIG_DS1682 is not set 646# CONFIG_DS1682 is not set
647CONFIG_AT24=m 647CONFIG_EEPROM_AT24=m
648# CONFIG_SENSORS_EEPROM is not set 648# CONFIG_EEPROM_LEGACY is not set
649# CONFIG_SENSORS_PCF8574 is not set 649# CONFIG_SENSORS_PCF8574 is not set
650# CONFIG_PCF8575 is not set 650# CONFIG_PCF8575 is not set
651# CONFIG_SENSORS_PCA9539 is not set 651# CONFIG_SENSORS_PCA9539 is not set
@@ -670,7 +670,7 @@ CONFIG_SPI_ATMEL=y
670# 670#
671# SPI Protocol Masters 671# SPI Protocol Masters
672# 672#
673# CONFIG_SPI_AT25 is not set 673# CONFIG_EEPROM_AT25 is not set
674CONFIG_SPI_SPIDEV=m 674CONFIG_SPI_SPIDEV=m
675# CONFIG_SPI_TLE62X0 is not set 675# CONFIG_SPI_TLE62X0 is not set
676CONFIG_ARCH_REQUIRE_GPIOLIB=y 676CONFIG_ARCH_REQUIRE_GPIOLIB=y
diff --git a/arch/avr32/configs/atngw100_evklcd100_defconfig b/arch/avr32/configs/atngw100_evklcd100_defconfig
index b0572d213826..86a45b5c9d0d 100644
--- a/arch/avr32/configs/atngw100_evklcd100_defconfig
+++ b/arch/avr32/configs/atngw100_evklcd100_defconfig
@@ -671,7 +671,7 @@ CONFIG_I2C_GPIO=m
671# Miscellaneous I2C Chip support 671# Miscellaneous I2C Chip support
672# 672#
673# CONFIG_DS1682 is not set 673# CONFIG_DS1682 is not set
674# CONFIG_SENSORS_EEPROM is not set 674# CONFIG_EEPROM_LEGACY is not set
675# CONFIG_SENSORS_PCF8574 is not set 675# CONFIG_SENSORS_PCF8574 is not set
676# CONFIG_PCF8575 is not set 676# CONFIG_PCF8575 is not set
677# CONFIG_SENSORS_PCF8591 is not set 677# CONFIG_SENSORS_PCF8591 is not set
@@ -699,7 +699,7 @@ CONFIG_SPI_ATMEL=y
699# 699#
700# SPI Protocol Masters 700# SPI Protocol Masters
701# 701#
702# CONFIG_SPI_AT25 is not set 702# CONFIG_EEPROM_AT25 is not set
703CONFIG_SPI_SPIDEV=m 703CONFIG_SPI_SPIDEV=m
704# CONFIG_SPI_TLE62X0 is not set 704# CONFIG_SPI_TLE62X0 is not set
705CONFIG_HAVE_GPIO_LIB=y 705CONFIG_HAVE_GPIO_LIB=y
diff --git a/arch/avr32/configs/atngw100_evklcd101_defconfig b/arch/avr32/configs/atngw100_evklcd101_defconfig
index c5b898d21075..a96b68ea5e83 100644
--- a/arch/avr32/configs/atngw100_evklcd101_defconfig
+++ b/arch/avr32/configs/atngw100_evklcd101_defconfig
@@ -671,7 +671,7 @@ CONFIG_I2C_GPIO=m
671# Miscellaneous I2C Chip support 671# Miscellaneous I2C Chip support
672# 672#
673# CONFIG_DS1682 is not set 673# CONFIG_DS1682 is not set
674# CONFIG_SENSORS_EEPROM is not set 674# CONFIG_EEPROM_LEGACY is not set
675# CONFIG_SENSORS_PCF8574 is not set 675# CONFIG_SENSORS_PCF8574 is not set
676# CONFIG_PCF8575 is not set 676# CONFIG_PCF8575 is not set
677# CONFIG_SENSORS_PCF8591 is not set 677# CONFIG_SENSORS_PCF8591 is not set
@@ -699,7 +699,7 @@ CONFIG_SPI_ATMEL=y
699# 699#
700# SPI Protocol Masters 700# SPI Protocol Masters
701# 701#
702# CONFIG_SPI_AT25 is not set 702# CONFIG_EEPROM_AT25 is not set
703CONFIG_SPI_SPIDEV=m 703CONFIG_SPI_SPIDEV=m
704# CONFIG_SPI_TLE62X0 is not set 704# CONFIG_SPI_TLE62X0 is not set
705CONFIG_HAVE_GPIO_LIB=y 705CONFIG_HAVE_GPIO_LIB=y
diff --git a/arch/avr32/configs/atstk1002_defconfig b/arch/avr32/configs/atstk1002_defconfig
index c9dc64832a19..0abe90adb1a4 100644
--- a/arch/avr32/configs/atstk1002_defconfig
+++ b/arch/avr32/configs/atstk1002_defconfig
@@ -663,8 +663,8 @@ CONFIG_I2C_GPIO=m
663# Miscellaneous I2C Chip support 663# Miscellaneous I2C Chip support
664# 664#
665# CONFIG_DS1682 is not set 665# CONFIG_DS1682 is not set
666CONFIG_AT24=m 666CONFIG_EEPROM_AT24=m
667# CONFIG_SENSORS_EEPROM is not set 667# CONFIG_EEPROM_LEGACY is not set
668# CONFIG_SENSORS_PCF8574 is not set 668# CONFIG_SENSORS_PCF8574 is not set
669# CONFIG_PCF8575 is not set 669# CONFIG_PCF8575 is not set
670# CONFIG_SENSORS_PCA9539 is not set 670# CONFIG_SENSORS_PCA9539 is not set
@@ -689,7 +689,7 @@ CONFIG_SPI_ATMEL=y
689# 689#
690# SPI Protocol Masters 690# SPI Protocol Masters
691# 691#
692# CONFIG_SPI_AT25 is not set 692# CONFIG_EEPROM_AT25 is not set
693CONFIG_SPI_SPIDEV=m 693CONFIG_SPI_SPIDEV=m
694# CONFIG_SPI_TLE62X0 is not set 694# CONFIG_SPI_TLE62X0 is not set
695CONFIG_ARCH_REQUIRE_GPIOLIB=y 695CONFIG_ARCH_REQUIRE_GPIOLIB=y
diff --git a/arch/avr32/configs/atstk1003_defconfig b/arch/avr32/configs/atstk1003_defconfig
index 29ea1327b498..101972f40f07 100644
--- a/arch/avr32/configs/atstk1003_defconfig
+++ b/arch/avr32/configs/atstk1003_defconfig
@@ -611,8 +611,8 @@ CONFIG_I2C_GPIO=m
611# Miscellaneous I2C Chip support 611# Miscellaneous I2C Chip support
612# 612#
613# CONFIG_DS1682 is not set 613# CONFIG_DS1682 is not set
614CONFIG_AT24=m 614CONFIG_EEPROM_AT24=m
615# CONFIG_SENSORS_EEPROM is not set 615# CONFIG_EEPROM_LEGACY is not set
616# CONFIG_SENSORS_PCF8574 is not set 616# CONFIG_SENSORS_PCF8574 is not set
617# CONFIG_PCF8575 is not set 617# CONFIG_PCF8575 is not set
618# CONFIG_SENSORS_PCA9539 is not set 618# CONFIG_SENSORS_PCA9539 is not set
@@ -637,7 +637,7 @@ CONFIG_SPI_ATMEL=y
637# 637#
638# SPI Protocol Masters 638# SPI Protocol Masters
639# 639#
640# CONFIG_SPI_AT25 is not set 640# CONFIG_EEPROM_AT25 is not set
641CONFIG_SPI_SPIDEV=m 641CONFIG_SPI_SPIDEV=m
642# CONFIG_SPI_TLE62X0 is not set 642# CONFIG_SPI_TLE62X0 is not set
643CONFIG_ARCH_REQUIRE_GPIOLIB=y 643CONFIG_ARCH_REQUIRE_GPIOLIB=y
diff --git a/arch/avr32/configs/atstk1004_defconfig b/arch/avr32/configs/atstk1004_defconfig
index 69e6c0d08ce8..518f7898df75 100644
--- a/arch/avr32/configs/atstk1004_defconfig
+++ b/arch/avr32/configs/atstk1004_defconfig
@@ -394,7 +394,7 @@ CONFIG_SPI_ATMEL=y
394# 394#
395# SPI Protocol Masters 395# SPI Protocol Masters
396# 396#
397# CONFIG_SPI_AT25 is not set 397# CONFIG_EEPROM_AT25 is not set
398# CONFIG_SPI_SPIDEV is not set 398# CONFIG_SPI_SPIDEV is not set
399# CONFIG_SPI_TLE62X0 is not set 399# CONFIG_SPI_TLE62X0 is not set
400CONFIG_ARCH_REQUIRE_GPIOLIB=y 400CONFIG_ARCH_REQUIRE_GPIOLIB=y
diff --git a/arch/avr32/configs/atstk1006_defconfig b/arch/avr32/configs/atstk1006_defconfig
index 361c31c2af10..c1603c4860e0 100644
--- a/arch/avr32/configs/atstk1006_defconfig
+++ b/arch/avr32/configs/atstk1006_defconfig
@@ -684,8 +684,8 @@ CONFIG_I2C_GPIO=m
684# Miscellaneous I2C Chip support 684# Miscellaneous I2C Chip support
685# 685#
686# CONFIG_DS1682 is not set 686# CONFIG_DS1682 is not set
687# CONFIG_AT24 is not set 687# CONFIG_EEPROM_AT24 is not set
688# CONFIG_SENSORS_EEPROM is not set 688# CONFIG_EEPROM_LEGACY is not set
689# CONFIG_SENSORS_PCF8574 is not set 689# CONFIG_SENSORS_PCF8574 is not set
690# CONFIG_PCF8575 is not set 690# CONFIG_PCF8575 is not set
691# CONFIG_SENSORS_PCA9539 is not set 691# CONFIG_SENSORS_PCA9539 is not set
@@ -710,7 +710,7 @@ CONFIG_SPI_ATMEL=y
710# 710#
711# SPI Protocol Masters 711# SPI Protocol Masters
712# 712#
713# CONFIG_SPI_AT25 is not set 713# CONFIG_EEPROM_AT25 is not set
714CONFIG_SPI_SPIDEV=m 714CONFIG_SPI_SPIDEV=m
715# CONFIG_SPI_TLE62X0 is not set 715# CONFIG_SPI_TLE62X0 is not set
716CONFIG_ARCH_REQUIRE_GPIOLIB=y 716CONFIG_ARCH_REQUIRE_GPIOLIB=y
diff --git a/arch/avr32/configs/favr-32_defconfig b/arch/avr32/configs/favr-32_defconfig
index e2bd9982e2af..4c3ac0643e4a 100644
--- a/arch/avr32/configs/favr-32_defconfig
+++ b/arch/avr32/configs/favr-32_defconfig
@@ -633,8 +633,8 @@ CONFIG_I2C_GPIO=m
633# Miscellaneous I2C Chip support 633# Miscellaneous I2C Chip support
634# 634#
635# CONFIG_DS1682 is not set 635# CONFIG_DS1682 is not set
636# CONFIG_AT24 is not set 636# CONFIG_EEPROM_AT24 is not set
637# CONFIG_SENSORS_EEPROM is not set 637# CONFIG_EEPROM_LEGACY is not set
638# CONFIG_SENSORS_PCF8574 is not set 638# CONFIG_SENSORS_PCF8574 is not set
639# CONFIG_PCF8575 is not set 639# CONFIG_PCF8575 is not set
640# CONFIG_SENSORS_PCA9539 is not set 640# CONFIG_SENSORS_PCA9539 is not set
@@ -659,7 +659,7 @@ CONFIG_SPI_ATMEL=y
659# 659#
660# SPI Protocol Masters 660# SPI Protocol Masters
661# 661#
662# CONFIG_SPI_AT25 is not set 662# CONFIG_EEPROM_AT25 is not set
663CONFIG_SPI_SPIDEV=m 663CONFIG_SPI_SPIDEV=m
664# CONFIG_SPI_TLE62X0 is not set 664# CONFIG_SPI_TLE62X0 is not set
665CONFIG_ARCH_REQUIRE_GPIOLIB=y 665CONFIG_ARCH_REQUIRE_GPIOLIB=y
diff --git a/arch/avr32/configs/hammerhead_defconfig b/arch/avr32/configs/hammerhead_defconfig
index 0d3d2982c8f5..3970fcc4d76e 100644
--- a/arch/avr32/configs/hammerhead_defconfig
+++ b/arch/avr32/configs/hammerhead_defconfig
@@ -716,8 +716,8 @@ CONFIG_I2C_GPIO=m
716# Miscellaneous I2C Chip support 716# Miscellaneous I2C Chip support
717# 717#
718# CONFIG_DS1682 is not set 718# CONFIG_DS1682 is not set
719# CONFIG_AT24 is not set 719# CONFIG_EEPROM_AT24 is not set
720# CONFIG_SENSORS_EEPROM is not set 720# CONFIG_EEPROM_LEGACY is not set
721# CONFIG_SENSORS_PCF8574 is not set 721# CONFIG_SENSORS_PCF8574 is not set
722# CONFIG_PCF8575 is not set 722# CONFIG_PCF8575 is not set
723# CONFIG_SENSORS_PCA9539 is not set 723# CONFIG_SENSORS_PCA9539 is not set
@@ -742,7 +742,7 @@ CONFIG_SPI_ATMEL=y
742# 742#
743# SPI Protocol Masters 743# SPI Protocol Masters
744# 744#
745# CONFIG_SPI_AT25 is not set 745# CONFIG_EEPROM_AT25 is not set
746CONFIG_SPI_SPIDEV=m 746CONFIG_SPI_SPIDEV=m
747# CONFIG_SPI_TLE62X0 is not set 747# CONFIG_SPI_TLE62X0 is not set
748CONFIG_ARCH_REQUIRE_GPIOLIB=y 748CONFIG_ARCH_REQUIRE_GPIOLIB=y
diff --git a/arch/avr32/configs/mimc200_defconfig b/arch/avr32/configs/mimc200_defconfig
index 981e4f8b8aeb..1a58ffbc752d 100644
--- a/arch/avr32/configs/mimc200_defconfig
+++ b/arch/avr32/configs/mimc200_defconfig
@@ -565,8 +565,8 @@ CONFIG_I2C_GPIO=y
565# Miscellaneous I2C Chip support 565# Miscellaneous I2C Chip support
566# 566#
567# CONFIG_DS1682 is not set 567# CONFIG_DS1682 is not set
568CONFIG_AT24=y 568CONFIG_EEPROM_AT24=y
569# CONFIG_SENSORS_EEPROM is not set 569# CONFIG_EEPROM_LEGACY is not set
570# CONFIG_SENSORS_PCF8574 is not set 570# CONFIG_SENSORS_PCF8574 is not set
571# CONFIG_PCF8575 is not set 571# CONFIG_PCF8575 is not set
572# CONFIG_SENSORS_PCA9539 is not set 572# CONFIG_SENSORS_PCA9539 is not set
@@ -592,7 +592,7 @@ CONFIG_SPI_ATMEL=y
592# 592#
593# SPI Protocol Masters 593# SPI Protocol Masters
594# 594#
595CONFIG_SPI_AT25=y 595CONFIG_EEPROM_AT25=y
596# CONFIG_SPI_SPIDEV is not set 596# CONFIG_SPI_SPIDEV is not set
597# CONFIG_SPI_TLE62X0 is not set 597# CONFIG_SPI_TLE62X0 is not set
598CONFIG_ARCH_REQUIRE_GPIOLIB=y 598CONFIG_ARCH_REQUIRE_GPIOLIB=y
diff --git a/arch/avr32/include/asm/socket.h b/arch/avr32/include/asm/socket.h
index 35863f260929..04c860619700 100644
--- a/arch/avr32/include/asm/socket.h
+++ b/arch/avr32/include/asm/socket.h
@@ -54,4 +54,7 @@
54 54
55#define SO_MARK 36 55#define SO_MARK 36
56 56
57#define SO_TIMESTAMPING 37
58#define SCM_TIMESTAMPING SO_TIMESTAMPING
59
57#endif /* __ASM_AVR32_SOCKET_H */ 60#endif /* __ASM_AVR32_SOCKET_H */
diff --git a/arch/avr32/include/asm/swab.h b/arch/avr32/include/asm/swab.h
index a14aa5b46d98..14cc737bbca6 100644
--- a/arch/avr32/include/asm/swab.h
+++ b/arch/avr32/include/asm/swab.h
@@ -4,7 +4,7 @@
4#ifndef __ASM_AVR32_SWAB_H 4#ifndef __ASM_AVR32_SWAB_H
5#define __ASM_AVR32_SWAB_H 5#define __ASM_AVR32_SWAB_H
6 6
7#include <asm/types.h> 7#include <linux/types.h>
8#include <linux/compiler.h> 8#include <linux/compiler.h>
9 9
10#define __SWAB_64_THRU_32__ 10#define __SWAB_64_THRU_32__
diff --git a/arch/avr32/kernel/irq.c b/arch/avr32/kernel/irq.c
index a8e767d836aa..9f572229d318 100644
--- a/arch/avr32/kernel/irq.c
+++ b/arch/avr32/kernel/irq.c
@@ -58,7 +58,7 @@ int show_interrupts(struct seq_file *p, void *v)
58 58
59 seq_printf(p, "%3d: ", i); 59 seq_printf(p, "%3d: ", i);
60 for_each_online_cpu(cpu) 60 for_each_online_cpu(cpu)
61 seq_printf(p, "%10u ", kstat_cpu(cpu).irqs[i]); 61 seq_printf(p, "%10u ", kstat_irqs_cpu(i, cpu));
62 seq_printf(p, " %8s", irq_desc[i].chip->name ? : "-"); 62 seq_printf(p, " %8s", irq_desc[i].chip->name ? : "-");
63 seq_printf(p, " %s", action->name); 63 seq_printf(p, " %s", action->name);
64 for (action = action->next; action; action = action->next) 64 for (action = action->next; action; action = action->next)
diff --git a/arch/avr32/mach-at32ap/include/mach/board.h b/arch/avr32/mach-at32ap/include/mach/board.h
index aafaf7a78886..cff8e84f78f2 100644
--- a/arch/avr32/mach-at32ap/include/mach/board.h
+++ b/arch/avr32/mach-at32ap/include/mach/board.h
@@ -116,6 +116,7 @@ struct atmel_nand_data {
116 int enable_pin; /* chip enable */ 116 int enable_pin; /* chip enable */
117 int det_pin; /* card detect */ 117 int det_pin; /* card detect */
118 int rdy_pin; /* ready/busy */ 118 int rdy_pin; /* ready/busy */
119 u8 rdy_pin_active_low; /* rdy_pin value is inverted */
119 u8 ale; /* address line number connected to ALE */ 120 u8 ale; /* address line number connected to ALE */
120 u8 cle; /* address line number connected to CLE */ 121 u8 cle; /* address line number connected to CLE */
121 u8 bus_width_16; /* buswidth is 16 bit */ 122 u8 bus_width_16; /* buswidth is 16 bit */
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-14 00:45:46 -0500