summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-kirkwood
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2012-03-09 09:56:41 +0100
committerMike Turquette <mturquette@linaro.org>2012-05-08 16:34:03 -0700
commite919c71665d2386eec6dc2ecd58d01bae69fc0fd (patch)
treee48c032ee0b94b470e91f097a6a0ba7f0959511b /arch/arm/mach-kirkwood
parent27e53cfbce493bb062212263aa24bbbc5a1077f4 (diff)
downloadblackbird-op-linux-e919c71665d2386eec6dc2ecd58d01bae69fc0fd.tar.gz
blackbird-op-linux-e919c71665d2386eec6dc2ecd58d01bae69fc0fd.zip
ARM: Orion: Audio: Add clk/clkdev support
Signed-off-by: Andrew Lunn <andrew@lunn.ch> Tested-by: Jamie Lentin <jm@lentin.co.uk> Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'arch/arm/mach-kirkwood')
-rw-r--r--arch/arm/mach-kirkwood/common.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index aa36e1bce874..850ba64109cb 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -87,7 +87,7 @@ static struct clk __init *kirkwood_register_gate(const char *name, u8 bit_idx)
void __init kirkwood_clk_init(void)
{
struct clk *runit, *ge0, *ge1, *sata0, *sata1, *usb0, *sdio;
- struct clk *crypto, *xor0, *xor1, *pex0, *pex1;
+ struct clk *crypto, *xor0, *xor1, *pex0, *pex1, *audio;
tclk = clk_register_fixed_rate(NULL, "tclk", NULL,
CLK_IS_ROOT, kirkwood_tclk);
@@ -104,7 +104,7 @@ void __init kirkwood_clk_init(void)
xor1 = kirkwood_register_gate("xor1", CGC_BIT_XOR1);
pex0 = kirkwood_register_gate("pex0", CGC_BIT_PEX0);
pex1 = kirkwood_register_gate("pex1", CGC_BIT_PEX1);
- kirkwood_register_gate("audio", CGC_BIT_AUDIO);
+ audio = kirkwood_register_gate("audio", CGC_BIT_AUDIO);
kirkwood_register_gate("tdm", CGC_BIT_TDM);
kirkwood_register_gate("tsu", CGC_BIT_TSU);
@@ -124,6 +124,7 @@ void __init kirkwood_clk_init(void)
orion_clkdev_add(NULL, MV_XOR_SHARED_NAME ".1", xor1);
orion_clkdev_add("0", "pcie", pex0);
orion_clkdev_add("1", "pcie", pex1);
+ orion_clkdev_add(NULL, "kirkwood-i2s", audio);
}
/*****************************************************************************
OpenPOWER on IntegriCloud