Enable dm814x and dra62x clock driver. This branch has a dependency
to the clk-ti branch from the Linux clk tree for the ADPLL clock driver. Otherwise things won't keep booting properly when we flip over to use the clock driver instead of fixed clocks set up by the bootloader. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJW2MN/AAoJEBvUPslcq6VzVqEP/A2qxFhMYyf/q0Za54RNRHjj iHbpxmfPUrFIGO/IQqkk7bl5Ufgs+L+uW+mjoe0CvIYGEoVDY/cfe3AZW734cGMO rLbs3CovoHst2UTZbcKVRs/QjkN+R9nvowvvqK87vSbpAbMX7pRrEcfZSN77T4ej vRbtRyD0msNCm8s0TgdpQ6ObK0GHmfqtq3GFA/g5Rs5m1X7h9PaD+PWUsVDugKyM 9bEmGZSyOaRN5qGrOX/PTTKK3OiCOSJXB/8tnRgNW7DaISop+KJwxzMhBHyx2iKP JaD5lDJk/ArE+4Za0FmSpug8muUHLHH+htCu76uU6qi/s7+q8g9UR9ewzfLg7/rG wYl8IwDBVxWbi5PLnHPRrghGheEkM2ykiqEp5DqlZ1B7vfGv4Wl/3ZxiL1ZO5FZv jre1yHm5sguLCtA6BErWi69SCI3rpi4GrDQuYnlAbg9ABRH+YBVZ+3lCqtBVyh6J 5yHexIELEEOUHHT2KLPNi7HexzK6xtMpsh4QlP1Yxt2o6dVI2LmTS+oKtU6QAjSn WE5pbLd9XZUBaDO4jw3T01edhGVpf2OxmtGSOd/ptF5JjZoDA2Kg+NcDE0eTPL72 v7yVlNVU3g8PlD1EfRENi/KL0K4GLNq3eT2WCFQYp/nYuN1dVkk5xraEv3w7N0iZ vGlh9twbt7VvjiGoImcF =2Lew -----END PGP SIGNATURE----- Merge tag 'omap-for-v4.6/dt-ti81xx-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Enable dm814x and dra62x clock driver. This branch has a dependency to the clk-ti branch from the Linux clk tree for the ADPLL clock driver. Otherwise things won't keep booting properly when we flip over to use the clock driver instead of fixed clocks set up by the bootloader. * tag 'omap-for-v4.6/dt-ti81xx-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: Add clocks for dm814x ADPLL Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
d81e72c521
|
@ -4,6 +4,157 @@
|
||||||
* published by the Free Software Foundation.
|
* published by the Free Software Foundation.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
&pllss {
|
||||||
|
/*
|
||||||
|
* See TRM "2.6.10 Connected outputso DPLLS" and
|
||||||
|
* "2.6.11 Connected Outputs of DPLLJ". Only clkout is
|
||||||
|
* connected except for hdmi and usb.
|
||||||
|
*/
|
||||||
|
adpll_mpu_ck: adpll@40 {
|
||||||
|
#clock-cells = <1>;
|
||||||
|
compatible = "ti,dm814-adpll-s-clock";
|
||||||
|
reg = <0x40 0x40>;
|
||||||
|
clocks = <&devosc_ck &devosc_ck &devosc_ck>;
|
||||||
|
clock-names = "clkinp", "clkinpulow", "clkinphif";
|
||||||
|
clock-output-names = "481c5040.adpll.dcoclkldo",
|
||||||
|
"481c5040.adpll.clkout",
|
||||||
|
"481c5040.adpll.clkoutx2",
|
||||||
|
"481c5040.adpll.clkouthif";
|
||||||
|
};
|
||||||
|
|
||||||
|
adpll_dsp_ck: adpll@80 {
|
||||||
|
#clock-cells = <1>;
|
||||||
|
compatible = "ti,dm814-adpll-lj-clock";
|
||||||
|
reg = <0x80 0x30>;
|
||||||
|
clocks = <&devosc_ck &devosc_ck>;
|
||||||
|
clock-names = "clkinp", "clkinpulow";
|
||||||
|
clock-output-names = "481c5080.adpll.dcoclkldo",
|
||||||
|
"481c5080.adpll.clkout",
|
||||||
|
"481c5080.adpll.clkoutldo";
|
||||||
|
};
|
||||||
|
|
||||||
|
adpll_sgx_ck: adpll@b0 {
|
||||||
|
#clock-cells = <1>;
|
||||||
|
compatible = "ti,dm814-adpll-lj-clock";
|
||||||
|
reg = <0xb0 0x30>;
|
||||||
|
clocks = <&devosc_ck &devosc_ck>;
|
||||||
|
clock-names = "clkinp", "clkinpulow";
|
||||||
|
clock-output-names = "481c50b0.adpll.dcoclkldo",
|
||||||
|
"481c50b0.adpll.clkout",
|
||||||
|
"481c50b0.adpll.clkoutldo";
|
||||||
|
};
|
||||||
|
|
||||||
|
adpll_hdvic_ck: adpll@e0 {
|
||||||
|
#clock-cells = <1>;
|
||||||
|
compatible = "ti,dm814-adpll-lj-clock";
|
||||||
|
reg = <0xe0 0x30>;
|
||||||
|
clocks = <&devosc_ck &devosc_ck>;
|
||||||
|
clock-names = "clkinp", "clkinpulow";
|
||||||
|
clock-output-names = "481c50e0.adpll.dcoclkldo",
|
||||||
|
"481c50e0.adpll.clkout",
|
||||||
|
"481c50e0.adpll.clkoutldo";
|
||||||
|
};
|
||||||
|
|
||||||
|
adpll_l3_ck: adpll@110 {
|
||||||
|
#clock-cells = <1>;
|
||||||
|
compatible = "ti,dm814-adpll-lj-clock";
|
||||||
|
reg = <0x110 0x30>;
|
||||||
|
clocks = <&devosc_ck &devosc_ck>;
|
||||||
|
clock-names = "clkinp", "clkinpulow";
|
||||||
|
clock-output-names = "481c5110.adpll.dcoclkldo",
|
||||||
|
"481c5110.adpll.clkout",
|
||||||
|
"481c5110.adpll.clkoutldo";
|
||||||
|
};
|
||||||
|
|
||||||
|
adpll_isp_ck: adpll@140 {
|
||||||
|
#clock-cells = <1>;
|
||||||
|
compatible = "ti,dm814-adpll-lj-clock";
|
||||||
|
reg = <0x140 0x30>;
|
||||||
|
clocks = <&devosc_ck &devosc_ck>;
|
||||||
|
clock-names = "clkinp", "clkinpulow";
|
||||||
|
clock-output-names = "481c5140.adpll.dcoclkldo",
|
||||||
|
"481c5140.adpll.clkout",
|
||||||
|
"481c5140.adpll.clkoutldo";
|
||||||
|
};
|
||||||
|
|
||||||
|
adpll_dss_ck: adpll@170 {
|
||||||
|
#clock-cells = <1>;
|
||||||
|
compatible = "ti,dm814-adpll-lj-clock";
|
||||||
|
reg = <0x170 0x30>;
|
||||||
|
clocks = <&devosc_ck &devosc_ck>;
|
||||||
|
clock-names = "clkinp", "clkinpulow";
|
||||||
|
clock-output-names = "481c5170.adpll.dcoclkldo",
|
||||||
|
"481c5170.adpll.clkout",
|
||||||
|
"481c5170.adpll.clkoutldo";
|
||||||
|
};
|
||||||
|
|
||||||
|
adpll_video0_ck: adpll@1a0 {
|
||||||
|
#clock-cells = <1>;
|
||||||
|
compatible = "ti,dm814-adpll-lj-clock";
|
||||||
|
reg = <0x1a0 0x30>;
|
||||||
|
clocks = <&devosc_ck &devosc_ck>;
|
||||||
|
clock-names = "clkinp", "clkinpulow";
|
||||||
|
clock-output-names = "481c51a0.adpll.dcoclkldo",
|
||||||
|
"481c51a0.adpll.clkout",
|
||||||
|
"481c51a0.adpll.clkoutldo";
|
||||||
|
};
|
||||||
|
|
||||||
|
adpll_video1_ck: adpll@1d0 {
|
||||||
|
#clock-cells = <1>;
|
||||||
|
compatible = "ti,dm814-adpll-lj-clock";
|
||||||
|
reg = <0x1d0 0x30>;
|
||||||
|
clocks = <&devosc_ck &devosc_ck>;
|
||||||
|
clock-names = "clkinp", "clkinpulow";
|
||||||
|
clock-output-names = "481c51d0.adpll.dcoclkldo",
|
||||||
|
"481c51d0.adpll.clkout",
|
||||||
|
"481c51d0.adpll.clkoutldo";
|
||||||
|
};
|
||||||
|
|
||||||
|
adpll_hdmi_ck: adpll@200 {
|
||||||
|
#clock-cells = <1>;
|
||||||
|
compatible = "ti,dm814-adpll-lj-clock";
|
||||||
|
reg = <0x200 0x30>;
|
||||||
|
clocks = <&devosc_ck &devosc_ck>;
|
||||||
|
clock-names = "clkinp", "clkinpulow";
|
||||||
|
clock-output-names = "481c5200.adpll.dcoclkldo",
|
||||||
|
"481c5200.adpll.clkout",
|
||||||
|
"481c5200.adpll.clkoutldo";
|
||||||
|
};
|
||||||
|
|
||||||
|
adpll_audio_ck: adpll@230 {
|
||||||
|
#clock-cells = <1>;
|
||||||
|
compatible = "ti,dm814-adpll-lj-clock";
|
||||||
|
reg = <0x230 0x30>;
|
||||||
|
clocks = <&devosc_ck &devosc_ck>;
|
||||||
|
clock-names = "clkinp", "clkinpulow";
|
||||||
|
clock-output-names = "481c5230.adpll.dcoclkldo",
|
||||||
|
"481c5230.adpll.clkout",
|
||||||
|
"481c5230.adpll.clkoutldo";
|
||||||
|
};
|
||||||
|
|
||||||
|
adpll_usb_ck: adpll@260 {
|
||||||
|
#clock-cells = <1>;
|
||||||
|
compatible = "ti,dm814-adpll-lj-clock";
|
||||||
|
reg = <0x260 0x30>;
|
||||||
|
clocks = <&devosc_ck &devosc_ck>;
|
||||||
|
clock-names = "clkinp", "clkinpulow";
|
||||||
|
clock-output-names = "481c5260.adpll.dcoclkldo",
|
||||||
|
"481c5260.adpll.clkout",
|
||||||
|
"481c5260.adpll.clkoutldo";
|
||||||
|
};
|
||||||
|
|
||||||
|
adpll_ddr_ck: adpll@290 {
|
||||||
|
#clock-cells = <1>;
|
||||||
|
compatible = "ti,dm814-adpll-lj-clock";
|
||||||
|
reg = <0x290 0x30>;
|
||||||
|
clocks = <&devosc_ck &devosc_ck>;
|
||||||
|
clock-names = "clkinp", "clkinpulow";
|
||||||
|
clock-output-names = "481c5290.adpll.dcoclkldo",
|
||||||
|
"481c5290.adpll.clkout",
|
||||||
|
"481c5290.adpll.clkoutldo";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
&pllss_clocks {
|
&pllss_clocks {
|
||||||
timer1_fck: timer1_fck@2e0 {
|
timer1_fck: timer1_fck@2e0 {
|
||||||
#clock-cells = <0>;
|
#clock-cells = <0>;
|
||||||
|
@ -23,6 +174,24 @@
|
||||||
reg = <0x2e0>;
|
reg = <0x2e0>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* CPTS_RFT_CLK in RMII_REFCLK_SRC, usually sourced from auiod */
|
||||||
|
cpsw_cpts_rft_clk: cpsw_cpts_rft_clk {
|
||||||
|
#clock-cells = <0>;
|
||||||
|
compatible = "ti,mux-clock";
|
||||||
|
clocks = <&adpll_video0_ck 1
|
||||||
|
&adpll_video1_ck 1
|
||||||
|
&adpll_audio_ck 1>;
|
||||||
|
ti,bit-shift = <1>;
|
||||||
|
reg = <0x2e8>;
|
||||||
|
};
|
||||||
|
|
||||||
|
/* REVISIT: Set up with a proper mux using RMII_REFCLK_SRC */
|
||||||
|
cpsw_125mhz_gclk: cpsw_125mhz_gclk {
|
||||||
|
#clock-cells = <0>;
|
||||||
|
compatible = "fixed-clock";
|
||||||
|
clock-frequency = <125000000>;
|
||||||
|
};
|
||||||
|
|
||||||
sysclk18_ck: sysclk18_ck@2f0 {
|
sysclk18_ck: sysclk18_ck@2f0 {
|
||||||
#clock-cells = <0>;
|
#clock-cells = <0>;
|
||||||
compatible = "ti,mux-clock";
|
compatible = "ti,mux-clock";
|
||||||
|
@ -79,37 +248,6 @@
|
||||||
compatible = "fixed-clock";
|
compatible = "fixed-clock";
|
||||||
clock-frequency = <1000000000>;
|
clock-frequency = <1000000000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
sysclk4_ck: sysclk4_ck {
|
|
||||||
#clock-cells = <0>;
|
|
||||||
compatible = "fixed-clock";
|
|
||||||
clock-frequency = <222000000>;
|
|
||||||
};
|
|
||||||
|
|
||||||
sysclk6_ck: sysclk6_ck {
|
|
||||||
#clock-cells = <0>;
|
|
||||||
compatible = "fixed-clock";
|
|
||||||
clock-frequency = <100000000>;
|
|
||||||
};
|
|
||||||
|
|
||||||
sysclk10_ck: sysclk10_ck {
|
|
||||||
#clock-cells = <0>;
|
|
||||||
compatible = "fixed-clock";
|
|
||||||
clock-frequency = <48000000>;
|
|
||||||
};
|
|
||||||
|
|
||||||
cpsw_125mhz_gclk: cpsw_125mhz_gclk {
|
|
||||||
#clock-cells = <0>;
|
|
||||||
compatible = "fixed-clock";
|
|
||||||
clock-frequency = <125000000>;
|
|
||||||
};
|
|
||||||
|
|
||||||
cpsw_cpts_rft_clk: cpsw_cpts_rft_clk {
|
|
||||||
#clock-cells = <0>;
|
|
||||||
compatible = "fixed-clock";
|
|
||||||
clock-frequency = <250000000>;
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
&prcm_clocks {
|
&prcm_clocks {
|
||||||
|
@ -138,6 +276,49 @@
|
||||||
clock-div = <78125>;
|
clock-div = <78125>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* L4_HS 220 MHz*/
|
||||||
|
sysclk4_ck: sysclk4_ck {
|
||||||
|
#clock-cells = <0>;
|
||||||
|
compatible = "ti,fixed-factor-clock";
|
||||||
|
clocks = <&adpll_l3_ck 1>;
|
||||||
|
ti,clock-mult = <1>;
|
||||||
|
ti,clock-div = <1>;
|
||||||
|
};
|
||||||
|
|
||||||
|
/* L4_FWCFG */
|
||||||
|
sysclk5_ck: sysclk5_ck {
|
||||||
|
#clock-cells = <0>;
|
||||||
|
compatible = "ti,fixed-factor-clock";
|
||||||
|
clocks = <&adpll_l3_ck 1>;
|
||||||
|
ti,clock-mult = <1>;
|
||||||
|
ti,clock-div = <2>;
|
||||||
|
};
|
||||||
|
|
||||||
|
/* L4_LS 110 MHz */
|
||||||
|
sysclk6_ck: sysclk6_ck {
|
||||||
|
#clock-cells = <0>;
|
||||||
|
compatible = "ti,fixed-factor-clock";
|
||||||
|
clocks = <&adpll_l3_ck 1>;
|
||||||
|
ti,clock-mult = <1>;
|
||||||
|
ti,clock-div = <2>;
|
||||||
|
};
|
||||||
|
|
||||||
|
sysclk8_ck: sysclk8_ck {
|
||||||
|
#clock-cells = <0>;
|
||||||
|
compatible = "ti,fixed-factor-clock";
|
||||||
|
clocks = <&adpll_usb_ck 1>;
|
||||||
|
ti,clock-mult = <1>;
|
||||||
|
ti,clock-div = <1>;
|
||||||
|
};
|
||||||
|
|
||||||
|
sysclk10_ck: sysclk10_ck {
|
||||||
|
compatible = "ti,divider-clock";
|
||||||
|
reg = <0x324>;
|
||||||
|
ti,max-div = <7>;
|
||||||
|
#clock-cells = <0>;
|
||||||
|
clocks = <&adpll_usb_ck 1>;
|
||||||
|
};
|
||||||
|
|
||||||
aud_clkin0_ck: aud_clkin0_ck {
|
aud_clkin0_ck: aud_clkin0_ck {
|
||||||
#clock-cells = <0>;
|
#clock-cells = <0>;
|
||||||
compatible = "fixed-clock";
|
compatible = "fixed-clock";
|
||||||
|
|
|
@ -6,6 +6,32 @@
|
||||||
|
|
||||||
#include "dm814x-clocks.dtsi"
|
#include "dm814x-clocks.dtsi"
|
||||||
|
|
||||||
|
/* Compared to dm814x, dra62x does not have hdic, l3 or dss PLLs */
|
||||||
|
&adpll_hdvic_ck {
|
||||||
|
status = "disabled";
|
||||||
|
};
|
||||||
|
|
||||||
|
&adpll_l3_ck {
|
||||||
|
status = "disabled";
|
||||||
|
};
|
||||||
|
|
||||||
|
&adpll_dss_ck {
|
||||||
|
status = "disabled";
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Compared to dm814x, dra62x has interconnect clocks on isp PLL */
|
||||||
|
&sysclk4_ck {
|
||||||
|
clocks = <&adpll_isp_ck 1>;
|
||||||
|
};
|
||||||
|
|
||||||
|
&sysclk5_ck {
|
||||||
|
clocks = <&adpll_isp_ck 1>;
|
||||||
|
};
|
||||||
|
|
||||||
|
&sysclk6_ck {
|
||||||
|
clocks = <&adpll_isp_ck 1>;
|
||||||
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Compared to dm814x, dra62x has different shifts and more mux options.
|
* Compared to dm814x, dra62x has different shifts and more mux options.
|
||||||
* Please add the extra options for ysclk_14 and 16 if really needed.
|
* Please add the extra options for ysclk_14 and 16 if really needed.
|
||||||
|
|
Loading…
Reference in a new issue