| Message ID | 20191112142929.23058-2-bparrot@ti.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 01053dadb79d63b65f7b353e68b4b6ccf4effedb |
| Headers | show |
| Series | ARM: dts: am43x-vpfe/ov2659.patch | expand |
* Benoit Parrot <bparrot@ti.com> [191112 14:30]: > From: Tero Kristo <t-kristo@ti.com> > > clkout1 clock node and its generation tree was missing. Add this based > on the data on TRM and PRCM functional spec. > > commit 664ae1ab2536 ("ARM: dts: am43xx: add clkctrl nodes") effectively > reverted this commit 8010f13a40d3 ("ARM: dts: am43xx: add support for > clkout1 clock") which is needed for the ov2659 camera sensor clock > definition hence it is being re-applied here. > > Note that because of the current dts node name dependency for mapping to > clock domain, we must still use "clkout1-*ck" naming instead of generic > "clock@" naming for the node. And because of this, it's probably best to > apply the dts node addition together along with the other clock changes. > > Fixes: 664ae1ab2536 ("ARM: dts: am43xx: add clkctrl nodes") > Signed-off-by: Tero Kristo <t-kristo@ti.com> > Tested-by: Benoit Parrot <bparrot@ti.com> > Signed-off-by: Tony Lindgren <tony@atomide.com> Hmm I don't think I did any work on this, the above should be: Acked-by: Tony Lindgren <tony@atomide.com> > Signed-off-by: Benoit Parrot <bparrot@ti.com> > --- > arch/arm/boot/dts/am43xx-clocks.dtsi | 54 ++++++++++++++++++++++++++++ > 1 file changed, 54 insertions(+) > > diff --git a/arch/arm/boot/dts/am43xx-clocks.dtsi b/arch/arm/boot/dts/am43xx-clocks.dtsi > index 091356f2a8c1..c726cd8dbdf1 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 { > -- > 2.17.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/arch/arm/boot/dts/am43xx-clocks.dtsi b/arch/arm/boot/dts/am43xx-clocks.dtsi index 091356f2a8c1..c726cd8dbdf1 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 {