summaryrefslogtreecommitdiffstats
path: root/sound/soc/fsl
diff options
context:
space:
mode:
authorTimur Tabi <timur@freescale.com>2010-07-22 11:33:30 -0500
committerLiam Girdwood <lrg@slimlogic.co.uk>2010-08-12 14:00:15 +0100
commit6e6f66226f0092a39526f8d6f02ebb447d995be2 (patch)
tree99c9e44bd0e2a7c3b3805463b9f00864ae5af37f /sound/soc/fsl
parentf51582fd8d9b1196d58cd94c2b4b759cc1baf57a (diff)
powerpc: rename immap_86xx.h to fsl_guts.h, and add 85xx support
The immap_86xx.h header file only defines one data structure: the "global utilities" register set found on Freescale PowerPC SOCs. Rename this file to fsl_guts.h to reflect its true purpose, and extend it to cover the "GUTS" register set on 85xx chips. Signed-off-by: Timur Tabi <timur@freescale.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/fsl')
-rw-r--r--sound/soc/fsl/fsl_ssi.c2
-rw-r--r--sound/soc/fsl/mpc8610_hpcd.c10
2 files changed, 5 insertions, 7 deletions
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 64f65910a7d..51b089f9751 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -24,8 +24,6 @@
#include <sound/initval.h>
#include <sound/soc.h>
-#include <asm/immap_86xx.h>
-
#include "fsl_ssi.h"
/**
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
index 5ba823213ab..38339c158ed 100644
--- a/sound/soc/fsl/mpc8610_hpcd.c
+++ b/sound/soc/fsl/mpc8610_hpcd.c
@@ -14,7 +14,7 @@
#include <linux/interrupt.h>
#include <linux/of_device.h>
#include <sound/soc.h>
-#include <asm/immap_86xx.h>
+#include <asm/fsl_guts.h>
#include "fsl_dma.h"
#include "fsl_ssi.h"
@@ -57,9 +57,9 @@ static int mpc8610_hpcd_machine_probe(struct platform_device *sound_device)
struct snd_soc_card *card = platform_get_drvdata(sound_device);
struct mpc8610_hpcd_data *machine_data =
container_of(card, struct mpc8610_hpcd_data, card);
- struct ccsr_guts __iomem *guts;
+ struct ccsr_guts_86xx __iomem *guts;
- guts = ioremap(guts_phys, sizeof(struct ccsr_guts));
+ guts = ioremap(guts_phys, sizeof(struct ccsr_guts_86xx));
if (!guts) {
dev_err(card->dev, "could not map global utilities\n");
return -ENOMEM;
@@ -142,9 +142,9 @@ static int mpc8610_hpcd_machine_remove(struct platform_device *sound_device)
struct snd_soc_card *card = platform_get_drvdata(sound_device);
struct mpc8610_hpcd_data *machine_data =
container_of(card, struct mpc8610_hpcd_data, card);
- struct ccsr_guts __iomem *guts;
+ struct ccsr_guts_86xx __iomem *guts;
- guts = ioremap(guts_phys, sizeof(struct ccsr_guts));
+ guts = ioremap(guts_phys, sizeof(struct ccsr_guts_86xx));
if (!guts) {
dev_err(card->dev, "could not map global utilities\n");
return -ENOMEM;