Skip to content

L
linux
Commit 664ae1ab authored by Tero Kristo's avatar Tero Kristo Committed by Tony Lindgren
Browse files
Options

ARM: dts: am43xx: add clkctrl nodes 

Add clkctrl nodes for AM43xx SoC. These are going to be acting as
replacement for part of the existing clock data and the existing
clkctrl hooks under hwmod data.

This patch also removes any obsolete clock nodes, and reroutes all users
for these to use the new clkctrl clocks instead.
Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 0537634f
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 164 deletions
arch/arm/boot/dts/am4372.dtsi
View file @ 664ae1ab
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/am4.h>
/ { / {
compatible = "ti,am4372", "ti,am43"; compatible = "ti,am4372", "ti,am43";
...@@ -998,7 +999,7 @@ usb2_phy1: phy@483a8000 { ...@@ -998,7 +999,7 @@ usb2_phy1: phy@483a8000 {
reg = <0x483a8000 0x8000>; reg = <0x483a8000 0x8000>;
syscon-phy-power = <&scm_conf 0x620>; syscon-phy-power = <&scm_conf 0x620>;
clocks = <&usb_phy0_always_on_clk32k>, clocks = <&usb_phy0_always_on_clk32k>,
<&usb_otg_ss0_refclk960m>; <&l4_per_clkctrl AM4_USB_OTG_SS0_CLKCTRL 8>;
clock-names = "wkupclk", "refclk"; clock-names = "wkupclk", "refclk";
#phy-cells = <0>; #phy-cells = <0>;
status = "disabled"; status = "disabled";
...@@ -1017,7 +1018,7 @@ usb2_phy2: phy@483e8000 { ...@@ -1017,7 +1018,7 @@ usb2_phy2: phy@483e8000 {
reg = <0x483e8000 0x8000>; reg = <0x483e8000 0x8000>;
syscon-phy-power = <&scm_conf 0x628>; syscon-phy-power = <&scm_conf 0x628>;
clocks = <&usb_phy1_always_on_clk32k>, clocks = <&usb_phy1_always_on_clk32k>,
<&usb_otg_ss1_refclk960m>; <&l4_per_clkctrl AM4_USB_OTG_SS1_CLKCTRL 8>;
clock-names = "wkupclk", "refclk"; clock-names = "wkupclk", "refclk";
#phy-cells = <0>; #phy-cells = <0>;
status = "disabled"; status = "disabled";
...@@ -1180,4 +1181,4 @@ vpfe1: vpfe@48328000 { ...@@ -1180,4 +1181,4 @@ vpfe1: vpfe@48328000 {
}; };
}; };
/include/ "am43xx-clocks.dtsi" #include "am43xx-clocks.dtsi"
arch/arm/boot/dts/am43x-epos-evm.dts
View file @ 664ae1ab
...@@ -985,7 +985,7 @@ &mcasp1 { ...@@ -985,7 +985,7 @@ &mcasp1 {
rx-num-evt = <32>; rx-num-evt = <32>;
}; };
&synctimer_32kclk { &mux_synctimer32k_ck {
assigned-clocks = <&mux_synctimer32k_ck>; assigned-clocks = <&mux_synctimer32k_ck>;
assigned-clock-parents = <&clkdiv32k_ick>; assigned-clock-parents = <&clkdiv32k_ick>;
}; };
arch/arm/boot/dts/am43xx-clocks.dtsi
View file @ 664ae1ab
...@@ -524,54 +524,6 @@ gpio0_dbclk_mux_ck: gpio0_dbclk_mux_ck@4240 { ...@@ -524,54 +524,6 @@ gpio0_dbclk_mux_ck: gpio0_dbclk_mux_ck@4240 {
reg = <0x4240>; reg = <0x4240>;
}; };
gpio0_dbclk: gpio0_dbclk@2b68 {
#clock-cells = <0>;
compatible = "ti,gate-clock";
clocks = <&gpio0_dbclk_mux_ck>;
ti,bit-shift = <8>;
reg = <0x2b68>;
};
gpio1_dbclk: gpio1_dbclk@8c78 {
#clock-cells = <0>;
compatible = "ti,gate-clock";
clocks = <&clkdiv32k_ick>;
ti,bit-shift = <8>;
reg = <0x8c78>;
};
gpio2_dbclk: gpio2_dbclk@8c80 {
#clock-cells = <0>;
compatible = "ti,gate-clock";
clocks = <&clkdiv32k_ick>;
ti,bit-shift = <8>;
reg = <0x8c80>;
};
gpio3_dbclk: gpio3_dbclk@8c88 {
#clock-cells = <0>;
compatible = "ti,gate-clock";
clocks = <&clkdiv32k_ick>;
ti,bit-shift = <8>;
reg = <0x8c88>;
};
gpio4_dbclk: gpio4_dbclk@8c90 {
#clock-cells = <0>;
compatible = "ti,gate-clock";
clocks = <&clkdiv32k_ick>;
ti,bit-shift = <8>;
reg = <0x8c90>;
};
gpio5_dbclk: gpio5_dbclk@8c98 {
#clock-cells = <0>;
compatible = "ti,gate-clock";
clocks = <&clkdiv32k_ick>;
ti,bit-shift = <8>;
reg = <0x8c98>;
};
mmc_clk: mmc_clk { mmc_clk: mmc_clk {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "fixed-factor-clock"; compatible = "fixed-factor-clock";
...@@ -629,14 +581,6 @@ mux_synctimer32k_ck: mux_synctimer32k_ck@4230 { ...@@ -629,14 +581,6 @@ mux_synctimer32k_ck: mux_synctimer32k_ck@4230 {
reg = <0x4230>; reg = <0x4230>;
}; };
synctimer_32kclk: synctimer_32kclk@2a30 {
#clock-cells = <0>;
compatible = "ti,gate-clock";
clocks = <&mux_synctimer32k_ck>;
ti,bit-shift = <8>;
reg = <0x2a30>;
};
timer8_fck: timer8_fck@421c { timer8_fck: timer8_fck@421c {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "ti,mux-clock"; compatible = "ti,mux-clock";
...@@ -763,110 +707,76 @@ usb_phy1_always_on_clk32k: usb_phy1_always_on_clk32k@2a48 { ...@@ -763,110 +707,76 @@ usb_phy1_always_on_clk32k: usb_phy1_always_on_clk32k@2a48 {
ti,bit-shift = <8>; ti,bit-shift = <8>;
reg = <0x2a48>; reg = <0x2a48>;
}; };
};
usb_otg_ss0_refclk960m: usb_otg_ss0_refclk960m@8a60 { &prcm {
#clock-cells = <0>; l4_wkup_cm: l4_wkup_cm@2800 {
compatible = "ti,gate-clock"; compatible = "ti,omap4-cm";
clocks = <&dpll_per_clkdcoldo>; reg = <0x2800 0x400>;
ti,bit-shift = <8>; #address-cells = <1>;
reg = <0x8a60>; #size-cells = <1>;
}; ranges = <0 0x2800 0x400>;
usb_otg_ss1_refclk960m: usb_otg_ss1_refclk960m@8a68 { l4_wkup_clkctrl: clk@20 {
#clock-cells = <0>; compatible = "ti,clkctrl";
compatible = "ti,gate-clock"; reg = <0x20 0x34c>;
clocks = <&dpll_per_clkdcoldo>; #clock-cells = <2>;
ti,bit-shift = <8>; };
reg = <0x8a68>; };
};
mpu_cm: mpu_cm@8300 {
clkout1_osc_div_ck: clkout1_osc_div_ck { compatible = "ti,omap4-cm";
#clock-cells = <0>; reg = <0x8300 0x100>;
compatible = "ti,divider-clock"; #address-cells = <1>;
clocks = <&sys_clkin_ck>; #size-cells = <1>;
ti,bit-shift = <20>; ranges = <0 0x8300 0x100>;
ti,max-div = <4>;
reg = <0x4100>; mpu_clkctrl: clk@20 {
}; compatible = "ti,clkctrl";
reg = <0x20 0x4>;
clkout1_src2_mux_ck: clkout1_src2_mux_ck { #clock-cells = <2>;
#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>, gfx_l3_cm: gfx_l3_cm@8400 {
<&dpll_mpu_m2_ck>; compatible = "ti,omap4-cm";
reg = <0x4100>; reg = <0x8400 0x100>;
}; #address-cells = <1>;
#size-cells = <1>;
clkout1_src2_pre_div_ck: clkout1_src2_pre_div_ck { ranges = <0 0x8400 0x100>;
#clock-cells = <0>;
compatible = "ti,divider-clock"; gfx_l3_clkctrl: clk@20 {
clocks = <&clkout1_src2_mux_ck>; compatible = "ti,clkctrl";
ti,bit-shift = <4>; reg = <0x20 0x4>;
ti,max-div = <8>; #clock-cells = <2>;
reg = <0x4100>; };
}; };
clkout1_src2_post_div_ck: clkout1_src2_post_div_ck { l4_rtc_cm: l4_rtc_cm@8500 {
#clock-cells = <0>; compatible = "ti,omap4-cm";
compatible = "ti,divider-clock"; reg = <0x8500 0x100>;
clocks = <&clkout1_src2_pre_div_ck>; #address-cells = <1>;
ti,bit-shift = <8>; #size-cells = <1>;
ti,max-div = <32>; ranges = <0 0x8500 0x100>;
ti,index-power-of-two;
reg = <0x4100>; l4_rtc_clkctrl: clk@20 {
}; compatible = "ti,clkctrl";
reg = <0x20 0x4>;
clkout1_mux_ck: clkout1_mux_ck { #clock-cells = <2>;
#clock-cells = <0>; };
compatible = "ti,mux-clock"; };
clocks = <&clkout1_osc_div_ck>, <&clk_rc32k_ck>,
<&clkout1_src2_post_div_ck>, <&dpll_extdev_m2_ck>; l4_per_cm: l4_per_cm@8800 {
ti,bit-shift = <16>; compatible = "ti,omap4-cm";
reg = <0x4100>; reg = <0x8800 0xc00>;
}; #address-cells = <1>;
#size-cells = <1>;
clkout1_ck: clkout1_ck { ranges = <0 0x8800 0xc00>;
#clock-cells = <0>;
compatible = "ti,gate-clock"; l4_per_clkctrl: clk@20 {
clocks = <&clkout1_mux_ck>; compatible = "ti,clkctrl";
ti,bit-shift = <23>; reg = <0x20 0xb04>;
reg = <0x4100>; #clock-cells = <2>;
}; };
clkout2_src_mux_ck: clkout2_src_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>, <&dpll_extdev_ck>;
reg = <0x4108>;
};
clkout2_pre_div_ck: clkout2_pre_div_ck {
#clock-cells = <0>;
compatible = "ti,divider-clock";
clocks = <&clkout2_src_mux_ck>;
ti,bit-shift = <4>;
ti,max-div = <8>;
reg = <0x4108>;
};
clkout2_post_div_ck: clkout2_post_div_ck {
#clock-cells = <0>;
compatible = "ti,divider-clock";
clocks = <&clkout2_pre_div_ck>;
ti,bit-shift = <8>;
ti,max-div = <32>;
ti,index-power-of-two;
reg = <0x4108>;
};
clkout2_ck: clkout2_ck {
#clock-cells = <0>;
compatible = "ti,gate-clock";
clocks = <&clkout2_post_div_ck>;
ti,bit-shift = <16>;
reg = <0x4108>;
}; };
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7