aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFranklin S Cooper Jr <fcooper@ti.com>2016-05-03 11:56:47 -0400
committerTony Lindgren <tony@atomide.com>2016-06-10 06:25:04 -0400
commit22a15e6ffa82cd00d5949a426e4afe6a3a6b8988 (patch)
treeea83d99d8d6e625ee14209b1f29673bf685c391d
parent68ada6bd11cb2efc98c685c8ce4f338cb4af940b (diff)
clk: ti: am335x/am4372: Add tbclk to pwm node
Add tblck to the pwm nodes. This insures that the ehrpwm driver has access to the time-based clk. Do not remove similar entries for ehrpwm node. Later patches will switch from using ehrpwm node name to pwm. But to maintain ABI compatibility we shouldn't remove the old entries. Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com> Acked-by: Stephen Boyd <sboyd@codeaurora.org> Acked-by: Tero Kristo <t-kristo@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--drivers/clk/ti/clk-33xx.c3
-rw-r--r--drivers/clk/ti/clk-43xx.c6
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/clk/ti/clk-33xx.c b/drivers/clk/ti/clk-33xx.c
index ef2ec64fe547..0e47d95faf49 100644
--- a/drivers/clk/ti/clk-33xx.c
+++ b/drivers/clk/ti/clk-33xx.c
@@ -108,6 +108,9 @@ static struct ti_dt_clk am33xx_clks[] = {
108 DT_CLK("48300200.ehrpwm", "tbclk", "ehrpwm0_tbclk"), 108 DT_CLK("48300200.ehrpwm", "tbclk", "ehrpwm0_tbclk"),
109 DT_CLK("48302200.ehrpwm", "tbclk", "ehrpwm1_tbclk"), 109 DT_CLK("48302200.ehrpwm", "tbclk", "ehrpwm1_tbclk"),
110 DT_CLK("48304200.ehrpwm", "tbclk", "ehrpwm2_tbclk"), 110 DT_CLK("48304200.ehrpwm", "tbclk", "ehrpwm2_tbclk"),
111 DT_CLK("48300200.pwm", "tbclk", "ehrpwm0_tbclk"),
112 DT_CLK("48302200.pwm", "tbclk", "ehrpwm1_tbclk"),
113 DT_CLK("48304200.pwm", "tbclk", "ehrpwm2_tbclk"),
111 { .node_name = NULL }, 114 { .node_name = NULL },
112}; 115};
113 116
diff --git a/drivers/clk/ti/clk-43xx.c b/drivers/clk/ti/clk-43xx.c
index 097fc90bf19a..7255aa818b1f 100644
--- a/drivers/clk/ti/clk-43xx.c
+++ b/drivers/clk/ti/clk-43xx.c
@@ -115,6 +115,12 @@ static struct ti_dt_clk am43xx_clks[] = {
115 DT_CLK("48306200.ehrpwm", "tbclk", "ehrpwm3_tbclk"), 115 DT_CLK("48306200.ehrpwm", "tbclk", "ehrpwm3_tbclk"),
116 DT_CLK("48308200.ehrpwm", "tbclk", "ehrpwm4_tbclk"), 116 DT_CLK("48308200.ehrpwm", "tbclk", "ehrpwm4_tbclk"),
117 DT_CLK("4830a200.ehrpwm", "tbclk", "ehrpwm5_tbclk"), 117 DT_CLK("4830a200.ehrpwm", "tbclk", "ehrpwm5_tbclk"),
118 DT_CLK("48300200.pwm", "tbclk", "ehrpwm0_tbclk"),
119 DT_CLK("48302200.pwm", "tbclk", "ehrpwm1_tbclk"),
120 DT_CLK("48304200.pwm", "tbclk", "ehrpwm2_tbclk"),
121 DT_CLK("48306200.pwm", "tbclk", "ehrpwm3_tbclk"),
122 DT_CLK("48308200.pwm", "tbclk", "ehrpwm4_tbclk"),
123 DT_CLK("4830a200.pwm", "tbclk", "ehrpwm5_tbclk"),
118 { .node_name = NULL }, 124 { .node_name = NULL },
119}; 125};
120 126