ASoC: Merge AT91 and AVR32 support into a single atmel architecture

The Ateml AT91 and AVR32 SoC share common IP for audio and can share the
same driver code using the atmel-ssc API provided for both architectures.
Do this, creating a new unified atmel ASoC architecture to replace the
previous at32 and at91 ones.

[This was contributed as a patch series for reviewability but has been
squashed down to a single commit to help preserve both the history and
bisectability.  A small bugfix from Jukka is included.]

Tested-by: Jukka Hynninen <ext-jukka.hynninen@vaisala.com>
Signed-off-by: Sedji Gaouaou <sedji.gaouaou@atmel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 0 insertions, 59 deletions

diff --git a/sound/soc/at32/at32-ssc.h b/sound/soc/at32/at32-ssc.h
deleted file mode 100644
index 3c052dbbe460..000000000000
--- a/sound/soc/at32/at32-ssc.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* sound/soc/at32/at32-ssc.h
- * ASoC SSC interface for Atmel AT32 SoC
- *
- * Copyright (C) 2008 Long Range Systems
- *    Geoffrey Wossum <gwossum@acm.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __SOUND_SOC_AT32_AT32_SSC_H
-#define __SOUND_SOC_AT32_AT32_SSC_H __FILE__
-
-#include <linux/types.h>
-#include <linux/atmel-ssc.h>
-
-#include "at32-pcm.h"
-
-
-
-struct at32_ssc_state {
-        u32 ssc_cmr;
-        u32 ssc_rcmr;
-        u32 ssc_rfmr;
-        u32 ssc_tcmr;
-        u32 ssc_tfmr;
-        u32 ssc_sr;
-        u32 ssc_imr;
-};
-
-
-
-struct at32_ssc_info {
-        char *name;
-        struct ssc_device *ssc;
-        spinlock_t lock;        /* lock for dir_mask */
-        unsigned short dir_mask;        /* 0=unused, 1=playback, 2=capture */
-        unsigned short initialized;     /* true if SSC has been initialized */
-        unsigned short daifmt;
-        unsigned short cmr_div;
-        unsigned short tcmr_period;
-        unsigned short rcmr_period;
-        struct at32_pcm_dma_params *dma_params[2];
-        struct at32_ssc_state ssc_state;
-};
-
-
-/* SSC divider ids */
-#define AT32_SSC_CMR_DIV        0       /* MCK divider for BCLK */
-#define AT32_SSC_TCMR_PERIOD    1       /* BCLK divider for transmit FS */
-#define AT32_SSC_RCMR_PERIOD    2       /* BCLK divider for receive FS */
-
-
-extern struct snd_soc_dai at32_ssc_dai[];
-
-
-
-#endif /* __SOUND_SOC_AT32_AT32_SSC_H */