aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisael Lopez Cruz2015-05-25 23:09:17 -0500
committerMisael Lopez Cruz2015-06-05 15:53:19 -0500
commit982e3affa22dde66d9979cbdfe356fc811b7ed98 (patch)
tree34d4c158fbde2fa336d63793f653a72b5c9c2703
parent22bb16817247c957b8c8f292b7ee176516a2f4fb (diff)
downloadkernel-audio-982e3affa22dde66d9979cbdfe356fc811b7ed98.tar.gz
kernel-audio-982e3affa22dde66d9979cbdfe356fc811b7ed98.tar.xz
kernel-audio-982e3affa22dde66d9979cbdfe356fc811b7ed98.zip
ARM: dts: DRA7: Update sDMA xbar to new mechanism
Migrate sDMA crossbar related properties to the new dra7-dma-crossbar mechanism. Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
Diffstat
-rw-r--r--arch/arm/boot/dts/dra7.dtsi83
1 files changed, 42 insertions, 41 deletions
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 2e53829ddafa..9bd6a7ac9e9f 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -280,17 +280,18 @@
280 <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>, 280 <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
281 <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, 281 <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
282 <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; 282 <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
283 #dma-cells = <2>; 283 #dma-cells = <1>;
284 #dma-channels = <32>; 284 dma-channels = <32>;
285 #dma-requests = <203>; 285 dma-requests = <128>;
286 }; 286 };
287 287
288 dmacb: dma-crossbar@4a020000 { 288 sdma_xbar: dma-crossbar@4a002b78 {
289 compatible = "ti,dma-crossbar"; 289 compatible = "ti,dra7-dma-crossbar";
290 reg = <0x4a002b78 0x100>; 290 reg = <0x4a002b78 0xfc>;
291 ti,dma-reqs = <160>; 291 #dma-cells = <1>;
292 ti,reg-size = <2>; 292 dma-requests = <204>;
293 ti,dma-safe-map = <0>; 293 ti,dma-safe-map = <0>;
294 dma-masters = <&sdma>;
294 }; 295 };
295 296
296 gpio1: gpio@4ae10000 { 297 gpio1: gpio@4ae10000 {
@@ -388,7 +389,7 @@
388 ti,hwmods = "uart1"; 389 ti,hwmods = "uart1";
389 clock-frequency = <48000000>; 390 clock-frequency = <48000000>;
390 status = "disabled"; 391 status = "disabled";
391 dmas = <&sdma 49 &dmacb>, <&sdma 50 &dmacb>; 392 dmas = <&sdma_xbar 49>, <&sdma_xbar 50>;
392 dma-names = "tx", "rx"; 393 dma-names = "tx", "rx";
393 }; 394 };
394 395
@@ -399,7 +400,7 @@
399 ti,hwmods = "uart2"; 400 ti,hwmods = "uart2";
400 clock-frequency = <48000000>; 401 clock-frequency = <48000000>;
401 status = "disabled"; 402 status = "disabled";
402 dmas = <&sdma 51 &dmacb>, <&sdma 52 &dmacb>; 403 dmas = <&sdma_xbar 51>, <&sdma_xbar 52>;
403 dma-names = "tx", "rx"; 404 dma-names = "tx", "rx";
404 }; 405 };
405 406
@@ -410,7 +411,7 @@
410 ti,hwmods = "uart3"; 411 ti,hwmods = "uart3";
411 clock-frequency = <48000000>; 412 clock-frequency = <48000000>;
412 status = "disabled"; 413 status = "disabled";
413 dmas = <&sdma 53 &dmacb>, <&sdma 54 &dmacb>; 414 dmas = <&sdma_xbar 53>, <&sdma_xbar 54>;
414 dma-names = "tx", "rx"; 415 dma-names = "tx", "rx";
415 }; 416 };
416 417
@@ -421,7 +422,7 @@
421 ti,hwmods = "uart4"; 422 ti,hwmods = "uart4";
422 clock-frequency = <48000000>; 423 clock-frequency = <48000000>;
423 status = "disabled"; 424 status = "disabled";
424 dmas = <&sdma 55 &dmacb>, <&sdma 56 &dmacb>; 425 dmas = <&sdma_xbar 55>, <&sdma_xbar 56>;
425 dma-names = "tx", "rx"; 426 dma-names = "tx", "rx";
426 }; 427 };
427 428
@@ -432,7 +433,7 @@
432 ti,hwmods = "uart5"; 433 ti,hwmods = "uart5";
433 clock-frequency = <48000000>; 434 clock-frequency = <48000000>;
434 status = "disabled"; 435 status = "disabled";
435 dmas = <&sdma 63 &dmacb>, <&sdma 64 &dmacb>; 436 dmas = <&sdma_xbar 63>, <&sdma_xbar 64>;
436 dma-names = "tx", "rx"; 437 dma-names = "tx", "rx";
437 }; 438 };
438 439
@@ -443,7 +444,7 @@
443 ti,hwmods = "uart6"; 444 ti,hwmods = "uart6";
444 clock-frequency = <48000000>; 445 clock-frequency = <48000000>;
445 status = "disabled"; 446 status = "disabled";
446 dmas = <&sdma 79 &dmacb>, <&sdma 80 &dmacb>; 447 dmas = <&sdma_xbar 79>, <&sdma_xbar 80>;
447 dma-names = "tx", "rx"; 448 dma-names = "tx", "rx";
448 }; 449 };
449 450
@@ -918,7 +919,7 @@
918 ti,hwmods = "mmc1"; 919 ti,hwmods = "mmc1";
919 ti,dual-volt; 920 ti,dual-volt;
920 ti,needs-special-reset; 921 ti,needs-special-reset;
921 dmas = <&sdma 61 &dmacb>, <&sdma 62 &dmacb>; 922 dmas = <&sdma_xbar 61>, <&sdma_xbar 62>;
922 dma-names = "tx", "rx"; 923 dma-names = "tx", "rx";
923 status = "disabled"; 924 status = "disabled";
924 pbias-supply = <&pbias_mmc_reg>; 925 pbias-supply = <&pbias_mmc_reg>;
@@ -930,7 +931,7 @@
930 interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>; 931 interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
931 ti,hwmods = "mmc2"; 932 ti,hwmods = "mmc2";
932 ti,needs-special-reset; 933 ti,needs-special-reset;
933 dmas = <&sdma 47 &dmacb>, <&sdma 48 &dmacb>; 934 dmas = <&sdma_xbar 47>, <&sdma_xbar 48>;
934 dma-names = "tx", "rx"; 935 dma-names = "tx", "rx";
935 status = "disabled"; 936 status = "disabled";
936 }; 937 };
@@ -941,7 +942,7 @@
941 interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>; 942 interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
942 ti,hwmods = "mmc3"; 943 ti,hwmods = "mmc3";
943 ti,needs-special-reset; 944 ti,needs-special-reset;
944 dmas = <&sdma 77 &dmacb>, <&sdma 78 &dmacb>; 945 dmas = <&sdma_xbar 77>, <&sdma_xbar 78>;
945 dma-names = "tx", "rx"; 946 dma-names = "tx", "rx";
946 status = "disabled"; 947 status = "disabled";
947 }; 948 };
@@ -952,7 +953,7 @@
952 interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; 953 interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
953 ti,hwmods = "mmc4"; 954 ti,hwmods = "mmc4";
954 ti,needs-special-reset; 955 ti,needs-special-reset;
955 dmas = <&sdma 57 &dmacb>, <&sdma 58 &dmacb>; 956 dmas = <&sdma_xbar 57>, <&sdma_xbar 58>;
956 dma-names = "tx", "rx"; 957 dma-names = "tx", "rx";
957 status = "disabled"; 958 status = "disabled";
958 }; 959 };
@@ -1284,14 +1285,14 @@
1284 #size-cells = <0>; 1285 #size-cells = <0>;
1285 ti,hwmods = "mcspi1"; 1286 ti,hwmods = "mcspi1";
1286 ti,spi-num-cs = <4>; 1287 ti,spi-num-cs = <4>;
1287 dmas = <&sdma 35 &dmacb>, 1288 dmas = <&sdma_xbar 35>,
1288 <&sdma 36 &dmacb>, 1289 <&sdma_xbar 36>,
1289 <&sdma 37 &dmacb>, 1290 <&sdma_xbar 37>,
1290 <&sdma 38 &dmacb>, 1291 <&sdma_xbar 38>,
1291 <&sdma 39 &dmacb>, 1292 <&sdma_xbar 39>,
1292 <&sdma 40 &dmacb>, 1293 <&sdma_xbar 40>,
1293 <&sdma 41 &dmacb>, 1294 <&sdma_xbar 41>,
1294 <&sdma 42 &dmacb>; 1295 <&sdma_xbar 42>;
1295 dma-names = "tx0", "rx0", "tx1", "rx1", 1296 dma-names = "tx0", "rx0", "tx1", "rx1",
1296 "tx2", "rx2", "tx3", "rx3"; 1297 "tx2", "rx2", "tx3", "rx3";
1297 status = "disabled"; 1298 status = "disabled";
@@ -1305,10 +1306,10 @@
1305 #size-cells = <0>; 1306 #size-cells = <0>;
1306 ti,hwmods = "mcspi2"; 1307 ti,hwmods = "mcspi2";
1307 ti,spi-num-cs = <2>; 1308 ti,spi-num-cs = <2>;
1308 dmas = <&sdma 43 &dmacb>, 1309 dmas = <&sdma_xbar 43>,
1309 <&sdma 44 &dmacb>, 1310 <&sdma_xbar 44>,
1310 <&sdma 45 &dmacb>, 1311 <&sdma_xbar 45>,
1311 <&sdma 46 &dmacb>; 1312 <&sdma_xbar 46>;
1312 dma-names = "tx0", "rx0", "tx1", "rx1"; 1313 dma-names = "tx0", "rx0", "tx1", "rx1";
1313 status = "disabled"; 1314 status = "disabled";
1314 }; 1315 };
@@ -1321,7 +1322,7 @@
1321 #size-cells = <0>; 1322 #size-cells = <0>;
1322 ti,hwmods = "mcspi3"; 1323 ti,hwmods = "mcspi3";
1323 ti,spi-num-cs = <2>; 1324 ti,spi-num-cs = <2>;
1324 dmas = <&sdma 15 &dmacb>, <&sdma 16 &dmacb>; 1325 dmas = <&sdma_xbar 15>, <&sdma_xbar 16>;
1325 dma-names = "tx0", "rx0"; 1326 dma-names = "tx0", "rx0";
1326 status = "disabled"; 1327 status = "disabled";
1327 }; 1328 };
@@ -1334,7 +1335,7 @@
1334 #size-cells = <0>; 1335 #size-cells = <0>;
1335 ti,hwmods = "mcspi4"; 1336 ti,hwmods = "mcspi4";
1336 ti,spi-num-cs = <1>; 1337 ti,spi-num-cs = <1>;
1337 dmas = <&sdma 70 &dmacb>, <&sdma 71 &dmacb>; 1338 dmas = <&sdma_xbar 70>, <&sdma_xbar 71>;
1338 dma-names = "tx0", "rx0"; 1339 dma-names = "tx0", "rx0";
1339 status = "disabled"; 1340 status = "disabled";
1340 }; 1341 };
@@ -1801,7 +1802,7 @@
1801 ti,hwmods = "dss_hdmi"; 1802 ti,hwmods = "dss_hdmi";
1802 clocks = <&dss_48mhz_clk>, <&dss_hdmi_clk>; 1803 clocks = <&dss_48mhz_clk>, <&dss_hdmi_clk>;
1803 clock-names = "fck", "sys_clk"; 1804 clock-names = "fck", "sys_clk";
1804 dmas = <&sdma 76 &dmacb>; 1805 dmas = <&sdma_xbar 76>;
1805 dma-names = "audio_tx"; 1806 dma-names = "audio_tx";
1806 }; 1807 };
1807 }; 1808 };
@@ -1811,7 +1812,7 @@
1811 ti,hwmods = "aes1"; 1812 ti,hwmods = "aes1";
1812 reg = <0x4b500000 0xa0>; 1813 reg = <0x4b500000 0xa0>;
1813 interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>; 1814 interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
1814 dmas = <&sdma 111 &dmacb>, <&sdma 110 &dmacb>; 1815 dmas = <&sdma_xbar 111>, <&sdma_xbar 110>;
1815 dma-names = "tx", "rx"; 1816 dma-names = "tx", "rx";
1816 clocks = <&l3_iclk_div>; 1817 clocks = <&l3_iclk_div>;
1817 clock-names = "fck"; 1818 clock-names = "fck";
@@ -1822,7 +1823,7 @@
1822 ti,hwmods = "aes2"; 1823 ti,hwmods = "aes2";
1823 reg = <0x4b700000 0xa0>; 1824 reg = <0x4b700000 0xa0>;
1824 interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>; 1825 interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
1825 dmas = <&sdma 114 &dmacb>, <&sdma 113 &dmacb>; 1826 dmas = <&sdma_xbar 114>, <&sdma_xbar 113>;
1826 dma-names = "tx", "rx"; 1827 dma-names = "tx", "rx";
1827 clocks = <&l3_iclk_div>; 1828 clocks = <&l3_iclk_div>;
1828 clock-names = "fck"; 1829 clock-names = "fck";
@@ -1833,7 +1834,7 @@
1833 ti,hwmods = "des"; 1834 ti,hwmods = "des";
1834 reg = <0x480a5000 0xa0>; 1835 reg = <0x480a5000 0xa0>;
1835 interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>; 1836 interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
1836 dmas = <&sdma 117 &dmacb>, <&sdma 116 &dmacb>; 1837 dmas = <&sdma_xbar 117>, <&sdma_xbar 116>;
1837 dma-names = "tx", "rx"; 1838 dma-names = "tx", "rx";
1838 clocks = <&l3_iclk_div>; 1839 clocks = <&l3_iclk_div>;
1839 clock-names = "fck"; 1840 clock-names = "fck";
@@ -1844,7 +1845,7 @@
1844 ti,hwmods = "sham"; 1845 ti,hwmods = "sham";
1845 reg = <0x4b101000 0x300>; 1846 reg = <0x4b101000 0x300>;
1846 interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; 1847 interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
1847 dmas = <&sdma 119 &dmacb>; 1848 dmas = <&sdma_xbar 119>;
1848 dma-names = "rx"; 1849 dma-names = "rx";
1849 clocks = <&l3_iclk_div>; 1850 clocks = <&l3_iclk_div>;
1850 clock-names = "fck"; 1851 clock-names = "fck";
@@ -1884,7 +1885,7 @@
1884 ti,hwmods = "mcasp2"; 1885 ti,hwmods = "mcasp2";
1885 reg = <0x48464000 0x2000>; 1886 reg = <0x48464000 0x2000>;
1886 reg-names = "mpu"; 1887 reg-names = "mpu";
1887 dmas = <&sdma 131 &dmacb>, <&sdma 130 &dmacb>; 1888 dmas = <&sdma_xbar 131>, <&sdma_xbar 130>;
1888 dma-names = "tx", "rx"; 1889 dma-names = "tx", "rx";
1889 clocks = <&mcasp2_ahclkx_mux>; 1890 clocks = <&mcasp2_ahclkx_mux>;
1890 clock-names = "fck"; 1891 clock-names = "fck";
@@ -1899,7 +1900,7 @@
1899 interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>, 1900 interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>,
1900 <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>; 1901 <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
1901 interrupt-names = "tx", "rx"; 1902 interrupt-names = "tx", "rx";
1902 dmas = <&sdma 133 &dmacb>, <&sdma 132 &dmacb>; 1903 dmas = <&sdma_xbar 133>, <&sdma_xbar 132>;
1903 dma-names = "tx", "rx"; 1904 dma-names = "tx", "rx";
1904 clocks = <&mcasp3_ahclkx_mux>; 1905 clocks = <&mcasp3_ahclkx_mux>;
1905 clock-names = "fck"; 1906 clock-names = "fck";
@@ -1915,7 +1916,7 @@
1915 interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>, 1916 interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>,
1916 <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>; 1917 <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
1917 interrupt-names = "tx", "rx"; 1918 interrupt-names = "tx", "rx";
1918 dmas = <&sdma 139 &dmacb>, <&sdma 138 &dmacb>; 1919 dmas = <&sdma_xbar 139>, <&sdma_xbar 138>;
1919 dma-names = "tx", "rx"; 1920 dma-names = "tx", "rx";
1920 clocks = <&mcasp6_ahclkx_mux>; 1921 clocks = <&mcasp6_ahclkx_mux>;
1921 clock-names = "fck"; 1922 clock-names = "fck";
@@ -1931,7 +1932,7 @@
1931 interrupts = <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>, 1932 interrupts = <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>,
1932 <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>; 1933 <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;
1933 interrupt-names = "tx", "rx"; 1934 interrupt-names = "tx", "rx";
1934 dmas = <&sdma 141 &dmacb>, <&sdma 140 &dmacb>; 1935 dmas = <&sdma_xbar 141>, <&sdma_xbar 140>;
1935 dma-names = "tx", "rx"; 1936 dma-names = "tx", "rx";
1936 clocks = <&mcasp7_ahclkx_mux>; 1937 clocks = <&mcasp7_ahclkx_mux>;
1937 clock-names = "fck"; 1938 clock-names = "fck";
generated by cgit v1.2.3 (git 2.39.2)