aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2014-10-09 10:03:18 -0400
committerPaul Walmsley <paul@pwsan.com>2014-11-19 18:41:56 -0500
commit2cc84f46de7118d4a5a5b7ed1dced40c2247083d (patch)
tree060042afeeac1e8a9d7689cd6133ee996594762c
parent7ede8561614afcc82f0e17bb70ae64fd620b94b0 (diff)
ARM: OMAP4: fix RFBI iclk
RFBI iclk was set to point to hacky "dss_fck", which will be removed. Instead use "l3_div_ck", which is the proper clock for this. "l3_div_ck" is the parent of "dss_fck", so the clock rate is the same as previously. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Reviewed-by: Archit Taneja <archit.taneja@gmail.com> Signed-off-by: Paul Walmsley <paul@pwsan.com>
-rw-r--r--arch/arm/boot/dts/omap4.dtsi2
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_44xx_data.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 878c979203d0..84045a5c3ce8 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -895,7 +895,7 @@
895 reg = <0x58002000 0x1000>; 895 reg = <0x58002000 0x1000>;
896 status = "disabled"; 896 status = "disabled";
897 ti,hwmods = "dss_rfbi"; 897 ti,hwmods = "dss_rfbi";
898 clocks = <&dss_dss_clk>, <&dss_fck>; 898 clocks = <&dss_dss_clk>, <&l3_div_ck>;
899 clock-names = "fck", "ick"; 899 clock-names = "fck", "ick";
900 }; 900 };
901 901
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 8126f178d57e..d6f41e1b6d1b 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -824,7 +824,7 @@ static struct omap_hwmod_dma_info omap44xx_dss_rfbi_sdma_reqs[] = {
824}; 824};
825 825
826static struct omap_hwmod_opt_clk dss_rfbi_opt_clks[] = { 826static struct omap_hwmod_opt_clk dss_rfbi_opt_clks[] = {
827 { .role = "ick", .clk = "dss_fck" }, 827 { .role = "ick", .clk = "l3_div_ck" },
828}; 828};
829 829
830static struct omap_hwmod omap44xx_dss_rfbi_hwmod = { 830static struct omap_hwmod omap44xx_dss_rfbi_hwmod = {