diff options
| author | Fabio Baltieri <fabio.baltieri@linaro.org> | 2013-05-24 12:39:20 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-25 21:58:35 +0200 |
| commit | f82030f978ae21ee790a90610ff21ce72667958e (patch) | |
| tree | a3fc632e56eee09ee44d02b705d61fed4eb714e8 /sound/soc/ux500 | |
| parent | ASoC: ux500: Add missing mop500_ab8500.h include (diff) | |
| download | linux-f82030f978ae21ee790a90610ff21ce72667958e.tar.xz linux-f82030f978ae21ee790a90610ff21ce72667958e.zip | |
ASoC: ux500: Drop redundant msp id enumerations
Ux500 has two equivalent enum for device id, one in platform_data and
one in a local header. Fix this by dropping the local one.
Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/ux500')
| -rw-r--r-- | sound/soc/ux500/ux500_msp_i2s.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/soc/ux500/ux500_msp_i2s.h b/sound/soc/ux500/ux500_msp_i2s.h index d5e41763c9c7..189a3751993b 100644 --- a/sound/soc/ux500/ux500_msp_i2s.h +++ b/sound/soc/ux500/ux500_msp_i2s.h @@ -16,6 +16,7 @@ #define UX500_MSP_I2S_H #include <linux/platform_device.h> +#include <linux/platform_data/asoc-ux500-msp.h> #define MSP_INPUT_FREQ_APB 48000000 @@ -365,13 +366,6 @@ enum msp_protocol { */ #define MAX_MSP_BACKUP_REGS 36 -enum enum_i2s_controller { - MSP_0_I2S_CONTROLLER = 0, - MSP_1_I2S_CONTROLLER, - MSP_2_I2S_CONTROLLER, - MSP_3_I2S_CONTROLLER, -}; - enum i2s_direction_t { MSP_DIR_TX = 0x01, MSP_DIR_RX = 0x02, @@ -475,7 +469,7 @@ struct ux500_msp_config { }; struct ux500_msp { - enum enum_i2s_controller id; + enum msp_i2s_id id; void __iomem *registers; struct device *dev; struct stedma40_chan_cfg *dma_cfg_rx; |