aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/fsl/p1022_ds.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/fsl/p1022_ds.c')
-rw-r--r--sound/soc/fsl/p1022_ds.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c
index 46623405a2ce..982a1c944983 100644
--- a/sound/soc/fsl/p1022_ds.c
+++ b/sound/soc/fsl/p1022_ds.c
@@ -46,7 +46,7 @@
46 * ch: The channel on the DMA controller (0, 1, 2, or 3) 46 * ch: The channel on the DMA controller (0, 1, 2, or 3)
47 * device: The device to set as the target (CCSR_GUTS_DMUXCR_xxx) 47 * device: The device to set as the target (CCSR_GUTS_DMUXCR_xxx)
48 */ 48 */
49static inline void guts_set_dmuxcr(struct ccsr_guts_85xx __iomem *guts, 49static inline void guts_set_dmuxcr(struct ccsr_guts __iomem *guts,
50 unsigned int co, unsigned int ch, unsigned int device) 50 unsigned int co, unsigned int ch, unsigned int device)
51{ 51{
52 unsigned int shift = 16 + (8 * (1 - co) + 2 * (3 - ch)); 52 unsigned int shift = 16 + (8 * (1 - co) + 2 * (3 - ch));
@@ -90,9 +90,9 @@ static int p1022_ds_machine_probe(struct snd_soc_card *card)
90{ 90{
91 struct machine_data *mdata = 91 struct machine_data *mdata =
92 container_of(card, struct machine_data, card); 92 container_of(card, struct machine_data, card);
93 struct ccsr_guts_85xx __iomem *guts; 93 struct ccsr_guts __iomem *guts;
94 94
95 guts = ioremap(guts_phys, sizeof(struct ccsr_guts_85xx)); 95 guts = ioremap(guts_phys, sizeof(struct ccsr_guts));
96 if (!guts) { 96 if (!guts) {
97 dev_err(card->dev, "could not map global utilities\n"); 97 dev_err(card->dev, "could not map global utilities\n");
98 return -ENOMEM; 98 return -ENOMEM;
@@ -164,9 +164,9 @@ static int p1022_ds_machine_remove(struct snd_soc_card *card)
164{ 164{
165 struct machine_data *mdata = 165 struct machine_data *mdata =
166 container_of(card, struct machine_data, card); 166 container_of(card, struct machine_data, card);
167 struct ccsr_guts_85xx __iomem *guts; 167 struct ccsr_guts __iomem *guts;
168 168
169 guts = ioremap(guts_phys, sizeof(struct ccsr_guts_85xx)); 169 guts = ioremap(guts_phys, sizeof(struct ccsr_guts));
170 if (!guts) { 170 if (!guts) {
171 dev_err(card->dev, "could not map global utilities\n"); 171 dev_err(card->dev, "could not map global utilities\n");
172 return -ENOMEM; 172 return -ENOMEM;