forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-05-10 37f49e37ab4cb5d0bc4c60eb5c6d4dd57db767bb 
 kernel/arch/arm/boot/dts/omap4-l4.dtsi
....@@ -136,7 +136,6 @@
136136 
137137 		target-module@56000 {			/* 0x4a056000, ap 7 0a.0 */
138138 			compatible = "ti,sysc-omap2", "ti,sysc";
139
-			ti,hwmods = "dma_system";
140139 			reg = <0x56000 0x4>,
141140 			      <0x5602c 0x4>,
142141 			      <0x56028 0x4>;
....@@ -160,7 +159,7 @@
160159 			ranges = <0x0 0x56000 0x1000>;
161160 
162161 			sdma: dma-controller@0 {
163
-				compatible = "ti,omap4430-sdma";
162
+				compatible = "ti,omap4430-sdma", "ti,omap-sdma";
164163 				reg = <0x0 0x1000>;
165164 				interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
166165 					     <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
....@@ -174,7 +173,6 @@
174173 
175174 		target-module@58000 {			/* 0x4a058000, ap 10 0e.0 */
176175 			compatible = "ti,sysc-omap2", "ti,sysc";
177
-			ti,hwmods = "hsi";
178176 			reg = <0x58000 0x4>,
179177 			      <0x58010 0x4>,
180178 			      <0x58014 0x4>;
....@@ -242,7 +240,6 @@
242240 
243241 		target-module@62000 {			/* 0x4a062000, ap 11 16.0 */
244242 			compatible = "ti,sysc-omap2", "ti,sysc";
245
-			ti,hwmods = "usb_tll_hs";
246243 			reg = <0x62000 0x4>,
247244 			      <0x62010 0x4>,
248245 			      <0x62014 0x4>;
....@@ -270,7 +267,6 @@
270267 
271268 		target-module@64000 {			/* 0x4a064000, ap 86 1e.0 */
272269 			compatible = "ti,sysc-omap4", "ti,sysc";
273
-			ti,hwmods = "usb_host_hs";
274270 			reg = <0x64000 0x4>,
275271 			      <0x64010 0x4>,
276272 			      <0x64014 0x4>;
....@@ -321,7 +317,6 @@
321317 
322318 		target-module@66000 {			/* 0x4a066000, ap 25 26.0 */
323319 			compatible = "ti,sysc-omap2", "ti,sysc";
324
-			ti,hwmods = "mmu_dsp";
325320 			reg = <0x66000 0x4>,
326321 			      <0x66010 0x4>,
327322 			      <0x66014 0x4>;
....@@ -335,12 +330,18 @@
335330 			/* Domains (V, P, C): iva, tesla_pwrdm, tesla_clkdm */
336331 			clocks = <&tesla_clkctrl OMAP4_DSP_CLKCTRL 0>;
337332 			clock-names = "fck";
333
+			resets = <&prm_tesla 1>;
334
+			reset-names = "rstctrl";
338335 			#address-cells = <1>;
339336 			#size-cells = <1>;
340337 			ranges = <0x0 0x66000 0x1000>;
341338 
342
-			/* mmu_dsp cannot be moved before reset driver */
343
-			status = "disabled";
339
+			mmu_dsp: mmu@0 {
340
+				compatible = "ti,omap4-iommu";
341
+				reg = <0x0 0x100>;
342
+				interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
343
+				#iommu-cells = <0>;
344
+			};
344345 		};
345346 	};
346347 
....@@ -381,7 +382,6 @@
381382 
382383 		target-module@2b000 {			/* 0x4a0ab000, ap 84 12.0 */
383384 			compatible = "ti,sysc-omap2", "ti,sysc";
384
-			ti,hwmods = "usb_otg_hs";
385385 			reg = <0x2b400 0x4>,
386386 			      <0x2b404 0x4>,
387387 			      <0x2b408 0x4>;
....@@ -421,7 +421,6 @@
421421 
422422 		target-module@2d000 {			/* 0x4a0ad000, ap 88 0c.0 */
423423 			compatible = "ti,sysc-omap2", "ti,sysc";
424
-			ti,hwmods = "ocp2scp_usb_phy";
425424 			reg = <0x2d000 0x4>,
426425 			      <0x2d010 0x4>,
427426 			      <0x2d014 0x4>;
....@@ -456,17 +455,43 @@
456455 			};
457456 		};
458457 
458
+		/* d2d mdm */
459459 		target-module@36000 {			/* 0x4a0b6000, ap 69 60.0 */
460
-			compatible = "ti,sysc";
461
-			status = "disabled";
460
+			compatible = "ti,sysc-omap2", "ti,sysc";
461
+			reg = <0x36000 0x4>,
462
+			      <0x36010 0x4>,
463
+			      <0x36014 0x4>;
464
+			reg-names = "rev", "sysc", "syss";
465
+			ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET | SYSC_OMAP2_AUTOIDLE)>;
466
+			ti,sysc-sidle = <SYSC_IDLE_FORCE>,
467
+					<SYSC_IDLE_NO>,
468
+					<SYSC_IDLE_SMART>,
469
+					<SYSC_IDLE_SMART_WKUP>;
470
+			ti,syss-mask = <1>;
471
+			/* Domains (V, P, C): core, core_pwrdm, d2d_clkdm */
472
+			clocks = <&d2d_clkctrl OMAP4_C2C_CLKCTRL 0>;
473
+			clock-names = "fck";
462474 			#address-cells = <1>;
463475 			#size-cells = <1>;
464476 			ranges = <0x0 0x36000 0x1000>;
465477 		};
466478 
479
+		/* d2d mpu */
467480 		target-module@4d000 {			/* 0x4a0cd000, ap 78 58.0 */
468
-			compatible = "ti,sysc";
469
-			status = "disabled";
481
+			compatible = "ti,sysc-omap2", "ti,sysc";
482
+			reg = <0x4d000 0x4>,
483
+			      <0x4d010 0x4>,
484
+			      <0x4d014 0x4>;
485
+			reg-names = "rev", "sysc", "syss";
486
+			ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET | SYSC_OMAP2_AUTOIDLE)>;
487
+			ti,sysc-sidle = <SYSC_IDLE_FORCE>,
488
+					<SYSC_IDLE_NO>,
489
+					<SYSC_IDLE_SMART>,
490
+					<SYSC_IDLE_SMART_WKUP>;
491
+			ti,syss-mask = <1>;
492
+			/* Domains (V, P, C): core, core_pwrdm, d2d_clkdm */
493
+			clocks = <&d2d_clkctrl OMAP4_C2C_CLKCTRL 0>;
494
+			clock-names = "fck";
470495 			#address-cells = <1>;
471496 			#size-cells = <1>;
472497 			ranges = <0x0 0x4d000 0x1000>;
....@@ -474,7 +499,6 @@
474499 
475500 		target-module@59000 {			/* 0x4a0d9000, ap 13 1a.0 */
476501 			compatible = "ti,sysc-omap4-sr", "ti,sysc";
477
-			ti,hwmods = "smartreflex_mpu";
478502 			reg = <0x59038 0x4>;
479503 			reg-names = "sysc";
480504 			ti,sysc-mask = <SYSC_OMAP3_SR_ENAWAKEUP>;
....@@ -498,7 +522,6 @@
498522 
499523 		target-module@5b000 {			/* 0x4a0db000, ap 15 08.0 */
500524 			compatible = "ti,sysc-omap4-sr", "ti,sysc";
501
-			ti,hwmods = "smartreflex_iva";
502525 			reg = <0x5b038 0x4>;
503526 			reg-names = "sysc";
504527 			ti,sysc-mask = <SYSC_OMAP3_SR_ENAWAKEUP>;
....@@ -522,7 +545,6 @@
522545 
523546 		target-module@5d000 {			/* 0x4a0dd000, ap 17 22.0 */
524547 			compatible = "ti,sysc-omap4-sr", "ti,sysc";
525
-			ti,hwmods = "smartreflex_core";
526548 			reg = <0x5d038 0x4>;
527549 			reg-names = "sysc";
528550 			ti,sysc-mask = <SYSC_OMAP3_SR_ENAWAKEUP>;
....@@ -554,7 +576,6 @@
554576 
555577 		target-module@74000 {			/* 0x4a0f4000, ap 27 24.0 */
556578 			compatible = "ti,sysc-omap4", "ti,sysc";
557
-			ti,hwmods = "mailbox";
558579 			reg = <0x74000 0x4>,
559580 			      <0x74010 0x4>;
560581 			reg-names = "rev", "sysc";
....@@ -576,11 +597,11 @@
576597 				#mbox-cells = <1>;
577598 				ti,mbox-num-users = <3>;
578599 				ti,mbox-num-fifos = <8>;
579
-				mbox_ipu: mbox_ipu {
600
+				mbox_ipu: mbox-ipu {
580601 					ti,mbox-tx = <0 0 0>;
581602 					ti,mbox-rx = <1 0 0>;
582603 				};
583
-				mbox_dsp: mbox_dsp {
604
+				mbox_dsp: mbox-dsp {
584605 					ti,mbox-tx = <3 0 0>;
585606 					ti,mbox-rx = <2 0 0>;
586607 				};
....@@ -589,7 +610,6 @@
589610 
590611 		target-module@76000 {			/* 0x4a0f6000, ap 29 3a.0 */
591612 			compatible = "ti,sysc-omap2", "ti,sysc";
592
-			ti,hwmods = "spinlock";
593613 			reg = <0x76000 0x4>,
594614 			      <0x76010 0x4>,
595615 			      <0x76014 0x4>;
....@@ -697,7 +717,6 @@
697717 
698718 		target-module@a000 {			/* 0x4a10a000, ap 65 50.0 */
699719 			compatible = "ti,sysc-omap4", "ti,sysc";
700
-			ti,hwmods = "fdif";
701720 			reg = <0xa000 0x4>,
702721 			      <0xa010 0x4>;
703722 			reg-names = "rev", "sysc";
....@@ -953,7 +972,6 @@
953972 
954973 		target-module@4000 {			/* 0x4a304000, ap 17 24.0 */
955974 			compatible = "ti,sysc-omap2", "ti,sysc";
956
-			ti,hwmods = "counter_32k";
957975 			reg = <0x4000 0x4>,
958976 			      <0x4004 0x4>;
959977 			reg-names = "rev", "sysc";
....@@ -981,7 +999,7 @@
981999 			ranges = <0x0 0x6000 0x2000>;
9821000 
9831001 			prm: prm@0 {
984
-				compatible = "ti,omap4-prm";
1002
+				compatible = "ti,omap4-prm", "simple-bus";
9851003 				reg = <0x0 0x2000>;
9861004 				interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
9871005 				#address-cells = <1>;
....@@ -1059,7 +1077,6 @@
10591077 
10601078 		gpio1_target: target-module@0 {			/* 0x4a310000, ap 5 14.0 */
10611079 			compatible = "ti,sysc-omap2", "ti,sysc";
1062
-			ti,hwmods = "gpio1";
10631080 			reg = <0x0 0x4>,
10641081 			      <0x10 0x4>,
10651082 			      <0x114 0x4>;
....@@ -1094,7 +1111,6 @@
10941111 
10951112 		target-module@4000 {			/* 0x4a314000, ap 7 18.0 */
10961113 			compatible = "ti,sysc-omap2", "ti,sysc";
1097
-			ti,hwmods = "wd_timer2";
10981114 			reg = <0x4000 0x4>,
10991115 			      <0x4010 0x4>,
11001116 			      <0x4014 0x4>;
....@@ -1120,9 +1136,8 @@
11201136 			};
11211137 		};
11221138 
1123
-		target-module@8000 {			/* 0x4a318000, ap 9 1c.0 */
1139
+		timer1_target: target-module@8000 {	/* 0x4a318000, ap 9 1c.0 */
11241140 			compatible = "ti,sysc-omap2-timer", "ti,sysc";
1125
-			ti,hwmods = "timer1";
11261141 			reg = <0x8000 0x4>,
11271142 			      <0x8010 0x4>,
11281143 			      <0x8014 0x4>;
....@@ -1146,8 +1161,9 @@
11461161 			timer1: timer@0 {
11471162 				compatible = "ti,omap3430-timer";
11481163 				reg = <0x0 0x80>;
1149
-				clocks = <&l4_wkup_clkctrl OMAP4_TIMER1_CLKCTRL 24>;
1150
-				clock-names = "fck";
1164
+				clocks = <&l4_wkup_clkctrl OMAP4_TIMER1_CLKCTRL 24>,
1165
+					 <&sys_clkin_ck>;
1166
+				clock-names = "fck", "timer_sys_ck";
11511167 				interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
11521168 				ti,timer-alwon;
11531169 			};
....@@ -1155,7 +1171,6 @@
11551171 
11561172 		target-module@c000 {			/* 0x4a31c000, ap 11 20.0 */
11571173 			compatible = "ti,sysc-omap2", "ti,sysc";
1158
-			ti,hwmods = "kbd";
11591174 			reg = <0xc000 0x4>,
11601175 			      <0xc010 0x4>,
11611176 			      <0xc014 0x4>;
....@@ -1371,7 +1386,6 @@
13711386 
13721387 		target-module@20000 {			/* 0x48020000, ap 3 06.0 */
13731388 			compatible = "ti,sysc-omap2", "ti,sysc";
1374
-			ti,hwmods = "uart3";
13751389 			reg = <0x20050 0x4>,
13761390 			      <0x20054 0x4>,
13771391 			      <0x20058 0x4>;
....@@ -1401,7 +1415,6 @@
14011415 
14021416 		target-module@32000 {			/* 0x48032000, ap 5 02.0 */
14031417 			compatible = "ti,sysc-omap2-timer", "ti,sysc";
1404
-			ti,hwmods = "timer2";
14051418 			reg = <0x32000 0x4>,
14061419 			      <0x32010 0x4>,
14071420 			      <0x32014 0x4>;
....@@ -1425,15 +1438,15 @@
14251438 			timer2: timer@0 {
14261439 				compatible = "ti,omap3430-timer";
14271440 				reg = <0x0 0x80>;
1428
-				clocks = <&l4_per_clkctrl OMAP4_TIMER2_CLKCTRL 24>;
1429
-				clock-names = "fck";
1441
+				clocks = <&l4_per_clkctrl OMAP4_TIMER2_CLKCTRL 24>,
1442
+					 <&sys_clkin_ck>;
1443
+				clock-names = "fck", "timer_sys_ck";
14301444 				interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
14311445 			};
14321446 		};
14331447 
14341448 		target-module@34000 {			/* 0x48034000, ap 7 04.0 */
14351449 			compatible = "ti,sysc-omap4-timer", "ti,sysc";
1436
-			ti,hwmods = "timer3";
14371450 			reg = <0x34000 0x4>,
14381451 			      <0x34010 0x4>;
14391452 			reg-names = "rev", "sysc";
....@@ -1453,15 +1466,15 @@
14531466 			timer3: timer@0 {
14541467 				compatible = "ti,omap4430-timer";
14551468 				reg = <0x0 0x80>;
1456
-				clocks = <&l4_per_clkctrl OMAP4_TIMER3_CLKCTRL 24>;
1457
-				clock-names = "fck";
1469
+				clocks = <&l4_per_clkctrl OMAP4_TIMER3_CLKCTRL 24>,
1470
+					 <&sys_clkin_ck>;
1471
+				clock-names = "fck", "timer_sys_ck";
14581472 				interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
14591473 			};
14601474 		};
14611475 
14621476 		target-module@36000 {			/* 0x48036000, ap 9 0e.0 */
14631477 			compatible = "ti,sysc-omap4-timer", "ti,sysc";
1464
-			ti,hwmods = "timer4";
14651478 			reg = <0x36000 0x4>,
14661479 			      <0x36010 0x4>;
14671480 			reg-names = "rev", "sysc";
....@@ -1481,15 +1494,15 @@
14811494 			timer4: timer@0 {
14821495 				compatible = "ti,omap4430-timer";
14831496 				reg = <0x0 0x80>;
1484
-				clocks = <&l4_per_clkctrl OMAP4_TIMER4_CLKCTRL 24>;
1485
-				clock-names = "fck";
1497
+				clocks = <&l4_per_clkctrl OMAP4_TIMER4_CLKCTRL 24>,
1498
+					 <&sys_clkin_ck>;
1499
+				clock-names = "fck", "timer_sys_ck";
14861500 				interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
14871501 			};
14881502 		};
14891503 
14901504 		target-module@3e000 {			/* 0x4803e000, ap 11 08.0 */
14911505 			compatible = "ti,sysc-omap4-timer", "ti,sysc";
1492
-			ti,hwmods = "timer9";
14931506 			reg = <0x3e000 0x4>,
14941507 			      <0x3e010 0x4>;
14951508 			reg-names = "rev", "sysc";
....@@ -1509,13 +1522,15 @@
15091522 			timer9: timer@0 {
15101523 				compatible = "ti,omap4430-timer";
15111524 				reg = <0x0 0x80>;
1512
-				clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>;
1513
-				clock-names = "fck";
1525
+				clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>,
1526
+					 <&sys_clkin_ck>;
1527
+				clock-names = "fck", "timer_sys_ck";
15141528 				interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
15151529 				ti,timer-pwm;
15161530 			};
15171531 		};
15181532 
1533
+		/* Unused DSS L4 access, see L3 instead */
15191534 		target-module@40000 {			/* 0x48040000, ap 13 0a.0 */
15201535 			compatible = "ti,sysc";
15211536 			status = "disabled";
....@@ -1526,7 +1541,6 @@
15261541 
15271542 		target-module@55000 {			/* 0x48055000, ap 15 0c.0 */
15281543 			compatible = "ti,sysc-omap2", "ti,sysc";
1529
-			ti,hwmods = "gpio2";
15301544 			reg = <0x55000 0x4>,
15311545 			      <0x55010 0x4>,
15321546 			      <0x55114 0x4>;
....@@ -1560,7 +1574,6 @@
15601574 
15611575 		target-module@57000 {			/* 0x48057000, ap 17 16.0 */
15621576 			compatible = "ti,sysc-omap2", "ti,sysc";
1563
-			ti,hwmods = "gpio3";
15641577 			reg = <0x57000 0x4>,
15651578 			      <0x57010 0x4>,
15661579 			      <0x57114 0x4>;
....@@ -1594,7 +1607,6 @@
15941607 
15951608 		target-module@59000 {			/* 0x48059000, ap 19 10.0 */
15961609 			compatible = "ti,sysc-omap2", "ti,sysc";
1597
-			ti,hwmods = "gpio4";
15981610 			reg = <0x59000 0x4>,
15991611 			      <0x59010 0x4>,
16001612 			      <0x59114 0x4>;
....@@ -1628,7 +1640,6 @@
16281640 
16291641 		target-module@5b000 {			/* 0x4805b000, ap 21 12.0 */
16301642 			compatible = "ti,sysc-omap2", "ti,sysc";
1631
-			ti,hwmods = "gpio5";
16321643 			reg = <0x5b000 0x4>,
16331644 			      <0x5b010 0x4>,
16341645 			      <0x5b114 0x4>;
....@@ -1662,7 +1673,6 @@
16621673 
16631674 		target-module@5d000 {			/* 0x4805d000, ap 23 14.0 */
16641675 			compatible = "ti,sysc-omap2", "ti,sysc";
1665
-			ti,hwmods = "gpio6";
16661676 			reg = <0x5d000 0x4>,
16671677 			      <0x5d010 0x4>,
16681678 			      <0x5d114 0x4>;
....@@ -1696,7 +1706,6 @@
16961706 
16971707 		target-module@60000 {			/* 0x48060000, ap 25 1e.0 */
16981708 			compatible = "ti,sysc-omap2", "ti,sysc";
1699
-			ti,hwmods = "i2c3";
17001709 			reg = <0x60000 0x8>,
17011710 			      <0x60010 0x8>,
17021711 			      <0x60090 0x8>;
....@@ -1728,7 +1737,6 @@
17281737 
17291738 		target-module@6a000 {			/* 0x4806a000, ap 26 18.0 */
17301739 			compatible = "ti,sysc-omap2", "ti,sysc";
1731
-			ti,hwmods = "uart1";
17321740 			reg = <0x6a050 0x4>,
17331741 			      <0x6a054 0x4>,
17341742 			      <0x6a058 0x4>;
....@@ -1758,7 +1766,6 @@
17581766 
17591767 		target-module@6c000 {			/* 0x4806c000, ap 28 20.0 */
17601768 			compatible = "ti,sysc-omap2", "ti,sysc";
1761
-			ti,hwmods = "uart2";
17621769 			reg = <0x6c050 0x4>,
17631770 			      <0x6c054 0x4>,
17641771 			      <0x6c058 0x4>;
....@@ -1788,7 +1795,6 @@
17881795 
17891796 		target-module@6e000 {			/* 0x4806e000, ap 30 1c.1 */
17901797 			compatible = "ti,sysc-omap2", "ti,sysc";
1791
-			ti,hwmods = "uart4";
17921798 			reg = <0x6e050 0x4>,
17931799 			      <0x6e054 0x4>,
17941800 			      <0x6e058 0x4>;
....@@ -1818,7 +1824,6 @@
18181824 
18191825 		target-module@70000 {			/* 0x48070000, ap 32 28.0 */
18201826 			compatible = "ti,sysc-omap2", "ti,sysc";
1821
-			ti,hwmods = "i2c1";
18221827 			reg = <0x70000 0x8>,
18231828 			      <0x70010 0x8>,
18241829 			      <0x70090 0x8>;
....@@ -1850,7 +1855,6 @@
18501855 
18511856 		target-module@72000 {			/* 0x48072000, ap 34 30.0 */
18521857 			compatible = "ti,sysc-omap2", "ti,sysc";
1853
-			ti,hwmods = "i2c2";
18541858 			reg = <0x72000 0x8>,
18551859 			      <0x72010 0x8>,
18561860 			      <0x72090 0x8>;
....@@ -1882,7 +1886,6 @@
18821886 
18831887 		target-module@76000 {			/* 0x48076000, ap 39 38.0 */
18841888 			compatible = "ti,sysc-omap4", "ti,sysc";
1885
-			ti,hwmods = "slimbus2";
18861889 			reg = <0x76000 0x4>,
18871890 			      <0x76010 0x4>;
18881891 			reg-names = "rev", "sysc";
....@@ -1903,7 +1906,6 @@
19031906 
19041907 		target-module@78000 {			/* 0x48078000, ap 41 1a.0 */
19051908 			compatible = "ti,sysc-omap2", "ti,sysc";
1906
-			ti,hwmods = "elm";
19071909 			reg = <0x78000 0x4>,
19081910 			      <0x78010 0x4>,
19091911 			      <0x78014 0x4>;
....@@ -1932,7 +1934,6 @@
19321934 
19331935 		target-module@86000 {			/* 0x48086000, ap 43 24.0 */
19341936 			compatible = "ti,sysc-omap2-timer", "ti,sysc";
1935
-			ti,hwmods = "timer10";
19361937 			reg = <0x86000 0x4>,
19371938 			      <0x86010 0x4>,
19381939 			      <0x86014 0x4>;
....@@ -1956,8 +1957,9 @@
19561957 			timer10: timer@0 {
19571958 				compatible = "ti,omap3430-timer";
19581959 				reg = <0x0 0x80>;
1959
-				clocks = <&l4_per_clkctrl OMAP4_TIMER10_CLKCTRL 24>;
1960
-				clock-names = "fck";
1960
+				clocks = <&l4_per_clkctrl OMAP4_TIMER10_CLKCTRL 24>,
1961
+					 <&sys_clkin_ck>;
1962
+				clock-names = "fck", "timer_sys_ck";
19611963 				interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
19621964 				ti,timer-pwm;
19631965 			};
....@@ -1965,7 +1967,6 @@
19651967 
19661968 		target-module@88000 {			/* 0x48088000, ap 45 2e.0 */
19671969 			compatible = "ti,sysc-omap4-timer", "ti,sysc";
1968
-			ti,hwmods = "timer11";
19691970 			reg = <0x88000 0x4>,
19701971 			      <0x88010 0x4>;
19711972 			reg-names = "rev", "sysc";
....@@ -1985,24 +1986,38 @@
19851986 			timer11: timer@0 {
19861987 				compatible = "ti,omap4430-timer";
19871988 				reg = <0x0 0x80>;
1988
-				clocks = <&l4_per_clkctrl OMAP4_TIMER11_CLKCTRL 24>;
1989
-				clock-names = "fck";
1989
+				clocks = <&l4_per_clkctrl OMAP4_TIMER11_CLKCTRL 24>,
1990
+					 <&sys_clkin_ck>;
1991
+				clock-names = "fck", "timer_sys_ck";
19901992 				interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;
19911993 				ti,timer-pwm;
19921994 			};
19931995 		};
19941996 
1995
-		target-module@90000 {			/* 0x48090000, ap 57 2a.0 */
1996
-			compatible = "ti,sysc";
1997
-			status = "disabled";
1997
+		rng_target: target-module@90000 {	/* 0x48090000, ap 57 2a.0 */
1998
+			compatible = "ti,sysc-omap2", "ti,sysc";
1999
+			reg = <0x91fe0 0x4>,
2000
+			      <0x91fe4 0x4>;
2001
+			reg-names = "rev", "sysc";
2002
+			ti,sysc-mask = <(SYSC_OMAP2_AUTOIDLE)>;
2003
+			ti,sysc-sidle = <SYSC_IDLE_FORCE>,
2004
+					<SYSC_IDLE_NO>;
2005
+			/* Domains (P, C): l4per_pwrdm, l4_secure_clkdm */
2006
+			clocks = <&l4_secure_clkctrl OMAP4_RNG_CLKCTRL 0>;
2007
+			clock-names = "fck";
19982008 			#address-cells = <1>;
19992009 			#size-cells = <1>;
20002010 			ranges = <0x0 0x90000 0x2000>;
2011
+
2012
+			rng: rng@0 {
2013
+				compatible = "ti,omap4-rng";
2014
+				reg = <0x0 0x2000>;
2015
+				interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
2016
+			};
20012017 		};
20022018 
20032019 		target-module@96000 {			/* 0x48096000, ap 37 26.0 */
20042020 			compatible = "ti,sysc-omap2", "ti,sysc";
2005
-			ti,hwmods = "mcbsp4";
20062021 			reg = <0x9608c 0x4>;
20072022 			reg-names = "sysc";
20082023 			ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY |
....@@ -2034,7 +2049,6 @@
20342049 
20352050 		target-module@98000 {			/* 0x48098000, ap 49 22.0 */
20362051 			compatible = "ti,sysc-omap4", "ti,sysc";
2037
-			ti,hwmods = "mcspi1";
20382052 			reg = <0x98000 0x4>,
20392053 			      <0x98010 0x4>;
20402054 			reg-names = "rev", "sysc";
....@@ -2073,7 +2087,6 @@
20732087 
20742088 		target-module@9a000 {			/* 0x4809a000, ap 51 2c.0 */
20752089 			compatible = "ti,sysc-omap4", "ti,sysc";
2076
-			ti,hwmods = "mcspi2";
20772090 			reg = <0x9a000 0x4>,
20782091 			      <0x9a010 0x4>;
20792092 			reg-names = "rev", "sysc";
....@@ -2107,7 +2120,6 @@
21072120 
21082121 		target-module@9c000 {			/* 0x4809c000, ap 53 36.0 */
21092122 			compatible = "ti,sysc-omap4", "ti,sysc";
2110
-			ti,hwmods = "mmc1";
21112123 			reg = <0x9c000 0x4>,
21122124 			      <0x9c010 0x4>;
21132125 			reg-names = "rev", "sysc";
....@@ -2165,6 +2177,35 @@
21652177 				 <0x00001000 0x000a5000 0x00001000>;
21662178 		};
21672179 
2180
+		des_target: target-module@a5000 {	/* 0x480a5000 */
2181
+			compatible = "ti,sysc-omap2", "ti,sysc";
2182
+			reg = <0xa5030 0x4>,
2183
+			      <0xa5034 0x4>,
2184
+			      <0xa5038 0x4>;
2185
+			reg-names = "rev", "sysc", "syss";
2186
+			ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET |
2187
+					 SYSC_OMAP2_AUTOIDLE)>;
2188
+			ti,sysc-sidle = <SYSC_IDLE_FORCE>,
2189
+					<SYSC_IDLE_NO>,
2190
+					<SYSC_IDLE_SMART>,
2191
+					<SYSC_IDLE_SMART_WKUP>;
2192
+			ti,syss-mask = <1>;
2193
+			/* Domains (P, C): l4per_pwrdm, l4_secure_clkdm */
2194
+			clocks = <&l4_secure_clkctrl OMAP4_DES3DES_CLKCTRL 0>;
2195
+			clock-names = "fck";
2196
+			#address-cells = <1>;
2197
+			#size-cells = <1>;
2198
+			ranges = <0 0xa5000 0x00001000>;
2199
+
2200
+			des: des@0 {
2201
+				compatible = "ti,omap4-des";
2202
+				reg = <0 0xa0>;
2203
+				interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
2204
+				dmas = <&sdma 117>, <&sdma 116>;
2205
+				dma-names = "tx", "rx";
2206
+			};
2207
+		};
2208
+
21682209 		target-module@a8000 {			/* 0x480a8000, ap 61 3e.0 */
21692210 			compatible = "ti,sysc";
21702211 			status = "disabled";
....@@ -2175,7 +2216,6 @@
21752216 
21762217 		target-module@ad000 {			/* 0x480ad000, ap 63 50.0 */
21772218 			compatible = "ti,sysc-omap4", "ti,sysc";
2178
-			ti,hwmods = "mmc3";
21792219 			reg = <0xad000 0x4>,
21802220 			      <0xad010 0x4>;
21812221 			reg-names = "rev", "sysc";
....@@ -2216,7 +2256,6 @@
22162256 
22172257 		target-module@b2000 {			/* 0x480b2000, ap 65 3c.0 */
22182258 			compatible = "ti,sysc-omap2", "ti,sysc";
2219
-			ti,hwmods = "hdq1w";
22202259 			reg = <0xb2000 0x4>,
22212260 			      <0xb2014 0x4>,
22222261 			      <0xb2018 0x4>;
....@@ -2241,7 +2280,6 @@
22412280 
22422281 		target-module@b4000 {			/* 0x480b4000, ap 67 46.0 */
22432282 			compatible = "ti,sysc-omap4", "ti,sysc";
2244
-			ti,hwmods = "mmc2";
22452283 			reg = <0xb4000 0x4>,
22462284 			      <0xb4010 0x4>;
22472285 			reg-names = "rev", "sysc";
....@@ -2274,7 +2312,6 @@
22742312 
22752313 		target-module@b8000 {			/* 0x480b8000, ap 69 58.0 */
22762314 			compatible = "ti,sysc-omap4", "ti,sysc";
2277
-			ti,hwmods = "mcspi3";
22782315 			reg = <0xb8000 0x4>,
22792316 			      <0xb8010 0x4>;
22802317 			reg-names = "rev", "sysc";
....@@ -2305,7 +2342,6 @@
23052342 
23062343 		target-module@ba000 {			/* 0x480ba000, ap 71 32.0 */
23072344 			compatible = "ti,sysc-omap4", "ti,sysc";
2308
-			ti,hwmods = "mcspi4";
23092345 			reg = <0xba000 0x4>,
23102346 			      <0xba010 0x4>;
23112347 			reg-names = "rev", "sysc";
....@@ -2336,7 +2372,6 @@
23362372 
23372373 		target-module@d1000 {			/* 0x480d1000, ap 73 44.0 */
23382374 			compatible = "ti,sysc-omap4", "ti,sysc";
2339
-			ti,hwmods = "mmc4";
23402375 			reg = <0xd1000 0x4>,
23412376 			      <0xd1010 0x4>;
23422377 			reg-names = "rev", "sysc";
....@@ -2369,7 +2404,6 @@
23692404 
23702405 		target-module@d5000 {			/* 0x480d5000, ap 75 4e.0 */
23712406 			compatible = "ti,sysc-omap4", "ti,sysc";
2372
-			ti,hwmods = "mmc5";
23732407 			reg = <0xd5000 0x4>,
23742408 			      <0xd5010 0x4>;
23752409 			reg-names = "rev", "sysc";
....@@ -2410,7 +2444,6 @@
24102444 
24112445 		target-module@150000 {			/* 0x48350000, ap 77 4c.0 */
24122446 			compatible = "ti,sysc-omap2", "ti,sysc";
2413
-			ti,hwmods = "i2c4";
24142447 			reg = <0x150000 0x8>,
24152448 			      <0x150010 0x8>,
24162449 			      <0x150090 0x8>;