From: Marcus Cooper <[email protected]>
Signed-off-by: Marcus Cooper <[email protected]>
---
sound/soc/sunxi/spdif/sunxi_spdif.c | 2 --
sound/soc/sunxi/spdif/sunxi_spdif.h | 27 ++++-----------------------
2 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/sound/soc/sunxi/spdif/sunxi_spdif.c
b/sound/soc/sunxi/spdif/sunxi_spdif.c
index 3066d24..103113b 100644
--- a/sound/soc/sunxi/spdif/sunxi_spdif.c
+++ b/sound/soc/sunxi/spdif/sunxi_spdif.c
@@ -553,8 +553,6 @@ static int __devinit sunxi_spdif_dev_probe(struct
platform_device *pdev)
ret = snd_soc_register_dai(&pdev->dev, &sunxi_spdif_dai);
- iounmap(sunxi_spdif.ioregs);
-
return 0;
}
diff --git a/sound/soc/sunxi/spdif/sunxi_spdif.h
b/sound/soc/sunxi/spdif/sunxi_spdif.h
index 67955d8..de1dc06 100644
--- a/sound/soc/sunxi/spdif/sunxi_spdif.h
+++ b/sound/soc/sunxi/spdif/sunxi_spdif.h
@@ -124,31 +124,12 @@
#define SUNXI_SPDIF_RXCHSTA1_SAMWORDLEN(v) ((v)<<1)
#define SUNXI_SPDIF_RXCHSTA1_MAXWORDLEN (1<<0)
-/*--------------------------------CCM register
definition---------------------*/
-#define SUNXI_CCMBASE (0x01C20000)
-
-#define SUNXI_CCMBASE_AUDIOHOSCPLL (0x08)
- #define SUNXI_CCMBASE_AUDIOHOSCPLL_EN (1<<31)
- #define SUNXI_CCMBASE_AUDIOHOSCPLL_24576M (1<<27)
- #define SUNXI_CCMBASE_AUDIOHOSCPLL_225792M (0<<27)
-
-#define SUNXI_CCMBASE_APBGATE (0x68)
- #define SUNXI_CCMBASE_APBGATE_SPDIFGATE (1<<1)
-
-#define SUNXI_CCMBASE_AUDIOCLK (0xC0)
- #define SUNXI_CCMBASE_AUDIOCLK_SPDIFSPEGATE (1<<31)
- #define SUNXI_CCMBASE_AUDIOCLK_DIV(v) ((v)<<16)
-
- /* Clock dividers */
- #define SUNXI_DIV_MCLK 0
- #define SUNXI_DIV_BCLK 1
-
+/* Clock dividers */
+#define SUNXI_DIV_MCLK 0
+#define SUNXI_DIV_BCLK 1
struct sunxi_spdif_info {
- void __iomem *regs; /* IIS BASE */
- void __iomem *ccmregs; //CCM BASE
- void __iomem *ioregs; //IO BASE
-
+ void __iomem *regs; /* SPDIF BASE */
};
extern struct sunxi_spdif_info sunxi_spdif;
--
1.9.1
--
You received this message because you are subscribed to the Google Groups
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
