| Message ID | 20191016184954.14048-2-bparrot@ti.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3] ARM: dts: am43xx: add support for clkout1 clock | expand |
Tony Lindgren <tony@atomide.com> wrote on Tue [2019-Oct-22 08:48:16 -0700]: > * Benoit Parrot <bparrot@ti.com> [191016 18:47]: > > --- a/arch/arm/boot/dts/am43xx-clocks.dtsi > > +++ b/arch/arm/boot/dts/am43xx-clocks.dtsi > > @@ -704,6 +704,60 @@ > > ti,bit-shift = <8>; > > reg = <0x2a48>; > > }; > > + > > + clkout1_osc_div_ck: clkout1_osc_div_ck { > > + #clock-cells = <0>; > > + compatible = "ti,divider-clock"; > > + clocks = <&sys_clkin_ck>; > > + ti,bit-shift = <20>; > > + ti,max-div = <4>; > > + reg = <0x4100>; > > + }; > > Here too please describe why the clock names are not generic. Tero originally had this patch in the kernel so this is somewhat of a revert. Since these "clock" were removed. If the name syntax is no longer valid for some reason, then I will need a little more informations to proceed. Tero, can you assist here? Benoit > > Regards, > > Tony
On 22/10/2019 19:21, Benoit Parrot wrote: > Tony Lindgren <tony@atomide.com> wrote on Tue [2019-Oct-22 08:48:16 -0700]: >> * Benoit Parrot <bparrot@ti.com> [191016 18:47]: >>> --- a/arch/arm/boot/dts/am43xx-clocks.dtsi >>> +++ b/arch/arm/boot/dts/am43xx-clocks.dtsi >>> @@ -704,6 +704,60 @@ >>> ti,bit-shift = <8>; >>> reg = <0x2a48>; >>> }; >>> + >>> + clkout1_osc_div_ck: clkout1_osc_div_ck { >>> + #clock-cells = <0>; >>> + compatible = "ti,divider-clock"; >>> + clocks = <&sys_clkin_ck>; >>> + ti,bit-shift = <20>; >>> + ti,max-div = <4>; >>> + reg = <0x4100>; >>> + }; >> >> Here too please describe why the clock names are not generic. > > Tero originally had this patch in the kernel so this is somewhat of a > revert. Since these "clock" were removed. If the name syntax is no longer > valid for some reason, then I will need a little more informations to > proceed. > > Tero, can you assist here? This one is just following the naming convention of the rest of the clocks atm. If we need to fix all the underscore name clocks, that requires pretty much complete revamp of both the dts data + clock data under the clock driver, and it is not backwards compatible either. How should we tackle that one? We could maybe add support code in kernel to do s/-/_/g for the "new" clocks so that their parent-child relationships would be retained, and then convert the clocks in phases. -Tero > > Benoit > >> >> Regards, >> >> Tony -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
* Tony Lindgren <tony@atomide.com> [191022 16:56]: > * Tero Kristo <t-kristo@ti.com> [191022 16:48]: > > On 22/10/2019 19:21, Benoit Parrot wrote: > > > Tony Lindgren <tony@atomide.com> wrote on Tue [2019-Oct-22 08:48:16 -0700]: > > > > * Benoit Parrot <bparrot@ti.com> [191016 18:47]: > > > > > --- a/arch/arm/boot/dts/am43xx-clocks.dtsi > > > > > +++ b/arch/arm/boot/dts/am43xx-clocks.dtsi > > > > > @@ -704,6 +704,60 @@ > > > > > ti,bit-shift = <8>; > > > > > reg = <0x2a48>; > > > > > }; > > > > > + > > > > > + clkout1_osc_div_ck: clkout1_osc_div_ck { > > > > > + #clock-cells = <0>; > > > > > + compatible = "ti,divider-clock"; > > > > > + clocks = <&sys_clkin_ck>; > > > > > + ti,bit-shift = <20>; > > > > > + ti,max-div = <4>; > > > > > + reg = <0x4100>; > > > > > + }; > > > > > > > > Here too please describe why the clock names are not generic. > > > > > > Tero originally had this patch in the kernel so this is somewhat of a > > > revert. Since these "clock" were removed. If the name syntax is no longer > > > valid for some reason, then I will need a little more informations to > > > proceed. > > > > > > Tero, can you assist here? > > > > This one is just following the naming convention of the rest of the clocks > > atm. > > > > If we need to fix all the underscore name clocks, that requires pretty much > > complete revamp of both the dts data + clock data under the clock driver, > > and it is not backwards compatible either. How should we tackle that one? > > > > We could maybe add support code in kernel to do s/-/_/g for the "new" clocks > > so that their parent-child relationships would be retained, and then convert > > the clocks in phases. > > Well some of them can be fixed by configuring things based > on the compatible value and then the node name can be just > clock like it should be. > > Here too one option would be to add custom compatibles like: > > compatible = "ti,clkout1-osc-div", "ti,divider-clock"; > > And then have match data configure the rest. > > The other option would be to have lookup tables in the clock > driver based on the SoC and reg address. > > This is a hidden mine though.. We've hit it already several times, > and any dts clean-up effort has a chance of breaking things. Hmm maybe in this case just doing this is enough: clkout1_osc_div_ck: clock@4100 { ... } Or do all the TI clocks we have have a dependency to the node naming? Regards, Tony
On 30/10/2019 21:59, Benoit Parrot wrote: > Tony Lindgren <tony@atomide.com> wrote on Wed [2019-Oct-23 08:56:57 -0700]: >> * Tony Lindgren <tony@atomide.com> [191022 16:56]: >>> * Tero Kristo <t-kristo@ti.com> [191022 16:48]: >>>> On 22/10/2019 19:21, Benoit Parrot wrote: >>>>> Tony Lindgren <tony@atomide.com> wrote on Tue [2019-Oct-22 08:48:16 -0700]: >>>>>> * Benoit Parrot <bparrot@ti.com> [191016 18:47]: >>>>>>> --- a/arch/arm/boot/dts/am43xx-clocks.dtsi >>>>>>> +++ b/arch/arm/boot/dts/am43xx-clocks.dtsi >>>>>>> @@ -704,6 +704,60 @@ >>>>>>> ti,bit-shift = <8>; >>>>>>> reg = <0x2a48>; >>>>>>> }; >>>>>>> + >>>>>>> + clkout1_osc_div_ck: clkout1_osc_div_ck { >>>>>>> + #clock-cells = <0>; >>>>>>> + compatible = "ti,divider-clock"; >>>>>>> + clocks = <&sys_clkin_ck>; >>>>>>> + ti,bit-shift = <20>; >>>>>>> + ti,max-div = <4>; >>>>>>> + reg = <0x4100>; >>>>>>> + }; >>>>>> >>>>>> Here too please describe why the clock names are not generic. >>>>> >>>>> Tero originally had this patch in the kernel so this is somewhat of a >>>>> revert. Since these "clock" were removed. If the name syntax is no longer >>>>> valid for some reason, then I will need a little more informations to >>>>> proceed. >>>>> >>>>> Tero, can you assist here? >>>> >>>> This one is just following the naming convention of the rest of the clocks >>>> atm. >>>> >>>> If we need to fix all the underscore name clocks, that requires pretty much >>>> complete revamp of both the dts data + clock data under the clock driver, >>>> and it is not backwards compatible either. How should we tackle that one? >>>> >>>> We could maybe add support code in kernel to do s/-/_/g for the "new" clocks >>>> so that their parent-child relationships would be retained, and then convert >>>> the clocks in phases. >>> >>> Well some of them can be fixed by configuring things based >>> on the compatible value and then the node name can be just >>> clock like it should be. >>> >>> Here too one option would be to add custom compatibles like: >>> >>> compatible = "ti,clkout1-osc-div", "ti,divider-clock"; >>> >>> And then have match data configure the rest. >>> >>> The other option would be to have lookup tables in the clock >>> driver based on the SoC and reg address. >>> >>> This is a hidden mine though.. We've hit it already several times, >>> and any dts clean-up effort has a chance of breaking things. >> >> Hmm maybe in this case just doing this is enough: >> >> clkout1_osc_div_ck: clock@4100 { >> ... >> } > > But then we would end up with 6 clock node with the same name "clock@4100", > doesn't pose a problem somewhere? Yeah, clk core would not know which one to use then. > > Tero? > > Benoit > >> >> Or do all the TI clocks we have have a dependency to the >> node naming? This is a feature of clock core. Clock parents need to have distinct names, otherwise it won't work. -Tero -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
* Tero Kristo <t-kristo@ti.com> [191031 14:07]: > On 30/10/2019 21:59, Benoit Parrot wrote: > > Tony Lindgren <tony@atomide.com> wrote on Wed [2019-Oct-23 08:56:57 -0700]: > > > Hmm maybe in this case just doing this is enough: > > > > > > clkout1_osc_div_ck: clock@4100 { > > > ... > > > } > > > > But then we would end up with 6 clock node with the same name "clock@4100", > > doesn't pose a problem somewhere? > > Yeah, clk core would not know which one to use then. So we have two issues with the non-standard devicetree use for omap clocks: 1. Multiple clock nodes with the same reg property This we sorted out for the clkctrl binding, but we still have other clocks with this issue. I guess some of them can be now removed if they are just legacy clkctrl clocks. For the rest we could maybe group them under a node with just one reg property? The clocks could just look up the reg property from parent in this case. 2. Dependency to using custom clock node names This can be sorted out by adding custom compatibles to the parent node for both clkctrl clock manger nodes and for the clocks grouped in step #1 above I think. > > > Or do all the TI clocks we have have a dependency to the > > > node naming? > > This is a feature of clock core. Clock parents need to have distinct names, > otherwise it won't work. With steps #1 and #2 above I think this issue would also disappear, the clock framework naming could be like what we already use for the clkctrl clocks. Regards, Tony
diff --git a/arch/arm/boot/dts/am43xx-clocks.dtsi b/arch/arm/boot/dts/am43xx-clocks.dtsi index 091356f2a8c1..944b142dafd2 100644 --- a/arch/arm/boot/dts/am43xx-clocks.dtsi +++ b/arch/arm/boot/dts/am43xx-clocks.dtsi @@ -704,6 +704,60 @@ ti,bit-shift = <8>; reg = <0x2a48>; }; + + clkout1_osc_div_ck: clkout1_osc_div_ck { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&sys_clkin_ck>; + ti,bit-shift = <20>; + ti,max-div = <4>; + reg = <0x4100>; + }; + + clkout1_src2_mux_ck: clkout1_src2_mux_ck { + #clock-cells = <0>; + compatible = "ti,mux-clock"; + clocks = <&clk_rc32k_ck>, <&sysclk_div>, <&dpll_ddr_m2_ck>, + <&dpll_per_m2_ck>, <&dpll_disp_m2_ck>, + <&dpll_mpu_m2_ck>; + reg = <0x4100>; + }; + + clkout1_src2_pre_div_ck: clkout1_src2_pre_div_ck { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&clkout1_src2_mux_ck>; + ti,bit-shift = <4>; + ti,max-div = <8>; + reg = <0x4100>; + }; + + clkout1_src2_post_div_ck: clkout1_src2_post_div_ck { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&clkout1_src2_pre_div_ck>; + ti,bit-shift = <8>; + ti,max-div = <32>; + ti,index-power-of-two; + reg = <0x4100>; + }; + + clkout1_mux_ck: clkout1_mux_ck { + #clock-cells = <0>; + compatible = "ti,mux-clock"; + clocks = <&clkout1_osc_div_ck>, <&clk_rc32k_ck>, + <&clkout1_src2_post_div_ck>, <&dpll_extdev_m2_ck>; + ti,bit-shift = <16>; + reg = <0x4100>; + }; + + clkout1_ck: clkout1_ck { + #clock-cells = <0>; + compatible = "ti,gate-clock"; + clocks = <&clkout1_mux_ck>; + ti,bit-shift = <23>; + reg = <0x4100>; + }; }; &prcm {