Merge target/arm/as3525/as3525-codec.h into target/arm/ascodec-target.h

The AMS Sansa use the same AS3514 registers (except USB_UTIL which was added)
Use the register defines in AMS Sansa code instead of hardcoded values

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19073 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 2 insertions, 4 deletions

diff --git a/firmware/target/arm/as3525/as3525-codec.c b/firmware/target/arm/as3525/as3525-codec.c
index 76e5071197..4d8598eaf1 100644
--- a/firmware/target/arm/as3525/as3525-codec.c
+++ b/firmware/target/arm/as3525/as3525-codec.c
@@ -37,11 +37,9 @@
     interrupt bit 7 is raised and DACNT is not decremented after the transfer.
  */
 
-#include "as3525-codec.h"
+#include "ascodec-target.h"
 #include "as3525.h"
 
-#define AUDIO_I2C_ADDR  0x46
-
 #define I2C2_DATA       *((volatile unsigned int *)(I2C_AUDIO_BASE + 0x00))
 #define I2C2_SLAD0      *((volatile unsigned int *)(I2C_AUDIO_BASE + 0x04))
 #define I2C2_CNTRL      *((volatile unsigned int *)(I2C_AUDIO_BASE + 0x0C))
@@ -72,7 +70,7 @@ void ascodec_init(void)
     I2C2_CPSR1 = 0;     /* MSB */    
     
     /* set i2c slave address of codec part */
-    I2C2_SLAD0 = AUDIO_I2C_ADDR << 1;
+    I2C2_SLAD0 = AS3514_I2C_ADDR << 1;
 
     I2C2_CNTRL = 0x51;
 }