| Message ID | 1462291015-1919-2-git-send-email-fcooper@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Quoting Franklin S Cooper Jr (2016-05-03 08:56:47) > Add tblck to the pwm nodes. This insures that the ehrpwm driver has access s/tblck/tbclk/ I see you have acks already. What tree should this patch go through? Regards, Mike > 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> > --- > drivers/clk/ti/clk-33xx.c | 3 +++ > drivers/clk/ti/clk-43xx.c | 6 ++++++ > 2 files changed, 9 insertions(+) > > diff --git a/drivers/clk/ti/clk-33xx.c b/drivers/clk/ti/clk-33xx.c > index ef2ec64..0e47d95 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[] = { > 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 }, > }; > > diff --git a/drivers/clk/ti/clk-43xx.c b/drivers/clk/ti/clk-43xx.c > index 097fc90..7255aa8 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[] = { > 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 }, > }; > > -- > 2.7.0 >
On 07/11/2016 05:20 PM, Michael Turquette wrote: > Quoting Franklin S Cooper Jr (2016-05-03 08:56:47) >> Add tblck to the pwm nodes. This insures that the ehrpwm driver has access > > s/tblck/tbclk/ > > I see you have acks already. What tree should this patch go through? I believe it went through Tero's tree. I currently see it in linux-next. > > Regards, > Mike > >> 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> >> --- >> drivers/clk/ti/clk-33xx.c | 3 +++ >> drivers/clk/ti/clk-43xx.c | 6 ++++++ >> 2 files changed, 9 insertions(+) >> >> diff --git a/drivers/clk/ti/clk-33xx.c b/drivers/clk/ti/clk-33xx.c >> index ef2ec64..0e47d95 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[] = { >> 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 }, >> }; >> >> diff --git a/drivers/clk/ti/clk-43xx.c b/drivers/clk/ti/clk-43xx.c >> index 097fc90..7255aa8 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[] = { >> 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 }, >> }; >> >> -- >> 2.7.0 >>
diff --git a/drivers/clk/ti/clk-33xx.c b/drivers/clk/ti/clk-33xx.c index ef2ec64..0e47d95 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[] = { 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 }, }; diff --git a/drivers/clk/ti/clk-43xx.c b/drivers/clk/ti/clk-43xx.c index 097fc90..7255aa8 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[] = { 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 }, };