aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx25
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2009-07-22 17:33:36 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-07-26 15:05:24 +0200
commite993ade18fcc5f81b26ec031c166880789a9723b (patch)
tree766debff317105409a1b6b29e2b9a2b66fd6fcc4 /arch/arm/mach-mx25
parent6937aabef4dd0ee88fe0e4732f0eb8de612ecbb4 (diff)
downloadkernel_samsung_crespo-e993ade18fcc5f81b26ec031c166880789a9723b.zip
kernel_samsung_crespo-e993ade18fcc5f81b26ec031c166880789a9723b.tar.gz
kernel_samsung_crespo-e993ade18fcc5f81b26ec031c166880789a9723b.tar.bz2
mx25: flexcan clock support
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx25')
-rw-r--r--arch/arm/mach-mx25/clock.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-mx25/clock.c b/arch/arm/mach-mx25/clock.c
index 02f8247..40c7cc4 100644
--- a/arch/arm/mach-mx25/clock.c
+++ b/arch/arm/mach-mx25/clock.c
@@ -240,6 +240,8 @@ DEFINE_CLOCK(ssi1_clk, 0, CCM_CGCR2, 11, get_rate_ssi1, NULL, &ssi1_per_clk);
DEFINE_CLOCK(ssi2_clk, 1, CCM_CGCR2, 12, get_rate_ssi2, NULL, &ssi2_per_clk);
DEFINE_CLOCK(audmux_clk, 0, CCM_CGCR1, 0, NULL, NULL, NULL);
DEFINE_CLOCK(csi_clk, 0, CCM_CGCR1, 4, get_rate_csi, NULL, &csi_per_clk);
+DEFINE_CLOCK(can1_clk, 0, CCM_CGCR1, 2, get_rate_ipg, NULL, NULL);
+DEFINE_CLOCK(can2_clk, 0, CCM_CGCR1, 3, get_rate_ipg, NULL, NULL);
#define _REGISTER_CLOCK(d, n, c) \
{ \
@@ -279,6 +281,8 @@ static struct clk_lookup lookups[] = {
_REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)
_REGISTER_CLOCK("mx2-camera.0", NULL, csi_clk)
_REGISTER_CLOCK(NULL, "audmux", audmux_clk)
+ _REGISTER_CLOCK("flexcan.0", NULL, can1_clk)
+ _REGISTER_CLOCK("flexcan.1", NULL, can2_clk)
};
int __init mx25_clocks_init(void)