Skip to content

Commit b5f8ffb

Browse files
Tero Kristotmlind
Tero Kristo
authored and
tmlind
committed
ARM: dts: dra7: convert to use new clkctrl layout
Convert DRA7xx to use the new clockdomain based layout. Previously the clkctrl split was based on CM isntance boundaries. The new layout helps with introducing the interconnect driver instances. Signed-off-by: Tero Kristo <t-kristo@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
1 parent 23298c3 commit b5f8ffb

File tree

8 files changed

+171
-86
lines changed

8 files changed

+171
-86
lines changed

‎arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@
555555

556556
&mcasp3 {
557557
#sound-dai-cells = <0>;
558-
assigned-clocks = <&l4per_clkctrl DRA7_MCASP3_CLKCTRL 24>;
558+
assigned-clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 24>;
559559
assigned-clock-parents = <&sys_clkin2>;
560560
status = "okay";
561561

‎arch/arm/boot/dts/dra7-evm-common.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214

215215
&atl {
216216
assigned-clocks = <&abe_dpll_sys_clk_mux>,
217-
<&atl_clkctrl DRA7_ATL_CLKCTRL 26>,
217+
<&atl_clkctrl DRA7_ATL_ATL_CLKCTRL 26>,
218218
<&dpll_abe_ck>,
219219
<&dpll_abe_m2x2_ck>,
220220
<&atl_clkin2_ck>;
@@ -232,7 +232,7 @@
232232
&mcasp3 {
233233
#sound-dai-cells = <0>;
234234

235-
assigned-clocks = <&l4per_clkctrl DRA7_MCASP3_CLKCTRL 24>;
235+
assigned-clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 24>;
236236
assigned-clock-parents = <&atl_clkin2_ck>;
237237

238238
status = "okay";

‎arch/arm/boot/dts/dra7.dtsi

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,7 @@
899899
ti,hwmods = "timer1";
900900
ti,timer-alwon;
901901
clock-names = "fck";
902-
clocks = <&wkupaon_clkctrl DRA7_TIMER1_CLKCTRL 24>;
902+
clocks = <&wkupaon_clkctrl DRA7_WKUPAON_TIMER1_CLKCTRL 24>;
903903
};
904904

905905
timer2: timer@48032000 {
@@ -1380,7 +1380,7 @@
13801380
#address-cells = <1>;
13811381
#size-cells = <0>;
13821382
ti,hwmods = "qspi";
1383-
clocks = <&l4per_clkctrl DRA7_QSPI_CLKCTRL 25>;
1383+
clocks = <&l4per2_clkctrl DRA7_L4PER2_QSPI_CLKCTRL 25>;
13841384
clock-names = "fck";
13851385
num-cs = <4>;
13861386
interrupts = <GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH>;
@@ -1403,7 +1403,7 @@
14031403
reg-names = "phy_rx", "phy_tx", "pll_ctrl";
14041404
syscon-phy-power = <&scm_conf 0x374>;
14051405
clocks = <&sys_clkin1>,
1406-
<&l3init_clkctrl DRA7_SATA_CLKCTRL 8>;
1406+
<&l3init_clkctrl DRA7_L3INIT_SATA_CLKCTRL 8>;
14071407
clock-names = "sysclk", "refclk";
14081408
syscon-pllreset = <&scm_conf 0x3fc>;
14091409
#phy-cells = <0>;
@@ -1418,9 +1418,9 @@
14181418
syscon-pcs = <&scm_conf_pcie 0x10>;
14191419
clocks = <&dpll_pcie_ref_ck>,
14201420
<&dpll_pcie_ref_m2ldo_ck>,
1421-
<&l3init_clkctrl DRA7_PCIE1_CLKCTRL 8>,
1422-
<&l3init_clkctrl DRA7_PCIE1_CLKCTRL 9>,
1423-
<&l3init_clkctrl DRA7_PCIE1_CLKCTRL 10>,
1421+
<&pcie_clkctrl DRA7_PCIE_PCIE1_CLKCTRL 8>,
1422+
<&pcie_clkctrl DRA7_PCIE_PCIE1_CLKCTRL 9>,
1423+
<&pcie_clkctrl DRA7_PCIE_PCIE1_CLKCTRL 10>,
14241424
<&optfclk_pciephy_div>,
14251425
<&sys_clkin1>;
14261426
clock-names = "dpll_ref", "dpll_ref_m2",
@@ -1438,9 +1438,9 @@
14381438
syscon-pcs = <&scm_conf_pcie 0x10>;
14391439
clocks = <&dpll_pcie_ref_ck>,
14401440
<&dpll_pcie_ref_m2ldo_ck>,
1441-
<&l3init_clkctrl DRA7_PCIE2_CLKCTRL 8>,
1442-
<&l3init_clkctrl DRA7_PCIE2_CLKCTRL 9>,
1443-
<&l3init_clkctrl DRA7_PCIE2_CLKCTRL 10>,
1441+
<&pcie_clkctrl DRA7_PCIE_PCIE2_CLKCTRL 8>,
1442+
<&pcie_clkctrl DRA7_PCIE_PCIE2_CLKCTRL 9>,
1443+
<&pcie_clkctrl DRA7_PCIE_PCIE2_CLKCTRL 10>,
14441444
<&optfclk_pciephy_div>,
14451445
<&sys_clkin1>;
14461446
clock-names = "dpll_ref", "dpll_ref_m2",
@@ -1457,7 +1457,7 @@
14571457
interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
14581458
phys = <&sata_phy>;
14591459
phy-names = "sata-phy";
1460-
clocks = <&l3init_clkctrl DRA7_SATA_CLKCTRL 8>;
1460+
clocks = <&l3init_clkctrl DRA7_L3INIT_SATA_CLKCTRL 8>;
14611461
ti,hwmods = "sata";
14621462
ports-implemented = <0x1>;
14631463
};
@@ -1485,7 +1485,7 @@
14851485
reg = <0x4a084000 0x400>;
14861486
syscon-phy-power = <&scm_conf 0x300>;
14871487
clocks = <&usb_phy1_always_on_clk32k>,
1488-
<&l3init_clkctrl DRA7_USB_OTG_SS1_CLKCTRL 8>;
1488+
<&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS1_CLKCTRL 8>;
14891489
clock-names = "wkupclk",
14901490
"refclk";
14911491
#phy-cells = <0>;
@@ -1497,7 +1497,7 @@
14971497
reg = <0x4a085000 0x400>;
14981498
syscon-phy-power = <&scm_conf 0xe74>;
14991499
clocks = <&usb_phy2_always_on_clk32k>,
1500-
<&l3init_clkctrl DRA7_USB_OTG_SS2_CLKCTRL 8>;
1500+
<&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS2_CLKCTRL 8>;
15011501
clock-names = "wkupclk",
15021502
"refclk";
15031503
#phy-cells = <0>;
@@ -1512,7 +1512,7 @@
15121512
syscon-phy-power = <&scm_conf 0x370>;
15131513
clocks = <&usb_phy3_always_on_clk32k>,
15141514
<&sys_clkin1>,
1515-
<&l3init_clkctrl DRA7_USB_OTG_SS1_CLKCTRL 8>;
1515+
<&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS1_CLKCTRL 8>;
15161516
clock-names = "wkupclk",
15171517
"sysclk",
15181518
"refclk";
@@ -1530,7 +1530,7 @@
15301530
<SYSC_IDLE_NO>,
15311531
<SYSC_IDLE_SMART>,
15321532
<SYSC_IDLE_SMART_WKUP>;
1533-
clocks = <&coreaon_clkctrl DRA7_SMARTREFLEX_CORE_CLKCTRL 0>;
1533+
clocks = <&coreaon_clkctrl DRA7_COREAON_SMARTREFLEX_CORE_CLKCTRL 0>;
15341534
clock-names = "fck";
15351535
#address-cells = <1>;
15361536
#size-cells = <1>;
@@ -1549,7 +1549,7 @@
15491549
<SYSC_IDLE_NO>,
15501550
<SYSC_IDLE_SMART>,
15511551
<SYSC_IDLE_SMART_WKUP>;
1552-
clocks = <&coreaon_clkctrl DRA7_SMARTREFLEX_MPU_CLKCTRL 0>;
1552+
clocks = <&coreaon_clkctrl DRA7_COREAON_SMARTREFLEX_MPU_CLKCTRL 0>;
15531553
clock-names = "fck";
15541554
#address-cells = <1>;
15551555
#size-cells = <1>;
@@ -1672,7 +1672,7 @@
16721672
ti,hwmods = "atl";
16731673
ti,provided-clocks = <&atl_clkin0_ck>, <&atl_clkin1_ck>,
16741674
<&atl_clkin2_ck>, <&atl_clkin3_ck>;
1675-
clocks = <&atl_clkctrl DRA7_ATL_CLKCTRL 26>;
1675+
clocks = <&atl_clkctrl DRA7_ATL_ATL_CLKCTRL 26>;
16761676
clock-names = "fck";
16771677
status = "disabled";
16781678
};
@@ -1688,8 +1688,8 @@
16881688
interrupt-names = "tx", "rx";
16891689
dmas = <&edma_xbar 129 1>, <&edma_xbar 128 1>;
16901690
dma-names = "tx", "rx";
1691-
clocks = <&ipu_clkctrl DRA7_MCASP1_CLKCTRL 22>, <&ipu_clkctrl DRA7_MCASP1_CLKCTRL 24>,
1692-
<&ipu_clkctrl DRA7_MCASP1_CLKCTRL 28>;
1691+
clocks = <&ipu_clkctrl DRA7_IPU_MCASP1_CLKCTRL 22>, <&ipu_clkctrl DRA7_IPU_MCASP1_CLKCTRL 24>,
1692+
<&ipu_clkctrl DRA7_IPU_MCASP1_CLKCTRL 28>;
16931693
clock-names = "fck", "ahclkx", "ahclkr";
16941694
status = "disabled";
16951695
};
@@ -1705,9 +1705,9 @@
17051705
interrupt-names = "tx", "rx";
17061706
dmas = <&edma_xbar 131 1>, <&edma_xbar 130 1>;
17071707
dma-names = "tx", "rx";
1708-
clocks = <&l4per_clkctrl DRA7_MCASP2_CLKCTRL 22>,
1709-
<&l4per_clkctrl DRA7_MCASP2_CLKCTRL 24>,
1710-
<&l4per_clkctrl DRA7_MCASP2_CLKCTRL 28>;
1708+
clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP2_CLKCTRL 22>,
1709+
<&l4per2_clkctrl DRA7_L4PER2_MCASP2_CLKCTRL 24>,
1710+
<&l4per2_clkctrl DRA7_L4PER2_MCASP2_CLKCTRL 28>;
17111711
clock-names = "fck", "ahclkx", "ahclkr";
17121712
status = "disabled";
17131713
};
@@ -1723,8 +1723,8 @@
17231723
interrupt-names = "tx", "rx";
17241724
dmas = <&edma_xbar 133 1>, <&edma_xbar 132 1>;
17251725
dma-names = "tx", "rx";
1726-
clocks = <&l4per_clkctrl DRA7_MCASP3_CLKCTRL 22>,
1727-
<&l4per_clkctrl DRA7_MCASP3_CLKCTRL 24>;
1726+
clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 22>,
1727+
<&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 24>;
17281728
clock-names = "fck", "ahclkx";
17291729
status = "disabled";
17301730
};
@@ -1740,8 +1740,8 @@
17401740
interrupt-names = "tx", "rx";
17411741
dmas = <&edma_xbar 135 1>, <&edma_xbar 134 1>;
17421742
dma-names = "tx", "rx";
1743-
clocks = <&l4per_clkctrl DRA7_MCASP4_CLKCTRL 22>,
1744-
<&l4per_clkctrl DRA7_MCASP4_CLKCTRL 24>;
1743+
clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 22>,
1744+
<&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 24>;
17451745
clock-names = "fck", "ahclkx";
17461746
status = "disabled";
17471747
};
@@ -1757,8 +1757,8 @@
17571757
interrupt-names = "tx", "rx";
17581758
dmas = <&edma_xbar 137 1>, <&edma_xbar 136 1>;
17591759
dma-names = "tx", "rx";
1760-
clocks = <&l4per_clkctrl DRA7_MCASP5_CLKCTRL 22>,
1761-
<&l4per_clkctrl DRA7_MCASP5_CLKCTRL 24>;
1760+
clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 22>,
1761+
<&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 24>;
17621762
clock-names = "fck", "ahclkx";
17631763
status = "disabled";
17641764
};
@@ -1774,8 +1774,8 @@
17741774
interrupt-names = "tx", "rx";
17751775
dmas = <&edma_xbar 139 1>, <&edma_xbar 138 1>;
17761776
dma-names = "tx", "rx";
1777-
clocks = <&l4per_clkctrl DRA7_MCASP6_CLKCTRL 22>,
1778-
<&l4per_clkctrl DRA7_MCASP6_CLKCTRL 24>;
1777+
clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 22>,
1778+
<&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 24>;
17791779
clock-names = "fck", "ahclkx";
17801780
status = "disabled";
17811781
};
@@ -1791,8 +1791,8 @@
17911791
interrupt-names = "tx", "rx";
17921792
dmas = <&edma_xbar 141 1>, <&edma_xbar 140 1>;
17931793
dma-names = "tx", "rx";
1794-
clocks = <&l4per_clkctrl DRA7_MCASP7_CLKCTRL 22>,
1795-
<&l4per_clkctrl DRA7_MCASP7_CLKCTRL 24>;
1794+
clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 22>,
1795+
<&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 24>;
17961796
clock-names = "fck", "ahclkx";
17971797
status = "disabled";
17981798
};
@@ -1808,8 +1808,8 @@
18081808
interrupt-names = "tx", "rx";
18091809
dmas = <&edma_xbar 143 1>, <&edma_xbar 142 1>;
18101810
dma-names = "tx", "rx";
1811-
clocks = <&l4per_clkctrl DRA7_MCASP8_CLKCTRL 22>,
1812-
<&l4per_clkctrl DRA7_MCASP8_CLKCTRL 24>;
1811+
clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP8_CLKCTRL 22>,
1812+
<&l4per2_clkctrl DRA7_L4PER2_MCASP8_CLKCTRL 24>;
18131813
clock-names = "fck", "ahclkx";
18141814
status = "disabled";
18151815
};
@@ -1831,7 +1831,7 @@
18311831
mac: ethernet@48484000 {
18321832
compatible = "ti,dra7-cpsw","ti,cpsw";
18331833
ti,hwmods = "gmac";
1834-
clocks = <&gmac_main_clk>, <&l3init_clkctrl DRA7_GMAC_CLKCTRL 25>;
1834+
clocks = <&gmac_main_clk>, <&gmac_clkctrl DRA7_GMAC_GMAC_CLKCTRL 25>;
18351835
clock-names = "fck", "cpts";
18361836
cpdma_channels = <8>;
18371837
ale_entries = <1024>;
@@ -1901,7 +1901,7 @@
19011901
reg = <0x4ae3c000 0x2000>;
19021902
syscon-raminit = <&scm_conf 0x558 0>;
19031903
interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>;
1904-
clocks = <&wkupaon_clkctrl DRA7_DCAN1_CLKCTRL 24>;
1904+
clocks = <&wkupaon_clkctrl DRA7_WKUPAON_DCAN1_CLKCTRL 24>;
19051905
status = "disabled";
19061906
};
19071907

