From: Marcus Cooper <[email protected]>
Signed-off-by: Marcus Cooper <[email protected]>
---
arch/arm/mach-sun4i/clock/ccmu/ccm_mod_clk.c | 18 +++++++++---------
arch/arm/mach-sun4i/include/mach/aw_ccu.h | 2 +-
drivers/video/sunxi/disp/OSAL_Clock.c | 2 +-
drivers/video/sunxi/disp/OSAL_Clock.h | 2 +-
sound/soc/sunxi/i2s/sunxi-i2s.c | 2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/arm/mach-sun4i/clock/ccmu/ccm_mod_clk.c
b/arch/arm/mach-sun4i/clock/ccmu/ccm_mod_clk.c
index a7cd6bf..2603754 100644
--- a/arch/arm/mach-sun4i/clock/ccmu/ccm_mod_clk.c
+++ b/arch/arm/mach-sun4i/clock/ccmu/ccm_mod_clk.c
@@ -49,7 +49,7 @@ static __aw_ccu_clk_t aw_ccu_mod_clk[] =
make_mod_clk_inf(AW_MOD_CLK_PATA , "pata" ),
make_mod_clk_inf(AW_MOD_CLK_IR0 , "ir0" ),
make_mod_clk_inf(AW_MOD_CLK_IR1 , "ir1" ),
- make_mod_clk_inf(AW_MOD_CLK_I2S , "i2s" ),
+ make_mod_clk_inf(AW_MOD_CLK_I2S0 , "i2s0" ),
make_mod_clk_inf(AW_MOD_CLK_AC97 , "ac97" ),
make_mod_clk_inf(AW_MOD_CLK_SPDIF , "spdif" ),
make_mod_clk_inf(AW_MOD_CLK_KEYPAD , "key_pad" ),
@@ -367,7 +367,7 @@ static __aw_ccu_sys_clk_e
mod_clk_get_parent(__aw_ccu_mod_clk_e id)
return _parse_module0_clk_src(&aw_ccu_reg->Ir0Clk);
case AW_MOD_CLK_IR1:
return _parse_module0_clk_src(&aw_ccu_reg->Ir1Clk);
- case AW_MOD_CLK_I2S:
+ case AW_MOD_CLK_I2S0:
return AW_SYS_CLK_PLL2;
case AW_MOD_CLK_AC97:
return AW_SYS_CLK_PLL2;
@@ -656,7 +656,7 @@ static __aw_ccu_clk_onff_e
mod_clk_get_status(__aw_ccu_mod_clk_e id)
return _get_module0_clk_status(&aw_ccu_reg->Ir0Clk);
case AW_MOD_CLK_IR1:
return _get_module0_clk_status(&aw_ccu_reg->Ir1Clk);
- case AW_MOD_CLK_I2S:
+ case AW_MOD_CLK_I2S0:
return aw_ccu_reg->I2sClk.SpecClkGate? AW_CCU_CLK_ON :
AW_CCU_CLK_OFF;
case AW_MOD_CLK_AC97:
return aw_ccu_reg->Ac97Clk.SpecClkGate? AW_CCU_CLK_ON :
AW_CCU_CLK_OFF;
@@ -953,7 +953,7 @@ static __s64 mod_clk_get_rate(__aw_ccu_mod_clk_e id)
return _get_module0_clk_rate(&aw_ccu_reg->Ir0Clk);
case AW_MOD_CLK_IR1:
return _get_module0_clk_rate(&aw_ccu_reg->Ir1Clk);
- case AW_MOD_CLK_I2S:
+ case AW_MOD_CLK_I2S0:
return (1 << aw_ccu_reg->I2sClk.ClkDiv);
case AW_MOD_CLK_AC97:
return (1 << aw_ccu_reg->Ac97Clk.ClkDiv);
@@ -1054,7 +1054,7 @@ static __aw_ccu_clk_reset_e
mod_clk_get_reset(__aw_ccu_mod_clk_e id)
case AW_MOD_CLK_PATA:
case AW_MOD_CLK_IR0:
case AW_MOD_CLK_IR1:
- case AW_MOD_CLK_I2S:
+ case AW_MOD_CLK_I2S0:
case AW_MOD_CLK_AC97:
case AW_MOD_CLK_SPDIF:
case AW_MOD_CLK_KEYPAD:
@@ -1166,7 +1166,7 @@ static __s32 mod_clk_set_parent(__aw_ccu_mod_clk_e id,
__aw_ccu_sys_clk_e parent
return _set_module0_clk_src(&aw_ccu_reg->Ir0Clk, parent);
case AW_MOD_CLK_IR1:
return _set_module0_clk_src(&aw_ccu_reg->Ir1Clk, parent);
- case AW_MOD_CLK_I2S:
+ case AW_MOD_CLK_I2S0:
return (parent == AW_SYS_CLK_PLL2)? 0 : -1;
case AW_MOD_CLK_AC97:
return (parent == AW_SYS_CLK_PLL2)? 0 : -1;
@@ -1539,7 +1539,7 @@ static __s32 mod_clk_set_status(__aw_ccu_mod_clk_e id,
__aw_ccu_clk_onff_e statu
return _set_module0_clk_status(&aw_ccu_reg->Ir0Clk, status);
case AW_MOD_CLK_IR1:
return _set_module0_clk_status(&aw_ccu_reg->Ir1Clk, status);
- case AW_MOD_CLK_I2S:
+ case AW_MOD_CLK_I2S0:
aw_ccu_reg->I2sClk.SpecClkGate = (status == AW_CCU_CLK_OFF)? 0 : 1;
return 0;
case AW_MOD_CLK_AC97:
@@ -1962,7 +1962,7 @@ static __s32 mod_clk_set_rate(__aw_ccu_mod_clk_e id,
__s64 rate)
return _set_module0_clk_rate(&aw_ccu_reg->Ir0Clk, rate);
case AW_MOD_CLK_IR1:
return _set_module0_clk_rate(&aw_ccu_reg->Ir1Clk, rate);
- case AW_MOD_CLK_I2S:
+ case AW_MOD_CLK_I2S0:
{
switch(rate)
{
@@ -2272,7 +2272,7 @@ static __s32 mod_clk_set_reset(__aw_ccu_mod_clk_e id,
__aw_ccu_clk_reset_e reset
case AW_MOD_CLK_PATA:
case AW_MOD_CLK_IR0:
case AW_MOD_CLK_IR1:
- case AW_MOD_CLK_I2S:
+ case AW_MOD_CLK_I2S0:
case AW_MOD_CLK_AC97:
case AW_MOD_CLK_SPDIF:
case AW_MOD_CLK_KEYPAD:
diff --git a/arch/arm/mach-sun4i/include/mach/aw_ccu.h
b/arch/arm/mach-sun4i/include/mach/aw_ccu.h
index 98bfe80..2e67703 100644
--- a/arch/arm/mach-sun4i/include/mach/aw_ccu.h
+++ b/arch/arm/mach-sun4i/include/mach/aw_ccu.h
@@ -117,7 +117,7 @@ typedef enum __AW_CCU_MOD_CLK
AW_MOD_CLK_PATA, /* "pata" */
AW_MOD_CLK_IR0, /* "ir0" */
AW_MOD_CLK_IR1, /* "ir1" */
- AW_MOD_CLK_I2S, /* "i2s" */
+ AW_MOD_CLK_I2S0, /* "i2s" */
AW_MOD_CLK_AC97, /* "ac97" */
AW_MOD_CLK_SPDIF, /* "spdif" */
AW_MOD_CLK_KEYPAD, /* "key_pad" */
diff --git a/drivers/video/sunxi/disp/OSAL_Clock.c
b/drivers/video/sunxi/disp/OSAL_Clock.c
index 50aee4b..a0b5530 100644
--- a/drivers/video/sunxi/disp/OSAL_Clock.c
+++ b/drivers/video/sunxi/disp/OSAL_Clock.c
@@ -67,7 +67,7 @@ static char *_modClkName[AW_MOD_CLK_CNT] = {
"pata",
"ir0",
"ir1",
- "i2s",
+ "i2s0",
"ac97",
"spdif",
"key_pad",
diff --git a/drivers/video/sunxi/disp/OSAL_Clock.h
b/drivers/video/sunxi/disp/OSAL_Clock.h
index f370100..5a157fc 100644
--- a/drivers/video/sunxi/disp/OSAL_Clock.h
+++ b/drivers/video/sunxi/disp/OSAL_Clock.h
@@ -81,7 +81,7 @@ enum {
AW_MOD_CLK_PATA, /* "pata" */
AW_MOD_CLK_IR0, /* "ir0" */
AW_MOD_CLK_IR1, /* "ir1" */
- AW_MOD_CLK_I2S, /* "i2s" */
+ AW_MOD_CLK_I2S0, /* "i2s0" */
AW_MOD_CLK_AC97, /* "ac97" */
AW_MOD_CLK_SPDIF, /* "spdif" */
AW_MOD_CLK_KEYPAD, /* "key_pad" */
diff --git a/sound/soc/sunxi/i2s/sunxi-i2s.c b/sound/soc/sunxi/i2s/sunxi-i2s.c
index f0d2aa7..eb1b7bf 100644
--- a/sound/soc/sunxi/i2s/sunxi-i2s.c
+++ b/sound/soc/sunxi/i2s/sunxi-i2s.c
@@ -603,7 +603,7 @@ static int __devinit sunxi_i2s_dev_probe(struct
platform_device *pdev)
i2s_pll2clk = clk_get(NULL, "audio_pll");
/* i2s module clk */
- i2s_moduleclk = clk_get(NULL, "i2s");
+ i2s_moduleclk = clk_get(NULL, "i2s0");
if (clk_set_parent(i2s_moduleclk, i2s_pll2clk)) {
printk("try to set parent of i2s_moduleclk to i2s_pll2ck "\
--
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.
