diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-04-01 23:57:46 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-04-01 23:57:46 -0400 |
| commit | e31c6dfa8eb23ec7b3350b95ffe92f5a962d8c6b (patch) | |
| tree | e897997d1844a712391772444817abc12d2bc3d6 /sound | |
| parent | dd775ae2549217d3ae09363e3edb305d0fa19928 (diff) | |
| parent | fa1b42b45a9c96da77f3ddabf715f49525a87209 (diff) | |
Merge remote-tracking branch 'kumar/next' into merge
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/fsl/mpc8610_hpcd.c | 8 | ||||
| -rw-r--r-- | sound/soc/fsl/p1022_ds.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c index afbabf427f27..3fea5a15ffe8 100644 --- a/sound/soc/fsl/mpc8610_hpcd.c +++ b/sound/soc/fsl/mpc8610_hpcd.c | |||
| @@ -58,9 +58,9 @@ static int mpc8610_hpcd_machine_probe(struct snd_soc_card *card) | |||
| 58 | { | 58 | { |
| 59 | struct mpc8610_hpcd_data *machine_data = | 59 | struct mpc8610_hpcd_data *machine_data = |
| 60 | container_of(card, struct mpc8610_hpcd_data, card); | 60 | container_of(card, struct mpc8610_hpcd_data, card); |
| 61 | struct ccsr_guts_86xx __iomem *guts; | 61 | struct ccsr_guts __iomem *guts; |
| 62 | 62 | ||
| 63 | guts = ioremap(guts_phys, sizeof(struct ccsr_guts_86xx)); | 63 | guts = ioremap(guts_phys, sizeof(struct ccsr_guts)); |
| 64 | if (!guts) { | 64 | if (!guts) { |
| 65 | dev_err(card->dev, "could not map global utilities\n"); | 65 | dev_err(card->dev, "could not map global utilities\n"); |
| 66 | return -ENOMEM; | 66 | return -ENOMEM; |
| @@ -142,9 +142,9 @@ static int mpc8610_hpcd_machine_remove(struct snd_soc_card *card) | |||
| 142 | { | 142 | { |
| 143 | struct mpc8610_hpcd_data *machine_data = | 143 | struct mpc8610_hpcd_data *machine_data = |
| 144 | container_of(card, struct mpc8610_hpcd_data, card); | 144 | container_of(card, struct mpc8610_hpcd_data, card); |
| 145 | struct ccsr_guts_86xx __iomem *guts; | 145 | struct ccsr_guts __iomem *guts; |
| 146 | 146 | ||
| 147 | guts = ioremap(guts_phys, sizeof(struct ccsr_guts_86xx)); | 147 | guts = ioremap(guts_phys, sizeof(struct ccsr_guts)); |
| 148 | if (!guts) { | 148 | if (!guts) { |
| 149 | dev_err(card->dev, "could not map global utilities\n"); | 149 | dev_err(card->dev, "could not map global utilities\n"); |
| 150 | return -ENOMEM; | 150 | return -ENOMEM; |
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 | */ |
| 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)); |
| @@ -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; |