summaryrefslogtreecommitdiffstats
path: root/target/linux/xburst/files-2.6.32/arch/mips
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2010-03-07 23:44:58 +0000
committerLars-Peter Clausen <lars@metafoo.de>2010-03-07 23:44:58 +0000
commit2be4423361b664b88280d5491b6a4386e994694f (patch)
tree2e0faf70218010578871076b5483eee9c0273ff7 /target/linux/xburst/files-2.6.32/arch/mips
parent33f8fa04df589bc8dd9c25d901adcad52369f46b (diff)
downloadmaster-31e0f0ae-2be4423361b664b88280d5491b6a4386e994694f.tar.gz
master-31e0f0ae-2be4423361b664b88280d5491b6a4386e994694f.tar.bz2
master-31e0f0ae-2be4423361b664b88280d5491b6a4386e994694f.zip
Add support for enabling/disabling the aic controllers clock.
SVN-Revision: 20043
Diffstat (limited to 'target/linux/xburst/files-2.6.32/arch/mips')
-rw-r--r--target/linux/xburst/files-2.6.32/arch/mips/jz4740/clock.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/target/linux/xburst/files-2.6.32/arch/mips/jz4740/clock.c b/target/linux/xburst/files-2.6.32/arch/mips/jz4740/clock.c
index 12a54ed9f6..a780706bef 100644
--- a/target/linux/xburst/files-2.6.32/arch/mips/jz4740/clock.c
+++ b/target/linux/xburst/files-2.6.32/arch/mips/jz4740/clock.c
@@ -55,8 +55,8 @@
#define JZ_CLOCK_GATE_RTC BIT(2)
#define JZ_CLOCK_GATE_I2C BIT(3)
#define JZ_CLOCK_GATE_SPI BIT(4)
-#define JZ_CLOCK_GATE_AIC_PCLK BIT(5)
-#define JZ_CLOCK_GATE_AIC BIT(6)
+#define JZ_CLOCK_GATE_AIC BIT(5)
+#define JZ_CLOCK_GATE_I2S BIT(6)
#define JZ_CLOCK_GATE_MMC BIT(7)
#define JZ_CLOCK_GATE_ADC BIT(8)
#define JZ_CLOCK_GATE_CIM BIT(9)
@@ -626,7 +626,7 @@ static struct divided_clk jz4740_clock_divided_clks[] = {
.clk = {
.name = "i2s",
.parent = &jz_clk_ext.clk,
- .gate_bit = JZ_CLOCK_GATE_AIC,
+ .gate_bit = JZ_CLOCK_GATE_I2S,
.ops = &jz_clk_i2s_ops,
},
.reg = JZ_REG_CLOCK_I2S,
@@ -721,6 +721,12 @@ static struct clk jz4740_clock_simple_clks[] = {
.gate_bit = JZ_CLOCK_GATE_I2C,
.ops = &jz_clk_simple_ops,
},
+ {
+ .name = "aic",
+ .parent = &jz_clk_ext.clk,
+ .gate_bit = JZ_CLOCK_GATE_AIC,
+ .ops = &jz_clk_simple_ops,
+ },
};
static struct static_clk jz_clk_rtc = {