Commit 2d3c8ba3 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: dts: Fix wrong clocks for dra7 mcasp 



The ahclkr clkctrl clock bit 28 only exists for mcasp 1 and 2 on dra7.
This causes the following warning on beagle-x15:

ti-sysc 48468000.target-module: could not add child clock ahclkr: -19

Also the mcasp clkctrl clock bits are wrong:

For mcasp1 and 2 we have four clocks at bits 28, 24, 22 and 0:

bit 28 is ahclkr
bit 24 is ahclkx
bit 22 is auxclk
bit 0 is fck

For mcasp3 to 8 we have three clocks at bits 24, 22 and 0.

bit 24 is ahclkx
bit 22 is auxclk
bit 0 is fck

We do not have currently mapped auxclk at bit 22 for the drivers, that can
be added if needed.

Fixes: 5241ccbf ("ARM: dts: Add missing ranges for dra7 mcasp l3 ports")
Cc: Suman Anna <s-anna@ti.com>
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent dd8882a2

arch/arm/boot/dts/dra7-l4.dtsi

+21 −27
Original line number Diff line number Diff line
@@ -2762,7 +2762,7 @@ 
				interrupt-names = "tx", "rx";

				dmas = <&edma_xbar 129 1>, <&edma_xbar 128 1>;

				dma-names = "tx", "rx";

				clocks = <&ipu_clkctrl DRA7_IPU_MCASP1_CLKCTRL 22>,

				clocks = <&ipu_clkctrl DRA7_IPU_MCASP1_CLKCTRL 0>,

					 <&ipu_clkctrl DRA7_IPU_MCASP1_CLKCTRL 24>,

					 <&ipu_clkctrl DRA7_IPU_MCASP1_CLKCTRL 28>;

				clock-names = "fck", "ahclkx", "ahclkr";
@@ -2799,8 +2799,8 @@ 
				interrupt-names = "tx", "rx";

				dmas = <&edma_xbar 131 1>, <&edma_xbar 130 1>;

				dma-names = "tx", "rx";

				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP2_CLKCTRL 22>,

					 <&l4per2_clkctrl DRA7_L4PER2_MCASP2_CLKCTRL 24>,

				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP2_CLKCTRL 0>,

					 <&ipu_clkctrl DRA7_IPU_MCASP1_CLKCTRL 24>,

					 <&l4per2_clkctrl DRA7_L4PER2_MCASP2_CLKCTRL 28>;

				clock-names = "fck", "ahclkx", "ahclkr";

				status = "disabled";
@@ -2818,9 +2818,8 @@ 
					<SYSC_IDLE_SMART>;

			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */

			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 0>,

				 <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 24>,

				 <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 28>;

			clock-names = "fck", "ahclkx", "ahclkr";

				 <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 24>;

			clock-names = "fck", "ahclkx";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0x68000 0x2000>,
@@ -2836,7 +2835,7 @@ 
				interrupt-names = "tx", "rx";

				dmas = <&edma_xbar 133 1>, <&edma_xbar 132 1>;

				dma-names = "tx", "rx";

				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 22>,

				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 0>,

					 <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 24>;

				clock-names = "fck", "ahclkx";

				status = "disabled";
@@ -2854,9 +2853,8 @@ 
					<SYSC_IDLE_SMART>;

			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */

			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 0>,

				 <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 24>,

				 <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 28>;

			clock-names = "fck", "ahclkx", "ahclkr";

				 <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 24>;

			clock-names = "fck", "ahclkx";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0x6c000 0x2000>,
@@ -2872,7 +2870,7 @@ 
				interrupt-names = "tx", "rx";

				dmas = <&edma_xbar 135 1>, <&edma_xbar 134 1>;

				dma-names = "tx", "rx";

				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 22>,

				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 0>,

					 <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 24>;

				clock-names = "fck", "ahclkx";

				status = "disabled";
@@ -2890,9 +2888,8 @@ 
					<SYSC_IDLE_SMART>;

			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */

			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 0>,

				 <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 24>,

				 <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 28>;

			clock-names = "fck", "ahclkx", "ahclkr";

				 <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 24>;

			clock-names = "fck", "ahclkx";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0x70000 0x2000>,
@@ -2908,7 +2905,7 @@ 
				interrupt-names = "tx", "rx";

				dmas = <&edma_xbar 137 1>, <&edma_xbar 136 1>;

				dma-names = "tx", "rx";

				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 22>,

				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 0>,

					 <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 24>;

				clock-names = "fck", "ahclkx";

				status = "disabled";
@@ -2926,9 +2923,8 @@ 
					<SYSC_IDLE_SMART>;

			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */

			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 0>,

				 <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 24>,

				 <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 28>;

			clock-names = "fck", "ahclkx", "ahclkr";

				 <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 24>;

			clock-names = "fck", "ahclkx";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0x74000 0x2000>,
@@ -2944,7 +2940,7 @@ 
				interrupt-names = "tx", "rx";

				dmas = <&edma_xbar 139 1>, <&edma_xbar 138 1>;

				dma-names = "tx", "rx";

				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 22>,

				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 0>,

					 <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 24>;

				clock-names = "fck", "ahclkx";

				status = "disabled";
@@ -2962,9 +2958,8 @@ 
					<SYSC_IDLE_SMART>;

			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */

			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 0>,

				 <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 24>,

				 <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 28>;

			clock-names = "fck", "ahclkx", "ahclkr";

				 <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 24>;

			clock-names = "fck", "ahclkx";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0x78000 0x2000>,
@@ -2980,7 +2975,7 @@ 
				interrupt-names = "tx", "rx";

				dmas = <&edma_xbar 141 1>, <&edma_xbar 140 1>;

				dma-names = "tx", "rx";

				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 22>,

				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 0>,

					 <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 24>;

				clock-names = "fck", "ahclkx";

				status = "disabled";
@@ -2998,9 +2993,8 @@ 
					<SYSC_IDLE_SMART>;

			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */

			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP8_CLKCTRL 0>,

				 <&l4per2_clkctrl DRA7_L4PER2_MCASP8_CLKCTRL 24>,

				 <&l4per2_clkctrl DRA7_L4PER2_MCASP8_CLKCTRL 28>;

			clock-names = "fck", "ahclkx", "ahclkr";

				 <&l4per2_clkctrl DRA7_L4PER2_MCASP8_CLKCTRL 24>;

			clock-names = "fck", "ahclkx";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0x7c000 0x2000>,
@@ -3016,7 +3010,7 @@ 
				interrupt-names = "tx", "rx";

				dmas = <&edma_xbar 143 1>, <&edma_xbar 142 1>;

				dma-names = "tx", "rx";

				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP8_CLKCTRL 22>,

				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP8_CLKCTRL 0>,

					 <&l4per2_clkctrl DRA7_L4PER2_MCASP8_CLKCTRL 24>;

				clock-names = "fck", "ahclkx";

				status = "disabled";

CRA Git | Maintained and supported by SUSTech CRA and CCSE