@@ -1932,7 +1932,7 @@
19321932
reg = <0x58001000 0x1000>;
19331933
interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
19341934
ti,hwmods = "dss_dispc";
1935-
clocks = <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 8>;
1935+
clocks = <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 8>;
19361936
clock-names = "fck";
19371937
/* CTRL_CORE_SMA_SW_1 */
19381938
syscon-pol = <&scm_conf 0x534>;
@@ -1948,8 +1948,8 @@
19481948
interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
19491949
status = "disabled";
19501950
ti,hwmods = "dss_hdmi";
1951-
clocks = <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 9>,
1952-
<&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 10>;
1951+
clocks = <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 9>,
1952+
<&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 10>;
19531953
clock-names = "fck", "sys_clk";
19541954
dmas = <&sdma_xbar 76>;
19551955
dma-names = "audio_tx";

‎arch/arm/boot/dts/dra72-evm-common.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@
530530

531531
&atl {
532532
assigned-clocks = <&abe_dpll_sys_clk_mux>,
533-
<&atl_clkctrl DRA7_ATL_CLKCTRL 26>,
533+
<&atl_clkctrl DRA7_ATL_ATL_CLKCTRL 26>,
534534
<&dpll_abe_ck>,
535535
<&dpll_abe_m2x2_ck>,
536536
<&atl_clkin2_ck>;
@@ -548,7 +548,7 @@
548548
&mcasp3 {
549549
#sound-dai-cells = <0>;
550550

551-
assigned-clocks = <&l4per_clkctrl DRA7_MCASP3_CLKCTRL 24>;
551+
assigned-clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 24>;
552552
assigned-clock-parents = <&atl_clkin2_ck>;
553553

554554
status = "okay";

‎arch/arm/boot/dts/dra72x.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
<0x58004300 0x20>;
2626
reg-names = "dss", "pll1_clkctrl", "pll1";
2727

28-
clocks = <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 8>,
29-
<&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 12>;
28+
clocks = <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 8>,
29+
<&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 12>;
3030
clock-names = "fck", "video1_clk";
3131
};
3232

‎arch/arm/boot/dts/dra74x.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@
103103
reg-names = "dss", "pll1_clkctrl", "pll1",
104104
"pll2_clkctrl", "pll2";
105105

106-
clocks = <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 8>,
107-
<&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 12>,
108-
<&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 13>;
106+
clocks = <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 8>,
107+
<&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 12>,
108+
<&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 13>;
109109
clock-names = "fck", "video1_clk", "video2_clk";
110110
};
111111

‎arch/arm/boot/dts/dra76x.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
ti,sysc-mask = <(SYSC_OMAP4_SOFTRESET |
2525
SYSC_DRA7_MCAN_ENAWAKEUP)>;
2626
ti,syss-mask = <1>;
27-
clocks = <&wkupaon_clkctrl DRA7_ADC_CLKCTRL 0>;
27+
clocks = <&wkupaon_clkctrl DRA7_WKUPAON_ADC_CLKCTRL 0>;
2828
clock-names = "fck";
2929

3030
m_can0: mcan@1a00 {

0 commit comments

Comments
 (0)