* [PATCHv3] arm: dts: am43x-clock: add tbclk data for ehrpwm. @ 2014-04-29 14:15 Sourav Poddar 2014-04-29 14:51 ` Tero Kristo 0 siblings, 1 reply; 6+ messages in thread From: Sourav Poddar @ 2014-04-29 14:15 UTC (permalink / raw) To: t-kristo, mturquette, tony, devicetree, linux-omap, balbi; +Cc: Sourav Poddar We need "tbclk" clock data for the functioning of ehrpwm module. Hence, populating the required clock information in clock dts file. Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> --- v2->v3 - correct bitshifting arch/arm/boot/dts/am43xx-clocks.dtsi | 48 ++++++++++++++++++++++++++++++++++ drivers/clk/ti/clk-43xx.c | 6 +++++ 2 files changed, 54 insertions(+) diff --git a/arch/arm/boot/dts/am43xx-clocks.dtsi b/arch/arm/boot/dts/am43xx-clocks.dtsi index 142009c..42d7b1f 100644 --- a/arch/arm/boot/dts/am43xx-clocks.dtsi +++ b/arch/arm/boot/dts/am43xx-clocks.dtsi @@ -87,6 +87,54 @@ clock-mult = <1>; clock-div = <1>; }; + + ehrpwm0_tbclk: ehrpwm0_tbclk { + #clock-cells = <0>; + compatible = "ti,gate-clock"; + clocks = <&dpll_per_m2_ck>; + ti,bit-shift = <0>; + reg = <0x0664>; + }; + + ehrpwm1_tbclk: ehrpwm1_tbclk { + #clock-cells = <0>; + compatible = "ti,gate-clock"; + clocks = <&dpll_per_m2_ck>; + ti,bit-shift = <1>; + reg = <0x0664>; + }; + + ehrpwm2_tbclk: ehrpwm2_tbclk { + #clock-cells = <0>; + compatible = "ti,gate-clock"; + clocks = <&dpll_per_m2_ck>; + ti,bit-shift = <2>; + reg = <0x0664>; + }; + + ehrpwm3_tbclk: ehrpwm3_tbclk { + #clock-cells = <0>; + compatible = "ti,gate-clock"; + clocks = <&dpll_per_m2_ck>; + ti,bit-shift = <4>; + reg = <0x0664>; + }; + + ehrpwm4_tbclk: ehrpwm4_tbclk { + #clock-cells = <0>; + compatible = "ti,gate-clock"; + clocks = <&dpll_per_m2_ck>; + ti,bit-shift = <5>; + reg = <0x0664>; + }; + + ehrpwm5_tbclk: ehrpwm5_tbclk { + #clock-cells = <0>; + compatible = "ti,gate-clock"; + clocks = <&dpll_per_m2_ck>; + ti,bit-shift = <6>; + reg = <0x0664>; + }; }; &prcm_clocks { clk_32768_ck: clk_32768_ck { diff --git a/drivers/clk/ti/clk-43xx.c b/drivers/clk/ti/clk-43xx.c index 67c8de5..527a43d 100644 --- a/drivers/clk/ti/clk-43xx.c +++ b/drivers/clk/ti/clk-43xx.c @@ -105,6 +105,12 @@ static struct ti_dt_clk am43xx_clks[] = { DT_CLK(NULL, "func_12m_clk", "func_12m_clk"), DT_CLK(NULL, "vtp_clk_div", "vtp_clk_div"), DT_CLK(NULL, "usbphy_32khz_clkmux", "usbphy_32khz_clkmux"), + DT_CLK("48300200.ehrpwm", "tbclk", "ehrpwm0_tbclk"), + DT_CLK("48302200.ehrpwm", "tbclk", "ehrpwm1_tbclk"), + DT_CLK("48304200.ehrpwm", "tbclk", "ehrpwm2_tbclk"), + DT_CLK("48306200.ehrpwm", "tbclk", "ehrpwm3_tbclk"), + DT_CLK("48308200.ehrpwm", "tbclk", "ehrpwm4_tbclk"), + DT_CLK("4830a200.ehrpwm", "tbclk", "ehrpwm5_tbclk"), { .node_name = NULL }, }; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCHv3] arm: dts: am43x-clock: add tbclk data for ehrpwm. 2014-04-29 14:15 [PATCHv3] arm: dts: am43x-clock: add tbclk data for ehrpwm Sourav Poddar @ 2014-04-29 14:51 ` Tero Kristo 2014-05-01 19:00 ` Mike Turquette 0 siblings, 1 reply; 6+ messages in thread From: Tero Kristo @ 2014-04-29 14:51 UTC (permalink / raw) To: Sourav Poddar, mturquette, tony, devicetree, linux-omap, balbi On 04/29/2014 05:15 PM, Sourav Poddar wrote: > We need "tbclk" clock data for the functioning of ehrpwm > module. Hence, populating the required clock information > in clock dts file. > > Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> Acked-by: Tero Kristo <t-kristo@ti.com> > --- > v2->v3 > - correct bitshifting > > arch/arm/boot/dts/am43xx-clocks.dtsi | 48 ++++++++++++++++++++++++++++++++++ > drivers/clk/ti/clk-43xx.c | 6 +++++ > 2 files changed, 54 insertions(+) > > diff --git a/arch/arm/boot/dts/am43xx-clocks.dtsi b/arch/arm/boot/dts/am43xx-clocks.dtsi > index 142009c..42d7b1f 100644 > --- a/arch/arm/boot/dts/am43xx-clocks.dtsi > +++ b/arch/arm/boot/dts/am43xx-clocks.dtsi > @@ -87,6 +87,54 @@ > clock-mult = <1>; > clock-div = <1>; > }; > + > + ehrpwm0_tbclk: ehrpwm0_tbclk { > + #clock-cells = <0>; > + compatible = "ti,gate-clock"; > + clocks = <&dpll_per_m2_ck>; > + ti,bit-shift = <0>; > + reg = <0x0664>; > + }; > + > + ehrpwm1_tbclk: ehrpwm1_tbclk { > + #clock-cells = <0>; > + compatible = "ti,gate-clock"; > + clocks = <&dpll_per_m2_ck>; > + ti,bit-shift = <1>; > + reg = <0x0664>; > + }; > + > + ehrpwm2_tbclk: ehrpwm2_tbclk { > + #clock-cells = <0>; > + compatible = "ti,gate-clock"; > + clocks = <&dpll_per_m2_ck>; > + ti,bit-shift = <2>; > + reg = <0x0664>; > + }; > + > + ehrpwm3_tbclk: ehrpwm3_tbclk { > + #clock-cells = <0>; > + compatible = "ti,gate-clock"; > + clocks = <&dpll_per_m2_ck>; > + ti,bit-shift = <4>; > + reg = <0x0664>; > + }; > + > + ehrpwm4_tbclk: ehrpwm4_tbclk { > + #clock-cells = <0>; > + compatible = "ti,gate-clock"; > + clocks = <&dpll_per_m2_ck>; > + ti,bit-shift = <5>; > + reg = <0x0664>; > + }; > + > + ehrpwm5_tbclk: ehrpwm5_tbclk { > + #clock-cells = <0>; > + compatible = "ti,gate-clock"; > + clocks = <&dpll_per_m2_ck>; > + ti,bit-shift = <6>; > + reg = <0x0664>; > + }; > }; > &prcm_clocks { > clk_32768_ck: clk_32768_ck { > diff --git a/drivers/clk/ti/clk-43xx.c b/drivers/clk/ti/clk-43xx.c > index 67c8de5..527a43d 100644 > --- a/drivers/clk/ti/clk-43xx.c > +++ b/drivers/clk/ti/clk-43xx.c > @@ -105,6 +105,12 @@ static struct ti_dt_clk am43xx_clks[] = { > DT_CLK(NULL, "func_12m_clk", "func_12m_clk"), > DT_CLK(NULL, "vtp_clk_div", "vtp_clk_div"), > DT_CLK(NULL, "usbphy_32khz_clkmux", "usbphy_32khz_clkmux"), > + DT_CLK("48300200.ehrpwm", "tbclk", "ehrpwm0_tbclk"), > + DT_CLK("48302200.ehrpwm", "tbclk", "ehrpwm1_tbclk"), > + DT_CLK("48304200.ehrpwm", "tbclk", "ehrpwm2_tbclk"), > + DT_CLK("48306200.ehrpwm", "tbclk", "ehrpwm3_tbclk"), > + DT_CLK("48308200.ehrpwm", "tbclk", "ehrpwm4_tbclk"), > + DT_CLK("4830a200.ehrpwm", "tbclk", "ehrpwm5_tbclk"), > { .node_name = NULL }, > }; > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCHv3] arm: dts: am43x-clock: add tbclk data for ehrpwm. 2014-04-29 14:51 ` Tero Kristo @ 2014-05-01 19:00 ` Mike Turquette 2014-05-05 7:49 ` Tero Kristo 0 siblings, 1 reply; 6+ messages in thread From: Mike Turquette @ 2014-05-01 19:00 UTC (permalink / raw) To: Tero Kristo, Sourav Poddar, tony, devicetree, linux-omap, balbi Quoting Tero Kristo (2014-04-29 07:51:14) > On 04/29/2014 05:15 PM, Sourav Poddar wrote: > > We need "tbclk" clock data for the functioning of ehrpwm > > module. Hence, populating the required clock information > > in clock dts file. > > > > Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> > > Acked-by: Tero Kristo <t-kristo@ti.com> Looks good to me. Tero, just to be clear, are you planning on batching up OMAPish clock patches and sending a pull request (once they have been reviewed on the list)? Thanks, Mike > > > > --- > > v2->v3 > > - correct bitshifting > > > > arch/arm/boot/dts/am43xx-clocks.dtsi | 48 ++++++++++++++++++++++++++++++++++ > > drivers/clk/ti/clk-43xx.c | 6 +++++ > > 2 files changed, 54 insertions(+) > > > > diff --git a/arch/arm/boot/dts/am43xx-clocks.dtsi b/arch/arm/boot/dts/am43xx-clocks.dtsi > > index 142009c..42d7b1f 100644 > > --- a/arch/arm/boot/dts/am43xx-clocks.dtsi > > +++ b/arch/arm/boot/dts/am43xx-clocks.dtsi > > @@ -87,6 +87,54 @@ > > clock-mult = <1>; > > clock-div = <1>; > > }; > > + > > + ehrpwm0_tbclk: ehrpwm0_tbclk { > > + #clock-cells = <0>; > > + compatible = "ti,gate-clock"; > > + clocks = <&dpll_per_m2_ck>; > > + ti,bit-shift = <0>; > > + reg = <0x0664>; > > + }; > > + > > + ehrpwm1_tbclk: ehrpwm1_tbclk { > > + #clock-cells = <0>; > > + compatible = "ti,gate-clock"; > > + clocks = <&dpll_per_m2_ck>; > > + ti,bit-shift = <1>; > > + reg = <0x0664>; > > + }; > > + > > + ehrpwm2_tbclk: ehrpwm2_tbclk { > > + #clock-cells = <0>; > > + compatible = "ti,gate-clock"; > > + clocks = <&dpll_per_m2_ck>; > > + ti,bit-shift = <2>; > > + reg = <0x0664>; > > + }; > > + > > + ehrpwm3_tbclk: ehrpwm3_tbclk { > > + #clock-cells = <0>; > > + compatible = "ti,gate-clock"; > > + clocks = <&dpll_per_m2_ck>; > > + ti,bit-shift = <4>; > > + reg = <0x0664>; > > + }; > > + > > + ehrpwm4_tbclk: ehrpwm4_tbclk { > > + #clock-cells = <0>; > > + compatible = "ti,gate-clock"; > > + clocks = <&dpll_per_m2_ck>; > > + ti,bit-shift = <5>; > > + reg = <0x0664>; > > + }; > > + > > + ehrpwm5_tbclk: ehrpwm5_tbclk { > > + #clock-cells = <0>; > > + compatible = "ti,gate-clock"; > > + clocks = <&dpll_per_m2_ck>; > > + ti,bit-shift = <6>; > > + reg = <0x0664>; > > + }; > > }; > > &prcm_clocks { > > clk_32768_ck: clk_32768_ck { > > diff --git a/drivers/clk/ti/clk-43xx.c b/drivers/clk/ti/clk-43xx.c > > index 67c8de5..527a43d 100644 > > --- a/drivers/clk/ti/clk-43xx.c > > +++ b/drivers/clk/ti/clk-43xx.c > > @@ -105,6 +105,12 @@ static struct ti_dt_clk am43xx_clks[] = { > > DT_CLK(NULL, "func_12m_clk", "func_12m_clk"), > > DT_CLK(NULL, "vtp_clk_div", "vtp_clk_div"), > > DT_CLK(NULL, "usbphy_32khz_clkmux", "usbphy_32khz_clkmux"), > > + DT_CLK("48300200.ehrpwm", "tbclk", "ehrpwm0_tbclk"), > > + DT_CLK("48302200.ehrpwm", "tbclk", "ehrpwm1_tbclk"), > > + DT_CLK("48304200.ehrpwm", "tbclk", "ehrpwm2_tbclk"), > > + DT_CLK("48306200.ehrpwm", "tbclk", "ehrpwm3_tbclk"), > > + DT_CLK("48308200.ehrpwm", "tbclk", "ehrpwm4_tbclk"), > > + DT_CLK("4830a200.ehrpwm", "tbclk", "ehrpwm5_tbclk"), > > { .node_name = NULL }, > > }; > > > > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCHv3] arm: dts: am43x-clock: add tbclk data for ehrpwm. 2014-05-01 19:00 ` Mike Turquette @ 2014-05-05 7:49 ` Tero Kristo 2014-05-19 13:20 ` Tero Kristo 0 siblings, 1 reply; 6+ messages in thread From: Tero Kristo @ 2014-05-05 7:49 UTC (permalink / raw) To: Mike Turquette, Sourav Poddar, tony, devicetree, linux-omap, balbi On 05/01/2014 10:00 PM, Mike Turquette wrote: > Quoting Tero Kristo (2014-04-29 07:51:14) >> On 04/29/2014 05:15 PM, Sourav Poddar wrote: >>> We need "tbclk" clock data for the functioning of ehrpwm >>> module. Hence, populating the required clock information >>> in clock dts file. >>> >>> Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> >> >> Acked-by: Tero Kristo <t-kristo@ti.com> > > Looks good to me. > > Tero, just to be clear, are you planning on batching up OMAPish clock > patches and sending a pull request (once they have been reviewed on the > list)? No, I haven't been planning on sending a pull-req, as I believe you still want to ack the TI related clock driver patches yourself also. If you want to change the setup I am of course willing to negotiate the terms. :) -Tero > > Thanks, > Mike > >> >> >>> --- >>> v2->v3 >>> - correct bitshifting >>> >>> arch/arm/boot/dts/am43xx-clocks.dtsi | 48 ++++++++++++++++++++++++++++++++++ >>> drivers/clk/ti/clk-43xx.c | 6 +++++ >>> 2 files changed, 54 insertions(+) >>> >>> diff --git a/arch/arm/boot/dts/am43xx-clocks.dtsi b/arch/arm/boot/dts/am43xx-clocks.dtsi >>> index 142009c..42d7b1f 100644 >>> --- a/arch/arm/boot/dts/am43xx-clocks.dtsi >>> +++ b/arch/arm/boot/dts/am43xx-clocks.dtsi >>> @@ -87,6 +87,54 @@ >>> clock-mult = <1>; >>> clock-div = <1>; >>> }; >>> + >>> + ehrpwm0_tbclk: ehrpwm0_tbclk { >>> + #clock-cells = <0>; >>> + compatible = "ti,gate-clock"; >>> + clocks = <&dpll_per_m2_ck>; >>> + ti,bit-shift = <0>; >>> + reg = <0x0664>; >>> + }; >>> + >>> + ehrpwm1_tbclk: ehrpwm1_tbclk { >>> + #clock-cells = <0>; >>> + compatible = "ti,gate-clock"; >>> + clocks = <&dpll_per_m2_ck>; >>> + ti,bit-shift = <1>; >>> + reg = <0x0664>; >>> + }; >>> + >>> + ehrpwm2_tbclk: ehrpwm2_tbclk { >>> + #clock-cells = <0>; >>> + compatible = "ti,gate-clock"; >>> + clocks = <&dpll_per_m2_ck>; >>> + ti,bit-shift = <2>; >>> + reg = <0x0664>; >>> + }; >>> + >>> + ehrpwm3_tbclk: ehrpwm3_tbclk { >>> + #clock-cells = <0>; >>> + compatible = "ti,gate-clock"; >>> + clocks = <&dpll_per_m2_ck>; >>> + ti,bit-shift = <4>; >>> + reg = <0x0664>; >>> + }; >>> + >>> + ehrpwm4_tbclk: ehrpwm4_tbclk { >>> + #clock-cells = <0>; >>> + compatible = "ti,gate-clock"; >>> + clocks = <&dpll_per_m2_ck>; >>> + ti,bit-shift = <5>; >>> + reg = <0x0664>; >>> + }; >>> + >>> + ehrpwm5_tbclk: ehrpwm5_tbclk { >>> + #clock-cells = <0>; >>> + compatible = "ti,gate-clock"; >>> + clocks = <&dpll_per_m2_ck>; >>> + ti,bit-shift = <6>; >>> + reg = <0x0664>; >>> + }; >>> }; >>> &prcm_clocks { >>> clk_32768_ck: clk_32768_ck { >>> diff --git a/drivers/clk/ti/clk-43xx.c b/drivers/clk/ti/clk-43xx.c >>> index 67c8de5..527a43d 100644 >>> --- a/drivers/clk/ti/clk-43xx.c >>> +++ b/drivers/clk/ti/clk-43xx.c >>> @@ -105,6 +105,12 @@ static struct ti_dt_clk am43xx_clks[] = { >>> DT_CLK(NULL, "func_12m_clk", "func_12m_clk"), >>> DT_CLK(NULL, "vtp_clk_div", "vtp_clk_div"), >>> DT_CLK(NULL, "usbphy_32khz_clkmux", "usbphy_32khz_clkmux"), >>> + DT_CLK("48300200.ehrpwm", "tbclk", "ehrpwm0_tbclk"), >>> + DT_CLK("48302200.ehrpwm", "tbclk", "ehrpwm1_tbclk"), >>> + DT_CLK("48304200.ehrpwm", "tbclk", "ehrpwm2_tbclk"), >>> + DT_CLK("48306200.ehrpwm", "tbclk", "ehrpwm3_tbclk"), >>> + DT_CLK("48308200.ehrpwm", "tbclk", "ehrpwm4_tbclk"), >>> + DT_CLK("4830a200.ehrpwm", "tbclk", "ehrpwm5_tbclk"), >>> { .node_name = NULL }, >>> }; >>> >>> >> ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCHv3] arm: dts: am43x-clock: add tbclk data for ehrpwm. 2014-05-05 7:49 ` Tero Kristo @ 2014-05-19 13:20 ` Tero Kristo 2014-05-28 19:15 ` Mike Turquette 0 siblings, 1 reply; 6+ messages in thread From: Tero Kristo @ 2014-05-19 13:20 UTC (permalink / raw) To: Mike Turquette, Sourav Poddar, tony, devicetree, linux-omap, balbi On 05/05/2014 10:49 AM, Tero Kristo wrote: > On 05/01/2014 10:00 PM, Mike Turquette wrote: >> Quoting Tero Kristo (2014-04-29 07:51:14) >>> On 04/29/2014 05:15 PM, Sourav Poddar wrote: >>>> We need "tbclk" clock data for the functioning of ehrpwm >>>> module. Hence, populating the required clock information >>>> in clock dts file. >>>> >>>> Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> >>> >>> Acked-by: Tero Kristo <t-kristo@ti.com> >> >> Looks good to me. >> >> Tero, just to be clear, are you planning on batching up OMAPish clock >> patches and sending a pull request (once they have been reviewed on the >> list)? > > No, I haven't been planning on sending a pull-req, as I believe you > still want to ack the TI related clock driver patches yourself also. If > you want to change the setup I am of course willing to negotiate the > terms. :) > > -Tero So, based on our discussions, this is now queued for 3.15-rc/clk-dt. -Tero > >> >> Thanks, >> Mike >> >>> >>> >>>> --- >>>> v2->v3 >>>> - correct bitshifting >>>> >>>> arch/arm/boot/dts/am43xx-clocks.dtsi | 48 >>>> ++++++++++++++++++++++++++++++++++ >>>> drivers/clk/ti/clk-43xx.c | 6 +++++ >>>> 2 files changed, 54 insertions(+) >>>> >>>> diff --git a/arch/arm/boot/dts/am43xx-clocks.dtsi >>>> b/arch/arm/boot/dts/am43xx-clocks.dtsi >>>> index 142009c..42d7b1f 100644 >>>> --- a/arch/arm/boot/dts/am43xx-clocks.dtsi >>>> +++ b/arch/arm/boot/dts/am43xx-clocks.dtsi >>>> @@ -87,6 +87,54 @@ >>>> clock-mult = <1>; >>>> clock-div = <1>; >>>> }; >>>> + >>>> + ehrpwm0_tbclk: ehrpwm0_tbclk { >>>> + #clock-cells = <0>; >>>> + compatible = "ti,gate-clock"; >>>> + clocks = <&dpll_per_m2_ck>; >>>> + ti,bit-shift = <0>; >>>> + reg = <0x0664>; >>>> + }; >>>> + >>>> + ehrpwm1_tbclk: ehrpwm1_tbclk { >>>> + #clock-cells = <0>; >>>> + compatible = "ti,gate-clock"; >>>> + clocks = <&dpll_per_m2_ck>; >>>> + ti,bit-shift = <1>; >>>> + reg = <0x0664>; >>>> + }; >>>> + >>>> + ehrpwm2_tbclk: ehrpwm2_tbclk { >>>> + #clock-cells = <0>; >>>> + compatible = "ti,gate-clock"; >>>> + clocks = <&dpll_per_m2_ck>; >>>> + ti,bit-shift = <2>; >>>> + reg = <0x0664>; >>>> + }; >>>> + >>>> + ehrpwm3_tbclk: ehrpwm3_tbclk { >>>> + #clock-cells = <0>; >>>> + compatible = "ti,gate-clock"; >>>> + clocks = <&dpll_per_m2_ck>; >>>> + ti,bit-shift = <4>; >>>> + reg = <0x0664>; >>>> + }; >>>> + >>>> + ehrpwm4_tbclk: ehrpwm4_tbclk { >>>> + #clock-cells = <0>; >>>> + compatible = "ti,gate-clock"; >>>> + clocks = <&dpll_per_m2_ck>; >>>> + ti,bit-shift = <5>; >>>> + reg = <0x0664>; >>>> + }; >>>> + >>>> + ehrpwm5_tbclk: ehrpwm5_tbclk { >>>> + #clock-cells = <0>; >>>> + compatible = "ti,gate-clock"; >>>> + clocks = <&dpll_per_m2_ck>; >>>> + ti,bit-shift = <6>; >>>> + reg = <0x0664>; >>>> + }; >>>> }; >>>> &prcm_clocks { >>>> clk_32768_ck: clk_32768_ck { >>>> diff --git a/drivers/clk/ti/clk-43xx.c b/drivers/clk/ti/clk-43xx.c >>>> index 67c8de5..527a43d 100644 >>>> --- a/drivers/clk/ti/clk-43xx.c >>>> +++ b/drivers/clk/ti/clk-43xx.c >>>> @@ -105,6 +105,12 @@ static struct ti_dt_clk am43xx_clks[] = { >>>> DT_CLK(NULL, "func_12m_clk", "func_12m_clk"), >>>> DT_CLK(NULL, "vtp_clk_div", "vtp_clk_div"), >>>> DT_CLK(NULL, "usbphy_32khz_clkmux", "usbphy_32khz_clkmux"), >>>> + DT_CLK("48300200.ehrpwm", "tbclk", "ehrpwm0_tbclk"), >>>> + DT_CLK("48302200.ehrpwm", "tbclk", "ehrpwm1_tbclk"), >>>> + DT_CLK("48304200.ehrpwm", "tbclk", "ehrpwm2_tbclk"), >>>> + DT_CLK("48306200.ehrpwm", "tbclk", "ehrpwm3_tbclk"), >>>> + DT_CLK("48308200.ehrpwm", "tbclk", "ehrpwm4_tbclk"), >>>> + DT_CLK("4830a200.ehrpwm", "tbclk", "ehrpwm5_tbclk"), >>>> { .node_name = NULL }, >>>> }; >>>> >>>> >>> > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCHv3] arm: dts: am43x-clock: add tbclk data for ehrpwm. 2014-05-19 13:20 ` Tero Kristo @ 2014-05-28 19:15 ` Mike Turquette 0 siblings, 0 replies; 6+ messages in thread From: Mike Turquette @ 2014-05-28 19:15 UTC (permalink / raw) To: Tero Kristo Cc: Sourav Poddar, Tony Lindgren, devicetree, Linux OMAP Mailing List, Felipe Balbi On Mon, May 19, 2014 at 6:20 AM, Tero Kristo <t-kristo@ti.com> wrote: > On 05/05/2014 10:49 AM, Tero Kristo wrote: >> >> On 05/01/2014 10:00 PM, Mike Turquette wrote: >>> >>> Quoting Tero Kristo (2014-04-29 07:51:14) >>>> >>>> On 04/29/2014 05:15 PM, Sourav Poddar wrote: >>>>> >>>>> We need "tbclk" clock data for the functioning of ehrpwm >>>>> module. Hence, populating the required clock information >>>>> in clock dts file. >>>>> >>>>> Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> >>>> >>>> >>>> Acked-by: Tero Kristo <t-kristo@ti.com> >>> >>> >>> Looks good to me. >>> >>> Tero, just to be clear, are you planning on batching up OMAPish clock >>> patches and sending a pull request (once they have been reviewed on the >>> list)? >> >> >> No, I haven't been planning on sending a pull-req, as I believe you >> still want to ack the TI related clock driver patches yourself also. If >> you want to change the setup I am of course willing to negotiate the >> terms. :) >> >> -Tero > > > So, based on our discussions, this is now queued for 3.15-rc/clk-dt. I don't want to cross threads, so we'll work out the details of the for-3.16 stuff in the "Pending clock and hwmod patches" thread. However, after this next merge window I am happy to move to a pull request-based model for OMAP clock patches, since things should slowly start to settle down. Regards, Mike > > > -Tero > >> >>> >>> Thanks, >>> Mike >>> >>>> >>>> >>>>> --- >>>>> v2->v3 >>>>> - correct bitshifting >>>>> >>>>> arch/arm/boot/dts/am43xx-clocks.dtsi | 48 >>>>> ++++++++++++++++++++++++++++++++++ >>>>> drivers/clk/ti/clk-43xx.c | 6 +++++ >>>>> 2 files changed, 54 insertions(+) >>>>> >>>>> diff --git a/arch/arm/boot/dts/am43xx-clocks.dtsi >>>>> b/arch/arm/boot/dts/am43xx-clocks.dtsi >>>>> index 142009c..42d7b1f 100644 >>>>> --- a/arch/arm/boot/dts/am43xx-clocks.dtsi >>>>> +++ b/arch/arm/boot/dts/am43xx-clocks.dtsi >>>>> @@ -87,6 +87,54 @@ >>>>> clock-mult = <1>; >>>>> clock-div = <1>; >>>>> }; >>>>> + >>>>> + ehrpwm0_tbclk: ehrpwm0_tbclk { >>>>> + #clock-cells = <0>; >>>>> + compatible = "ti,gate-clock"; >>>>> + clocks = <&dpll_per_m2_ck>; >>>>> + ti,bit-shift = <0>; >>>>> + reg = <0x0664>; >>>>> + }; >>>>> + >>>>> + ehrpwm1_tbclk: ehrpwm1_tbclk { >>>>> + #clock-cells = <0>; >>>>> + compatible = "ti,gate-clock"; >>>>> + clocks = <&dpll_per_m2_ck>; >>>>> + ti,bit-shift = <1>; >>>>> + reg = <0x0664>; >>>>> + }; >>>>> + >>>>> + ehrpwm2_tbclk: ehrpwm2_tbclk { >>>>> + #clock-cells = <0>; >>>>> + compatible = "ti,gate-clock"; >>>>> + clocks = <&dpll_per_m2_ck>; >>>>> + ti,bit-shift = <2>; >>>>> + reg = <0x0664>; >>>>> + }; >>>>> + >>>>> + ehrpwm3_tbclk: ehrpwm3_tbclk { >>>>> + #clock-cells = <0>; >>>>> + compatible = "ti,gate-clock"; >>>>> + clocks = <&dpll_per_m2_ck>; >>>>> + ti,bit-shift = <4>; >>>>> + reg = <0x0664>; >>>>> + }; >>>>> + >>>>> + ehrpwm4_tbclk: ehrpwm4_tbclk { >>>>> + #clock-cells = <0>; >>>>> + compatible = "ti,gate-clock"; >>>>> + clocks = <&dpll_per_m2_ck>; >>>>> + ti,bit-shift = <5>; >>>>> + reg = <0x0664>; >>>>> + }; >>>>> + >>>>> + ehrpwm5_tbclk: ehrpwm5_tbclk { >>>>> + #clock-cells = <0>; >>>>> + compatible = "ti,gate-clock"; >>>>> + clocks = <&dpll_per_m2_ck>; >>>>> + ti,bit-shift = <6>; >>>>> + reg = <0x0664>; >>>>> + }; >>>>> }; >>>>> &prcm_clocks { >>>>> clk_32768_ck: clk_32768_ck { >>>>> diff --git a/drivers/clk/ti/clk-43xx.c b/drivers/clk/ti/clk-43xx.c >>>>> index 67c8de5..527a43d 100644 >>>>> --- a/drivers/clk/ti/clk-43xx.c >>>>> +++ b/drivers/clk/ti/clk-43xx.c >>>>> @@ -105,6 +105,12 @@ static struct ti_dt_clk am43xx_clks[] = { >>>>> DT_CLK(NULL, "func_12m_clk", "func_12m_clk"), >>>>> DT_CLK(NULL, "vtp_clk_div", "vtp_clk_div"), >>>>> DT_CLK(NULL, "usbphy_32khz_clkmux", "usbphy_32khz_clkmux"), >>>>> + DT_CLK("48300200.ehrpwm", "tbclk", "ehrpwm0_tbclk"), >>>>> + DT_CLK("48302200.ehrpwm", "tbclk", "ehrpwm1_tbclk"), >>>>> + DT_CLK("48304200.ehrpwm", "tbclk", "ehrpwm2_tbclk"), >>>>> + DT_CLK("48306200.ehrpwm", "tbclk", "ehrpwm3_tbclk"), >>>>> + DT_CLK("48308200.ehrpwm", "tbclk", "ehrpwm4_tbclk"), >>>>> + DT_CLK("4830a200.ehrpwm", "tbclk", "ehrpwm5_tbclk"), >>>>> { .node_name = NULL }, >>>>> }; >>>>> >>>>> >>>> >> > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-05-28 19:15 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-04-29 14:15 [PATCHv3] arm: dts: am43x-clock: add tbclk data for ehrpwm Sourav Poddar 2014-04-29 14:51 ` Tero Kristo 2014-05-01 19:00 ` Mike Turquette 2014-05-05 7:49 ` Tero Kristo 2014-05-19 13:20 ` Tero Kristo 2014-05-28 19:15 ` Mike Turquette
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).