63 lines
2.3 KiB
Diff
63 lines
2.3 KiB
Diff
From: Mans Rullgard <mans@mansr.com>
|
|
Date: Tue, 22 Jul 2008 00:58:18 +0000 (+0100)
|
|
Subject: ARM: OMAP: add clk_get_parent() for OMAP2/3
|
|
X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=e2de5e5578fbaa9b4b75074796da0608fc93e6ae
|
|
|
|
ARM: OMAP: add clk_get_parent() for OMAP2/3
|
|
|
|
Signed-off-by: Mans Rullgard <mans@mansr.com>
|
|
---
|
|
|
|
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
|
|
index 577be44..28aec36 100644
|
|
--- a/arch/arm/mach-omap2/clock.c
|
|
+++ b/arch/arm/mach-omap2/clock.c
|
|
@@ -824,6 +824,11 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
|
|
return 0;
|
|
}
|
|
|
|
+struct clk *omap2_clk_get_parent(struct clk *clk)
|
|
+{
|
|
+ return clk->parent;
|
|
+}
|
|
+
|
|
/* DPLL rate rounding code */
|
|
|
|
/**
|
|
diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h
|
|
index 49245f7..4aa69d5 100644
|
|
--- a/arch/arm/mach-omap2/clock.h
|
|
+++ b/arch/arm/mach-omap2/clock.h
|
|
@@ -29,6 +29,7 @@ int omap2_clk_set_rate(struct clk *clk, unsigned long rate);
|
|
int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent);
|
|
int omap2_dpll_set_rate_tolerance(struct clk *clk, unsigned int tolerance);
|
|
long omap2_dpll_round_rate(struct clk *clk, unsigned long target_rate);
|
|
+struct clk *omap2_clk_get_parent(struct clk *clk);
|
|
|
|
#ifdef CONFIG_OMAP_RESET_CLOCKS
|
|
void omap2_clk_disable_unused(struct clk *clk);
|
|
diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
|
|
index 54cc6e1..ed7af21 100644
|
|
--- a/arch/arm/mach-omap2/clock24xx.c
|
|
+++ b/arch/arm/mach-omap2/clock24xx.c
|
|
@@ -422,6 +422,7 @@ static struct clk_functions omap2_clk_functions = {
|
|
.clk_round_rate = omap2_clk_round_rate,
|
|
.clk_set_rate = omap2_clk_set_rate,
|
|
.clk_set_parent = omap2_clk_set_parent,
|
|
+ .clk_get_parent = omap2_clk_get_parent,
|
|
.clk_disable_unused = omap2_clk_disable_unused,
|
|
#ifdef CONFIG_CPU_FREQ
|
|
.clk_init_cpufreq_table = omap2_clk_init_cpufreq_table,
|
|
diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
|
|
index 04dedec..08c8c46 100644
|
|
--- a/arch/arm/mach-omap2/clock34xx.c
|
|
+++ b/arch/arm/mach-omap2/clock34xx.c
|
|
@@ -541,6 +541,7 @@ static struct clk_functions omap2_clk_functions = {
|
|
.clk_round_rate = omap2_clk_round_rate,
|
|
.clk_set_rate = omap2_clk_set_rate,
|
|
.clk_set_parent = omap2_clk_set_parent,
|
|
+ .clk_get_parent = omap2_clk_get_parent,
|
|
.clk_disable_unused = omap2_clk_disable_unused,
|
|
};
|
|
|