summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/arizona/linux26.config2
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/scr310/linux26.config2
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/spk300/linux26.config2
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/spk300g/linux26.config2
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/spk310/linux26.config2
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/spr300/linux26.config2
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/spr310/linux26.config2
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-arizona.c2
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-scr310.c2
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk300.c2
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk300g.c2
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk310.c2
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spr300.c2
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spr310.c2
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-devices.c2
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/drivers/char/Kconfig6
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/drivers/char/Makefile2
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/drivers/char/ad986x.c (renamed from cleopatre/linux-2.6.25.10-spc300/drivers/char/ad9865.c)60
18 files changed, 49 insertions, 49 deletions
diff --git a/cleopatre/buildroot/target/device/Spidcom/arizona/linux26.config b/cleopatre/buildroot/target/device/Spidcom/arizona/linux26.config
index e30ee6b776..5472933400 100644
--- a/cleopatre/buildroot/target/device/Spidcom/arizona/linux26.config
+++ b/cleopatre/buildroot/target/device/Spidcom/arizona/linux26.config
@@ -659,7 +659,7 @@ CONFIG_LEGACY_PTY_COUNT=16
# CONFIG_R3964 is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_TCG_TPM is not set
-CONFIG_AD9865=y
+CONFIG_AD986X=y
# CONFIG_I2C is not set
#
diff --git a/cleopatre/buildroot/target/device/Spidcom/scr310/linux26.config b/cleopatre/buildroot/target/device/Spidcom/scr310/linux26.config
index 6935ee89e6..6aeb4580e8 100644
--- a/cleopatre/buildroot/target/device/Spidcom/scr310/linux26.config
+++ b/cleopatre/buildroot/target/device/Spidcom/scr310/linux26.config
@@ -613,7 +613,7 @@ CONFIG_LEGACY_PTY_COUNT=16
# CONFIG_R3964 is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_TCG_TPM is not set
-CONFIG_AD9865=y
+CONFIG_AD986X=y
# CONFIG_I2C is not set
#
diff --git a/cleopatre/buildroot/target/device/Spidcom/spk300/linux26.config b/cleopatre/buildroot/target/device/Spidcom/spk300/linux26.config
index e11229713c..25eada6261 100644
--- a/cleopatre/buildroot/target/device/Spidcom/spk300/linux26.config
+++ b/cleopatre/buildroot/target/device/Spidcom/spk300/linux26.config
@@ -614,7 +614,7 @@ CONFIG_LEGACY_PTY_COUNT=16
# CONFIG_R3964 is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_TCG_TPM is not set
-CONFIG_AD9865=y
+CONFIG_AD986X=y
# CONFIG_I2C is not set
#
diff --git a/cleopatre/buildroot/target/device/Spidcom/spk300g/linux26.config b/cleopatre/buildroot/target/device/Spidcom/spk300g/linux26.config
index c530286606..c88b453c58 100644
--- a/cleopatre/buildroot/target/device/Spidcom/spk300g/linux26.config
+++ b/cleopatre/buildroot/target/device/Spidcom/spk300g/linux26.config
@@ -615,7 +615,7 @@ CONFIG_LEGACY_PTY_COUNT=16
# CONFIG_R3964 is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_TCG_TPM is not set
-CONFIG_AD9865=y
+CONFIG_AD986X=y
# CONFIG_I2C is not set
#
diff --git a/cleopatre/buildroot/target/device/Spidcom/spk310/linux26.config b/cleopatre/buildroot/target/device/Spidcom/spk310/linux26.config
index 5ac61e6e62..1490226525 100644
--- a/cleopatre/buildroot/target/device/Spidcom/spk310/linux26.config
+++ b/cleopatre/buildroot/target/device/Spidcom/spk310/linux26.config
@@ -613,7 +613,7 @@ CONFIG_LEGACY_PTY_COUNT=16
# CONFIG_R3964 is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_TCG_TPM is not set
-CONFIG_AD9865=y
+CONFIG_AD986X=y
# CONFIG_I2C is not set
#
diff --git a/cleopatre/buildroot/target/device/Spidcom/spr300/linux26.config b/cleopatre/buildroot/target/device/Spidcom/spr300/linux26.config
index 6e803e9d35..dc52faf7d1 100644
--- a/cleopatre/buildroot/target/device/Spidcom/spr300/linux26.config
+++ b/cleopatre/buildroot/target/device/Spidcom/spr300/linux26.config
@@ -614,7 +614,7 @@ CONFIG_LEGACY_PTY_COUNT=16
# CONFIG_R3964 is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_TCG_TPM is not set
-CONFIG_AD9865=y
+CONFIG_AD986X=y
# CONFIG_I2C is not set
#
diff --git a/cleopatre/buildroot/target/device/Spidcom/spr310/linux26.config b/cleopatre/buildroot/target/device/Spidcom/spr310/linux26.config
index ef7caf83b7..8376ab60fa 100644
--- a/cleopatre/buildroot/target/device/Spidcom/spr310/linux26.config
+++ b/cleopatre/buildroot/target/device/Spidcom/spr310/linux26.config
@@ -613,7 +613,7 @@ CONFIG_LEGACY_PTY_COUNT=16
# CONFIG_R3964 is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_TCG_TPM is not set
-CONFIG_AD9865=y
+CONFIG_AD986X=y
# CONFIG_I2C is not set
#
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-arizona.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-arizona.c
index 552ffa74bb..380864d5df 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-arizona.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-arizona.c
@@ -68,7 +68,7 @@ struct spc300_flash_spi_dev flash_chip __initdata = {
.nb_parts = ARRAY_SIZE(arizona_flash1_partitions),
};
struct spc300_afe_spi_dev afe_chip __initdata = {
- .name = "ad9865",
+ .name = "ad986x",
.cs = 1,
.speed = 6250000, //PCLK/4
.spimode = SPI_3WIRE|SPI_MODE_0,
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-scr310.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-scr310.c
index af80b2706d..9a5d4aff04 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-scr310.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-scr310.c
@@ -179,7 +179,7 @@ struct spc300_flash_spi_dev flash_chip __initdata = {
.nb_parts = ARRAY_SIZE(spc300_flash_partitions),
};
struct spc300_afe_spi_dev afe_chip __initdata = {
- .name = "ad9865",
+ .name = "ad986x",
.cs = 1,
.speed = 6250000, //PCLK/16
.spimode = SPI_3WIRE|SPI_MODE_0,
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk300.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk300.c
index d35a5556c2..584060a9e5 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk300.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk300.c
@@ -179,7 +179,7 @@ struct spc300_flash_spi_dev flash_chip __initdata = {
.nb_parts = ARRAY_SIZE(spc300_flash_partitions),
};
struct spc300_afe_spi_dev afe_chip __initdata = {
- .name = "ad9865",
+ .name = "ad986x",
.cs = 1,
.speed = 6250000, //PCLK/16
.spimode = SPI_3WIRE|SPI_MODE_0,
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk300g.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk300g.c
index 9dc976f6de..02d8a50e52 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk300g.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk300g.c
@@ -179,7 +179,7 @@ struct spc300_flash_spi_dev flash_chip __initdata = {
.nb_parts = ARRAY_SIZE(spc300_flash_partitions),
};
struct spc300_afe_spi_dev afe_chip __initdata = {
- .name = "ad9865",
+ .name = "ad986x",
.cs = 1,
.speed = 6250000, //PCLK/16
.spimode = SPI_3WIRE|SPI_MODE_0,
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk310.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk310.c
index f5be73cdb0..eb3e9a8dd4 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk310.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk310.c
@@ -179,7 +179,7 @@ struct spc300_flash_spi_dev flash_chip __initdata = {
.nb_parts = ARRAY_SIZE(spc300_flash_partitions),
};
struct spc300_afe_spi_dev afe_chip __initdata = {
- .name = "ad9865",
+ .name = "ad986x",
.cs = 1,
.speed = 6250000, //PCLK/16
.spimode = SPI_3WIRE|SPI_MODE_0,
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spr300.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spr300.c
index e1f7fbf82c..47075b2d6c 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spr300.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spr300.c
@@ -179,7 +179,7 @@ struct spc300_flash_spi_dev flash_chip __initdata = {
.nb_parts = ARRAY_SIZE(spc300_flash_partitions),
};
struct spc300_afe_spi_dev afe_chip __initdata = {
- .name = "ad9865",
+ .name = "ad986x",
.cs = 1,
.speed = 6250000, //PCLK/16
.spimode = SPI_3WIRE|SPI_MODE_0,
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spr310.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spr310.c
index 8bae9788a1..c6e7a293db 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spr310.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spr310.c
@@ -179,7 +179,7 @@ struct spc300_flash_spi_dev flash_chip __initdata = {
.nb_parts = ARRAY_SIZE(spc300_flash_partitions),
};
struct spc300_afe_spi_dev afe_chip __initdata = {
- .name = "ad9865",
+ .name = "ad986x",
.cs = 1,
.speed = 6250000, //PCLK/16
.spimode = SPI_3WIRE|SPI_MODE_0,
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-devices.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-devices.c
index cdd734599c..7da826d3ae 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-devices.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-devices.c
@@ -165,7 +165,7 @@ static struct spi_board_info spc300_spi_devices[] __initdata = {
.chip_select = 0,
},
{
- .modalias = "ad9865",
+ .modalias = "ad986x",
.max_speed_hz = 6250000, //PCLK/4
.mode = SPI_3WIRE|SPI_MODE_0,
.bus_num = 2,
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 01ef9f2f7a..bbe4628665 100644
--- a/cleopatre/linux-2.6.25.10-spc300/drivers/char/Kconfig
+++ b/cleopatre/linux-2.6.25.10-spc300/drivers/char/Kconfig
@@ -1049,11 +1049,11 @@ config DEVPORT
source "drivers/s390/char/Kconfig"
-config AD9865
- tristate "Support for AD9865 Analog Front End"
+config AD986X
+ tristate "Support for AD986X Analog Front End"
depends on SPI_MASTER
help
- This option enables support for the AD9865 Analog Font End devices
+ 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 4aedc43252..231255fd8b 100644
--- a/cleopatre/linux-2.6.25.10-spc300/drivers/char/Makefile
+++ b/cleopatre/linux-2.6.25.10-spc300/drivers/char/Makefile
@@ -112,7 +112,7 @@ obj-$(CONFIG_PS3_FLASH) += ps3flash.o
obj-$(CONFIG_JS_RTC) += js-rtc.o
js-rtc-y = rtc.o
-obj-$(CONFIG_AD9865) += ad9865.o
+obj-$(CONFIG_AD986X) += ad986x.o
# Files generated that shall be removed upon make clean
clean-files := consolemap_deftbl.c defkeymap.c
diff --git a/cleopatre/linux-2.6.25.10-spc300/drivers/char/ad9865.c b/cleopatre/linux-2.6.25.10-spc300/drivers/char/ad986x.c
index 8286601d1a..9df9196ccf 100644
--- a/cleopatre/linux-2.6.25.10-spc300/drivers/char/ad9865.c
+++ b/cleopatre/linux-2.6.25.10-spc300/drivers/char/ad986x.c
@@ -1,5 +1,5 @@
/*
- * Driver for Analog Front End AD9865 devices family
+ * Driver for Analog Front End AD986x devices family
*
* (C) Copyright 2009 SPiDCOM Technologies
*
@@ -30,21 +30,21 @@
#include <linux/spi/spi.h>
#include <linux/afe.h>
-static int ad9865_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg);
+static int ad986x_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg);
/** Misc device structures */
-static const struct file_operations ad9865_fops = {
+static const struct file_operations ad986x_fops = {
.owner = THIS_MODULE,
- .ioctl = ad9865_ioctl,
+ .ioctl = ad986x_ioctl,
};
-static struct miscdevice ad9865_miscdev = {
+static struct miscdevice ad986x_miscdev = {
.minor = AFE_MINOR,
- .name = "ad9865",
- .fops = &ad9865_fops,
+ .name = "ad986x",
+ .fops = &ad986x_fops,
};
/**
- * IOCTL commands for AD9865 device.
+ * IOCTL commands for AD986X device.
*
* \param inode inode structure.
* \param file user exchange structure.
@@ -52,7 +52,7 @@ static struct miscdevice ad9865_miscdev = {
* \param arg arguments.
* \return error code.
*/
-static int ad9865_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+static int ad986x_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
{
void __user *argp = (void __user *)arg;
struct spi_device *spi;
@@ -60,9 +60,9 @@ static int ad9865_ioctl(struct inode *inode, struct file *file, unsigned int cmd
uint8_t command[2];
//Find SPI structure pointer
- if(ad9865_miscdev.parent)
+ if(ad986x_miscdev.parent)
{
- spi = container_of(ad9865_miscdev.parent, struct spi_device, dev);
+ spi = container_of(ad986x_miscdev.parent, struct spi_device, dev);
if(spi == NULL)
{
return -EINVAL;
@@ -122,7 +122,7 @@ static int ad9865_ioctl(struct inode *inode, struct file *file, unsigned int cmd
* \param spi spi device structure.
* \return error code.
*/
-static int __devinit ad9865_probe(struct spi_device *spi)
+static int __devinit ad986x_probe(struct spi_device *spi)
{
int res;
@@ -134,12 +134,12 @@ static int __devinit ad9865_probe(struct spi_device *spi)
spi->bits_per_word = 8;
//Check if someone has already register it
- if(ad9865_miscdev.parent)
+ if(ad986x_miscdev.parent)
return -EBUSY;
- ad9865_miscdev.parent = &spi->dev;
+ ad986x_miscdev.parent = &spi->dev;
//Register a Misc device for ioctl management
- if((res = misc_register(&ad9865_miscdev)) != 0)
+ if((res = misc_register(&ad986x_miscdev)) != 0)
return res;
dev_info(&spi->dev, "AFE Driver enabled\n");
@@ -152,55 +152,55 @@ static int __devinit ad9865_probe(struct spi_device *spi)
* \param spi spi device structure.
* \return error code.
*/
-static int __devexit ad9865_remove(struct spi_device *spi)
+static int __devexit ad986x_remove(struct spi_device *spi)
{
int res;
//Unregister Misc device
- res = misc_deregister(&ad9865_miscdev);
+ res = misc_deregister(&ad986x_miscdev);
if(!res)
- ad9865_miscdev.parent = NULL;
+ ad986x_miscdev.parent = NULL;
return res;
}
/** Module structure */
-static struct spi_driver ad9865_driver = {
+static struct spi_driver ad986x_driver = {
.driver = {
- .name = "ad9865",
+ .name = "ad986x",
.bus = &spi_bus_type,
.owner = THIS_MODULE,
},
- .probe = ad9865_probe,
+ .probe = ad986x_probe,
.suspend = NULL,
.resume = NULL,
- .remove = __devexit_p(ad9865_remove),
+ .remove = __devexit_p(ad986x_remove),
};
/**
* Module initialization.
* \return error code.
*/
-static int ad9865_init(void)
+static int ad986x_init(void)
{
- //AD9865 is driven by SPI
- return spi_register_driver(&ad9865_driver);
+ //AD986x is driven by SPI
+ return spi_register_driver(&ad986x_driver);
}
/**
* Module uninitialization.
* \return error code.
*/
-static void ad9865_exit(void)
+static void ad986x_exit(void)
{
- spi_unregister_driver(&ad9865_driver);
+ spi_unregister_driver(&ad986x_driver);
}
-module_init(ad9865_init);
-module_exit(ad9865_exit);
+module_init(ad986x_init);
+module_exit(ad986x_exit);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("SPiDCOM Technologies");
-MODULE_DESCRIPTION("SPI driver for AD9865 chips family");
+MODULE_DESCRIPTION("SPI driver for AD986X chips family");
MODULE_ALIAS_MISCDEV(AFE_MINOR);