Message ID | 062e8a534b1e372db7ed3daa3df7e3c5b885ffab.1400062517.git.nsekhar@ti.com |
---|---|
State | Accepted |
Commit | f7c66b7110227327cfddf22fe66c7ec1fe1d39e7 |
Headers | show |
On 05/14/2014 02:36 PM, Sekhar Nori wrote: > From: Afzal Mohammed <afzal@ti.com> > > Currently oscillator frequency is determined based on sysboot settings, > it may not be the case always. To determine it properly, efuse settings > also has to be read. CONTROL_STATUS register holds this information. > Bit 31: if 0, frequency to be determined based on sysboot > if 1, frequency to be determined based on efuse > Bit 29,30 - for efuse detection of frequency > Bit 22,23 - for sysboot detection of frequency > > Add clock nodes (mux) to determine oscillator frequency as above. > > Signed-off-by: Afzal Mohammed <afzal@ti.com> > Acked-by: Tero Kristo <t-kristo@ti.com> > Signed-off-by: Sekhar Nori <nsekhar@ti.com> Thanks, queued for 3.16. -Tero > --- > arch/arm/boot/dts/am43xx-clocks.dtsi | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/arch/arm/boot/dts/am43xx-clocks.dtsi b/arch/arm/boot/dts/am43xx-clocks.dtsi > index 142009c..71b029c 100644 > --- a/arch/arm/boot/dts/am43xx-clocks.dtsi > +++ b/arch/arm/boot/dts/am43xx-clocks.dtsi > @@ -11,6 +11,22 @@ > sys_clkin_ck: sys_clkin_ck { > #clock-cells = <0>; > compatible = "ti,mux-clock"; > + clocks = <&sysboot_freq_sel_ck>, <&crystal_freq_sel_ck>; > + ti,bit-shift = <31>; > + reg = <0x0040>; > + }; > + > + crystal_freq_sel_ck: crystal_freq_sel_ck { > + #clock-cells = <0>; > + compatible = "ti,mux-clock"; > + clocks = <&virt_19200000_ck>, <&virt_24000000_ck>, <&virt_25000000_ck>, <&virt_26000000_ck>; > + ti,bit-shift = <29>; > + reg = <0x0040>; > + }; > + > + sysboot_freq_sel_ck: sysboot_freq_sel_ck@44e10040 { > + #clock-cells = <0>; > + compatible = "ti,mux-clock"; > clocks = <&virt_19200000_ck>, <&virt_24000000_ck>, <&virt_25000000_ck>, <&virt_26000000_ck>; > ti,bit-shift = <22>; > reg = <0x0040>; > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/am43xx-clocks.dtsi b/arch/arm/boot/dts/am43xx-clocks.dtsi index 142009c..71b029c 100644 --- a/arch/arm/boot/dts/am43xx-clocks.dtsi +++ b/arch/arm/boot/dts/am43xx-clocks.dtsi @@ -11,6 +11,22 @@ sys_clkin_ck: sys_clkin_ck { #clock-cells = <0>; compatible = "ti,mux-clock"; + clocks = <&sysboot_freq_sel_ck>, <&crystal_freq_sel_ck>; + ti,bit-shift = <31>; + reg = <0x0040>; + }; + + crystal_freq_sel_ck: crystal_freq_sel_ck { + #clock-cells = <0>; + compatible = "ti,mux-clock"; + clocks = <&virt_19200000_ck>, <&virt_24000000_ck>, <&virt_25000000_ck>, <&virt_26000000_ck>; + ti,bit-shift = <29>; + reg = <0x0040>; + }; + + sysboot_freq_sel_ck: sysboot_freq_sel_ck@44e10040 { + #clock-cells = <0>; + compatible = "ti,mux-clock"; clocks = <&virt_19200000_ck>, <&virt_24000000_ck>, <&virt_25000000_ck>, <&virt_26000000_ck>; ti,bit-shift = <22>; reg = <0x0040>;