aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2013-10-09 09:12:38 -0400
committerPaul Walmsley <paul@pwsan.com>2013-10-24 11:07:13 -0400
commit262c2c9d06585fb0ffc84da18e0f747836ce8baf (patch)
treea1c2cb4979fef809854f3ce7b39a604dbe3c34cc /arch/arm
parenta861389a9f074d82081d0c7fbf30280a232c90d0 (diff)
ARM: OMAP3: use CLK_SET_RATE_PARENT for dss clocks
Set CLK_SET_RATE_PARENT flag for dss1_alwon_fck_3430es2, dss1_alwon_fck_3430es1 and dpll4_m4x2_ck so that the DSS's fclk can be configured without the need to get the parent's parent of the fclk. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/cclock3xxx_data.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/cclock3xxx_data.c b/arch/arm/mach-omap2/cclock3xxx_data.c
index 334b76745900..a51dd75a8eaa 100644
--- a/arch/arm/mach-omap2/cclock3xxx_data.c
+++ b/arch/arm/mach-omap2/cclock3xxx_data.c
@@ -869,7 +869,8 @@ static struct clk_hw_omap dpll4_m4x2_ck_hw = {
869 .clkdm_name = "dpll4_clkdm", 869 .clkdm_name = "dpll4_clkdm",
870}; 870};
871 871
872DEFINE_STRUCT_CLK(dpll4_m4x2_ck, dpll4_m4x2_ck_parent_names, dpll4_m5x2_ck_ops); 872DEFINE_STRUCT_CLK_FLAGS(dpll4_m4x2_ck, dpll4_m4x2_ck_parent_names,
873 dpll4_m5x2_ck_ops, CLK_SET_RATE_PARENT);
873 874
874static struct clk dpll4_m4x2_ck_3630 = { 875static struct clk dpll4_m4x2_ck_3630 = {
875 .name = "dpll4_m4x2_ck", 876 .name = "dpll4_m4x2_ck",
@@ -877,6 +878,7 @@ static struct clk dpll4_m4x2_ck_3630 = {
877 .parent_names = dpll4_m4x2_ck_parent_names, 878 .parent_names = dpll4_m4x2_ck_parent_names,
878 .num_parents = ARRAY_SIZE(dpll4_m4x2_ck_parent_names), 879 .num_parents = ARRAY_SIZE(dpll4_m4x2_ck_parent_names),
879 .ops = &dpll4_m5x2_ck_3630_ops, 880 .ops = &dpll4_m5x2_ck_3630_ops,
881 .flags = CLK_SET_RATE_PARENT,
880}; 882};
881 883
882DEFINE_CLK_DIVIDER(dpll4_m6_ck, "dpll4_ck", &dpll4_ck, 0x0, 884DEFINE_CLK_DIVIDER(dpll4_m6_ck, "dpll4_ck", &dpll4_ck, 0x0,
@@ -968,8 +970,9 @@ static struct clk_hw_omap dss1_alwon_fck_3430es1_hw = {
968 .clkdm_name = "dss_clkdm", 970 .clkdm_name = "dss_clkdm",
969}; 971};
970 972
971DEFINE_STRUCT_CLK(dss1_alwon_fck_3430es1, dss1_alwon_fck_3430es1_parent_names, 973DEFINE_STRUCT_CLK_FLAGS(dss1_alwon_fck_3430es1,
972 aes2_ick_ops); 974 dss1_alwon_fck_3430es1_parent_names, aes2_ick_ops,
975 CLK_SET_RATE_PARENT);
973 976
974static struct clk dss1_alwon_fck_3430es2; 977static struct clk dss1_alwon_fck_3430es2;
975 978
@@ -983,8 +986,9 @@ static struct clk_hw_omap dss1_alwon_fck_3430es2_hw = {
983 .clkdm_name = "dss_clkdm", 986 .clkdm_name = "dss_clkdm",
984}; 987};
985 988
986DEFINE_STRUCT_CLK(dss1_alwon_fck_3430es2, dss1_alwon_fck_3430es1_parent_names, 989DEFINE_STRUCT_CLK_FLAGS(dss1_alwon_fck_3430es2,
987 aes2_ick_ops); 990 dss1_alwon_fck_3430es1_parent_names, aes2_ick_ops,
991 CLK_SET_RATE_PARENT);
988 992
989static struct clk dss2_alwon_fck; 993static struct clk dss2_alwon_fck;
990 994