summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYacine Belkadi2011-08-11 16:19:58 +0200
committerYacine Belkadi2011-09-15 11:15:22 +0200
commitda36e19b7fc3d63d6f93a1d102f002e379e486dc (patch)
tree3baf09e768c9fbdf8e10f1517b76c7992b1d0aea
parentb35ff0e96de82b987ded07656b0ee5ded18f6dbd (diff)
cleo/linux/drv/ad986x: move code from char/ to (the new) afe/, closes #453
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/arizona/linux26.config6
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/scr310/linux26.config6
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/spk300/linux26.config6
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/spk300g/linux26.config6
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/spk310/linux26.config6
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/spr300/linux26.config6
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/spr310/linux26.config6
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/Kconfig2
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/drivers/Kconfig3
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/drivers/Makefile1
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/drivers/afe/Kconfig16
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/drivers/afe/Makefile5
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/drivers/afe/ad986x.c (renamed from cleopatre/linux-2.6.25.10-spc300/drivers/char/ad986x.c)0
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/drivers/char/Kconfig7
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/drivers/char/Makefile2
15 files changed, 62 insertions, 16 deletions
diff --git a/cleopatre/buildroot/target/device/Spidcom/arizona/linux26.config b/cleopatre/buildroot/target/device/Spidcom/arizona/linux26.config
index 5472933400..129f9b8b50 100644
--- a/cleopatre/buildroot/target/device/Spidcom/arizona/linux26.config
+++ b/cleopatre/buildroot/target/device/Spidcom/arizona/linux26.config
@@ -659,7 +659,6 @@ CONFIG_LEGACY_PTY_COUNT=16
# CONFIG_R3964 is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_TCG_TPM is not set
-CONFIG_AD986X=y
# CONFIG_I2C is not set
#
@@ -764,6 +763,11 @@ CONFIG_RTC_LIB=y
# CONFIG_RTC_CLASS is not set
#
+# Analog Front End devices
+#
+CONFIG_AD986X=y
+
+#
# File systems
#
CONFIG_EXT2_FS=y
diff --git a/cleopatre/buildroot/target/device/Spidcom/scr310/linux26.config b/cleopatre/buildroot/target/device/Spidcom/scr310/linux26.config
index 6aeb4580e8..e2ffe471cb 100644
--- a/cleopatre/buildroot/target/device/Spidcom/scr310/linux26.config
+++ b/cleopatre/buildroot/target/device/Spidcom/scr310/linux26.config
@@ -613,7 +613,6 @@ CONFIG_LEGACY_PTY_COUNT=16
# CONFIG_R3964 is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_TCG_TPM is not set
-CONFIG_AD986X=y
# CONFIG_I2C is not set
#
@@ -718,6 +717,11 @@ CONFIG_RTC_LIB=y
# CONFIG_RTC_CLASS is not set
#
+# Analog Front End devices
+#
+CONFIG_AD986X=y
+
+#
# File systems
#
CONFIG_EXT2_FS=y
diff --git a/cleopatre/buildroot/target/device/Spidcom/spk300/linux26.config b/cleopatre/buildroot/target/device/Spidcom/spk300/linux26.config
index 25eada6261..e82d5665a3 100644
--- a/cleopatre/buildroot/target/device/Spidcom/spk300/linux26.config
+++ b/cleopatre/buildroot/target/device/Spidcom/spk300/linux26.config
@@ -614,7 +614,6 @@ CONFIG_LEGACY_PTY_COUNT=16
# CONFIG_R3964 is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_TCG_TPM is not set
-CONFIG_AD986X=y
# CONFIG_I2C is not set
#
@@ -719,6 +718,11 @@ CONFIG_RTC_LIB=y
# CONFIG_RTC_CLASS is not set
#
+# Analog Front End devices
+#
+CONFIG_AD986X=y
+
+#
# File systems
#
CONFIG_EXT2_FS=y
diff --git a/cleopatre/buildroot/target/device/Spidcom/spk300g/linux26.config b/cleopatre/buildroot/target/device/Spidcom/spk300g/linux26.config
index c88b453c58..f24682aba1 100644
--- a/cleopatre/buildroot/target/device/Spidcom/spk300g/linux26.config
+++ b/cleopatre/buildroot/target/device/Spidcom/spk300g/linux26.config
@@ -615,7 +615,6 @@ CONFIG_LEGACY_PTY_COUNT=16
# CONFIG_R3964 is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_TCG_TPM is not set
-CONFIG_AD986X=y
# CONFIG_I2C is not set
#
@@ -720,6 +719,11 @@ CONFIG_RTC_LIB=y
# CONFIG_RTC_CLASS is not set
#
+# Analog Front End devices
+#
+CONFIG_AD986X=y
+
+#
# File systems
#
CONFIG_EXT2_FS=y
diff --git a/cleopatre/buildroot/target/device/Spidcom/spk310/linux26.config b/cleopatre/buildroot/target/device/Spidcom/spk310/linux26.config
index 1490226525..bf3338a7a9 100644
--- a/cleopatre/buildroot/target/device/Spidcom/spk310/linux26.config
+++ b/cleopatre/buildroot/target/device/Spidcom/spk310/linux26.config
@@ -613,7 +613,6 @@ CONFIG_LEGACY_PTY_COUNT=16
# CONFIG_R3964 is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_TCG_TPM is not set
-CONFIG_AD986X=y
# CONFIG_I2C is not set
#
@@ -718,6 +717,11 @@ CONFIG_RTC_LIB=y
# CONFIG_RTC_CLASS is not set
#
+# Analog Front End devices
+#
+CONFIG_AD986X=y
+
+#
# File systems
#
CONFIG_EXT2_FS=y
diff --git a/cleopatre/buildroot/target/device/Spidcom/spr300/linux26.config b/cleopatre/buildroot/target/device/Spidcom/spr300/linux26.config
index dc52faf7d1..af2226d39c 100644
--- a/cleopatre/buildroot/target/device/Spidcom/spr300/linux26.config
+++ b/cleopatre/buildroot/target/device/Spidcom/spr300/linux26.config
@@ -614,7 +614,6 @@ CONFIG_LEGACY_PTY_COUNT=16
# CONFIG_R3964 is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_TCG_TPM is not set
-CONFIG_AD986X=y
# CONFIG_I2C is not set
#
@@ -719,6 +718,11 @@ CONFIG_RTC_LIB=y
# CONFIG_RTC_CLASS is not set
#
+# Analog Front End devices
+#
+CONFIG_AD986X=y
+
+#
# File systems
#
CONFIG_EXT2_FS=y
diff --git a/cleopatre/buildroot/target/device/Spidcom/spr310/linux26.config b/cleopatre/buildroot/target/device/Spidcom/spr310/linux26.config
index 8376ab60fa..e33735e5ac 100644
--- a/cleopatre/buildroot/target/device/Spidcom/spr310/linux26.config
+++ b/cleopatre/buildroot/target/device/Spidcom/spr310/linux26.config
@@ -613,7 +613,6 @@ CONFIG_LEGACY_PTY_COUNT=16
# CONFIG_R3964 is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_TCG_TPM is not set
-CONFIG_AD986X=y
# CONFIG_I2C is not set
#
@@ -718,6 +717,11 @@ CONFIG_RTC_LIB=y
# CONFIG_RTC_CLASS is not set
#
+# Analog Front End devices
+#
+CONFIG_AD986X=y
+
+#
# File systems
#
CONFIG_EXT2_FS=y
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/Kconfig b/cleopatre/linux-2.6.25.10-spc300/arch/arm/Kconfig
index 1340895469..ab0872d8a5 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/Kconfig
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/Kconfig
@@ -1185,6 +1185,8 @@ source "drivers/dma/Kconfig"
source "drivers/dca/Kconfig"
+source "drivers/afe/Kconfig"
+
endmenu
source "fs/Kconfig"
diff --git a/cleopatre/linux-2.6.25.10-spc300/drivers/Kconfig b/cleopatre/linux-2.6.25.10-spc300/drivers/Kconfig
index 3a0e354973..28dedb2af7 100644
--- a/cleopatre/linux-2.6.25.10-spc300/drivers/Kconfig
+++ b/cleopatre/linux-2.6.25.10-spc300/drivers/Kconfig
@@ -97,4 +97,7 @@ source "drivers/dca/Kconfig"
source "drivers/auxdisplay/Kconfig"
source "drivers/uio/Kconfig"
+
+source "drivers/afe/Kconfig"
+
endmenu
diff --git a/cleopatre/linux-2.6.25.10-spc300/drivers/Makefile b/cleopatre/linux-2.6.25.10-spc300/drivers/Makefile
index e5e394a7e6..2c2f29cd02 100644
--- a/cleopatre/linux-2.6.25.10-spc300/drivers/Makefile
+++ b/cleopatre/linux-2.6.25.10-spc300/drivers/Makefile
@@ -93,3 +93,4 @@ obj-$(CONFIG_PPC_PS3) += ps3/
obj-$(CONFIG_OF) += of/
obj-$(CONFIG_SSB) += ssb/
obj-$(CONFIG_VIRTIO) += virtio/
+obj-y += afe/
diff --git a/cleopatre/linux-2.6.25.10-spc300/drivers/afe/Kconfig b/cleopatre/linux-2.6.25.10-spc300/drivers/afe/Kconfig
new file mode 100644
index 0000000000..bc8cb3f7b8
--- /dev/null
+++ b/cleopatre/linux-2.6.25.10-spc300/drivers/afe/Kconfig
@@ -0,0 +1,16 @@
+#
+# Analog Front End device configuration
+#
+
+menu "Analog Front End devices"
+
+config AD986X
+ bool "Support for AD986X Analog Front End"
+ depends on SPI_MASTER
+ default y
+ help
+ This option enables support for the AD986X Analog Font End devices
+ family. These devices are driven by SPI.
+
+endmenu
+
diff --git a/cleopatre/linux-2.6.25.10-spc300/drivers/afe/Makefile b/cleopatre/linux-2.6.25.10-spc300/drivers/afe/Makefile
new file mode 100644
index 0000000000..7513ca75a8
--- /dev/null
+++ b/cleopatre/linux-2.6.25.10-spc300/drivers/afe/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the kernel AFE device drivers.
+#
+
+obj-$(CONFIG_AD986X) += ad986x.o
diff --git a/cleopatre/linux-2.6.25.10-spc300/drivers/char/ad986x.c b/cleopatre/linux-2.6.25.10-spc300/drivers/afe/ad986x.c
index 76279ceb85..76279ceb85 100644
--- a/cleopatre/linux-2.6.25.10-spc300/drivers/char/ad986x.c
+++ b/cleopatre/linux-2.6.25.10-spc300/drivers/afe/ad986x.c
diff --git a/cleopatre/linux-2.6.25.10-spc300/drivers/char/Kconfig b/cleopatre/linux-2.6.25.10-spc300/drivers/char/Kconfig
index bbe4628665..47c6be84fc 100644
--- a/cleopatre/linux-2.6.25.10-spc300/drivers/char/Kconfig
+++ b/cleopatre/linux-2.6.25.10-spc300/drivers/char/Kconfig
@@ -1049,12 +1049,5 @@ config DEVPORT
source "drivers/s390/char/Kconfig"
-config AD986X
- tristate "Support for AD986X Analog Front End"
- depends on SPI_MASTER
- help
- This option enables support for the AD986X Analog Font End devices
- family. These devices are driven by SPI.
-
endmenu
diff --git a/cleopatre/linux-2.6.25.10-spc300/drivers/char/Makefile b/cleopatre/linux-2.6.25.10-spc300/drivers/char/Makefile
index 231255fd8b..5407b76156 100644
--- a/cleopatre/linux-2.6.25.10-spc300/drivers/char/Makefile
+++ b/cleopatre/linux-2.6.25.10-spc300/drivers/char/Makefile
@@ -112,8 +112,6 @@ obj-$(CONFIG_PS3_FLASH) += ps3flash.o
obj-$(CONFIG_JS_RTC) += js-rtc.o
js-rtc-y = rtc.o
-obj-$(CONFIG_AD986X) += ad986x.o
-
# Files generated that shall be removed upon make clean
clean-files := consolemap_deftbl.c defkeymap.c