summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe SAVE2012-08-31 05:30:10 +0200
committerCyril Jourdan2012-09-20 16:56:22 +0200
commit6e4d7731e0e58c25f3de91515b3ebddf348ffdc2 (patch)
tree6d7ddffb798754c729de6f11aee2cffd4e413664
parent0956f9efc80c66d02256d606e96ab69af08f164d (diff)
cleo/linux/drivers/afe: do not use ad986x afe on mse500, refs #3318
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/mse500/linux26.config2
-rw-r--r--cleopatre/devkit/plcdrv/src/plcdrv.c4
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-mse500.c8
3 files changed, 5 insertions, 9 deletions
diff --git a/cleopatre/buildroot/target/device/Spidcom/mse500/linux26.config b/cleopatre/buildroot/target/device/Spidcom/mse500/linux26.config
index 68ca3a3a1f..aaf3ebee93 100644
--- a/cleopatre/buildroot/target/device/Spidcom/mse500/linux26.config
+++ b/cleopatre/buildroot/target/device/Spidcom/mse500/linux26.config
@@ -743,7 +743,7 @@ CONFIG_DUMMY_CONSOLE=y
CONFIG_RTC_LIB=y
# CONFIG_RTC_CLASS is not set
CONFIG_AFE=y
-CONFIG_AFE_AD986X=y
+# CONFIG_AFE_AD986X is not set
#
# File systems
diff --git a/cleopatre/devkit/plcdrv/src/plcdrv.c b/cleopatre/devkit/plcdrv/src/plcdrv.c
index 67466f2439..9157a258c8 100644
--- a/cleopatre/devkit/plcdrv/src/plcdrv.c
+++ b/cleopatre/devkit/plcdrv/src/plcdrv.c
@@ -102,7 +102,7 @@ static int
plcdrv_config_afe (const struct net_device *dev)
{
struct afe *afe;
- int ret;
+ int ret = 0;
afe = afe_get ();
if (afe == NULL)
@@ -111,6 +111,7 @@ plcdrv_config_afe (const struct net_device *dev)
return -EFAULT;
}
+#ifdef CONFIG_AFE_AD986X
#ifdef CONFIG_MACH_ARIZONA
ret = afe_write (afe, 0x03, 0x04)
|| afe_write (afe, 0x04, 0x35)
@@ -130,6 +131,7 @@ plcdrv_config_afe (const struct net_device *dev)
|| afe_write (afe, 0x0E, 0x08)
|| afe_write (afe, 0x03, 0xF8);
#endif
+#endif
if (ret)
printk (KERN_ERR "%s: error while configuring the AFE.\n", dev->name);
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-mse500.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-mse500.c
index 77fbd27786..a201ffb00d 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-mse500.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-mse500.c
@@ -178,12 +178,6 @@ struct spc300_flash_spi_dev flash_chip __initdata = {
.parts = spc300_flash_partitions,
.nb_parts = ARRAY_SIZE(spc300_flash_partitions),
};
-struct spc300_afe_spi_dev afe_chip __initdata = {
- .name = "ad986x",
- .cs = 1,
- .speed = 6250000,
- .spimode = SPI_3WIRE|SPI_MODE_0,
-};
/**
* Initialize SPC300 DINI GIC.
@@ -223,7 +217,7 @@ static void __init mse500_init(void)
spc300_init();
spc300_add_device_uart0();
spc300_add_device_uart1();
- spc300_add_device_spidevs(&flash_chip, &afe_chip);
+ spc300_add_device_spidevs(&flash_chip, NULL);
spc300_add_device_spictrl();
spc300_add_device_ethernet();
spc300_add_device_gpio();