xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc: rename immap_86xx.h to fsl_guts.h, and add 85xx support

Browse Source 
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>
This commit is contained in:
Timur Tabi
2010-07-22 11:33:30 -05:00
committed by Liam Girdwood
parent f51582fd8d
commit 6e6f66226f
3 changed files with 81 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sound/soc/fsl/mpc8610_hpcd.c
View File

@@ -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;