diff options
Diffstat (limited to 'sound/soc/fsl/p1022_ds.c')
-rw-r--r-- | sound/soc/fsl/p1022_ds.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c index 202298556ba7..50adf4032bcc 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 | */ |
49 | static inline void guts_set_dmuxcr(struct ccsr_guts_85xx __iomem *guts, | 49 | static 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)); |
@@ -87,9 +87,9 @@ static int p1022_ds_machine_probe(struct snd_soc_card *card) | |||
87 | { | 87 | { |
88 | struct machine_data *mdata = | 88 | struct machine_data *mdata = |
89 | container_of(card, struct machine_data, card); | 89 | container_of(card, struct machine_data, card); |
90 | struct ccsr_guts_85xx __iomem *guts; | 90 | struct ccsr_guts __iomem *guts; |
91 | 91 | ||
92 | guts = ioremap(guts_phys, sizeof(struct ccsr_guts_85xx)); | 92 | guts = ioremap(guts_phys, sizeof(struct ccsr_guts)); |
93 | if (!guts) { | 93 | if (!guts) { |
94 | dev_err(card->dev, "could not map global utilities\n"); | 94 | dev_err(card->dev, "could not map global utilities\n"); |
95 | return -ENOMEM; | 95 | return -ENOMEM; |
@@ -161,9 +161,9 @@ static int p1022_ds_machine_remove(struct snd_soc_card *card) | |||
161 | { | 161 | { |
162 | struct machine_data *mdata = | 162 | struct machine_data *mdata = |
163 | container_of(card, struct machine_data, card); | 163 | container_of(card, struct machine_data, card); |
164 | struct ccsr_guts_85xx __iomem *guts; | 164 | struct ccsr_guts __iomem *guts; |
165 | 165 | ||
166 | guts = ioremap(guts_phys, sizeof(struct ccsr_guts_85xx)); | 166 | guts = ioremap(guts_phys, sizeof(struct ccsr_guts)); |
167 | if (!guts) { | 167 | if (!guts) { |
168 | dev_err(card->dev, "could not map global utilities\n"); | 168 | dev_err(card->dev, "could not map global utilities\n"); |
169 | return -ENOMEM; | 169 | return -ENOMEM; |