]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
clk: ti: am335x/am4372: Add tbclk to pwm node
authorFranklin S Cooper Jr <fcooper@ti.com>
Tue, 3 May 2016 15:56:47 +0000 (10:56 -0500)
committerTony Lindgren <tony@atomide.com>
Fri, 10 Jun 2016 10:25:04 +0000 (03:25 -0700)
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>
drivers/clk/ti/clk-33xx.c
drivers/clk/ti/clk-43xx.c

index ef2ec64fe5471aa47b39588c0a8647d0938b6c6e..0e47d95faf49681a91fe21ebbf1b2b53413041bc 100644 (file)
@@ -108,6 +108,9 @@ static struct ti_dt_clk am33xx_clks[] = {
        DT_CLK("48300200.ehrpwm", "tbclk", "ehrpwm0_tbclk"),
        DT_CLK("48302200.ehrpwm", "tbclk", "ehrpwm1_tbclk"),
        DT_CLK("48304200.ehrpwm", "tbclk", "ehrpwm2_tbclk"),
+       DT_CLK("48300200.pwm", "tbclk", "ehrpwm0_tbclk"),
+       DT_CLK("48302200.pwm", "tbclk", "ehrpwm1_tbclk"),
+       DT_CLK("48304200.pwm", "tbclk", "ehrpwm2_tbclk"),
        { .node_name = NULL },
 };
 
index 097fc90bf19ab2d241cee438dc272892f27d3acf..7255aa818b1f88ac8b2804c9ae11b419af62d6b1 100644 (file)
@@ -115,6 +115,12 @@ static struct ti_dt_clk am43xx_clks[] = {
        DT_CLK("48306200.ehrpwm", "tbclk", "ehrpwm3_tbclk"),
        DT_CLK("48308200.ehrpwm", "tbclk", "ehrpwm4_tbclk"),
        DT_CLK("4830a200.ehrpwm", "tbclk", "ehrpwm5_tbclk"),
+       DT_CLK("48300200.pwm", "tbclk", "ehrpwm0_tbclk"),
+       DT_CLK("48302200.pwm", "tbclk", "ehrpwm1_tbclk"),
+       DT_CLK("48304200.pwm", "tbclk", "ehrpwm2_tbclk"),
+       DT_CLK("48306200.pwm", "tbclk", "ehrpwm3_tbclk"),
+       DT_CLK("48308200.pwm", "tbclk", "ehrpwm4_tbclk"),
+       DT_CLK("4830a200.pwm", "tbclk", "ehrpwm5_tbclk"),
        { .node_name = NULL },
 };