change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/arch/arm/boot/dts/exynos4.dtsi
..
..
@@ -51,6 +51,12 @@
51
51
 		serial3 = &serial_3;
52
52
 	};
53
53
 
54
+	pmu: pmu {
55
+		compatible = "arm,cortex-a9-pmu";
56
+		interrupt-parent = <&combiner>;
57
+		status = "disabled";
58
+	};
59
+
54
60
 	soc: soc {
55
61
 		compatible = "simple-bus";
56
62
 		#address-cells = <1>;
..
..
@@ -105,28 +111,28 @@
105
111
 			syscon = <&pmu_system_controller>;
106
112
 		};
107
113
 
108
-		pd_mfc: mfc-power-domain@10023c40 {
114
+		pd_mfc: power-domain@10023c40 {
109
115
 			compatible = "samsung,exynos4210-pd";
110
116
 			reg = <0x10023C40 0x20>;
111
117
 			#power-domain-cells = <0>;
112
118
 			label = "MFC";
113
119
 		};
114
120
 
115
-		pd_g3d: g3d-power-domain@10023c60 {
121
+		pd_g3d: power-domain@10023c60 {
116
122
 			compatible = "samsung,exynos4210-pd";
117
123
 			reg = <0x10023C60 0x20>;
118
124
 			#power-domain-cells = <0>;
119
125
 			label = "G3D";
120
126
 		};
121
127
 
122
-		pd_lcd0: lcd0-power-domain@10023c80 {
128
+		pd_lcd0: power-domain@10023c80 {
123
129
 			compatible = "samsung,exynos4210-pd";
124
130
 			reg = <0x10023C80 0x20>;
125
131
 			#power-domain-cells = <0>;
126
132
 			label = "LCD0";
127
133
 		};
128
134
 
129
-		pd_tv: tv-power-domain@10023c20 {
135
+		pd_tv: power-domain@10023c20 {
130
136
 			compatible = "samsung,exynos4210-pd";
131
137
 			reg = <0x10023C20 0x20>;
132
138
 			#power-domain-cells = <0>;
..
..
@@ -134,21 +140,21 @@
134
140
 			label = "TV";
135
141
 		};
136
142
 
137
-		pd_cam: cam-power-domain@10023c00 {
143
+		pd_cam: power-domain@10023c00 {
138
144
 			compatible = "samsung,exynos4210-pd";
139
145
 			reg = <0x10023C00 0x20>;
140
146
 			#power-domain-cells = <0>;
141
147
 			label = "CAM";
142
148
 		};
143
149
 
144
-		pd_gps: gps-power-domain@10023ce0 {
150
+		pd_gps: power-domain@10023ce0 {
145
151
 			compatible = "samsung,exynos4210-pd";
146
152
 			reg = <0x10023CE0 0x20>;
147
153
 			#power-domain-cells = <0>;
148
154
 			label = "GPS";
149
155
 		};
150
156
 
151
-		pd_gps_alive: gps-alive-power-domain@10023d00 {
157
+		pd_gps_alive: power-domain@10023d00 {
152
158
 			compatible = "samsung,exynos4210-pd";
153
159
 			reg = <0x10023D00 0x20>;
154
160
 			#power-domain-cells = <0>;
..
..
@@ -167,12 +173,6 @@
167
173
 			#interrupt-cells = <2>;
168
174
 			interrupt-controller;
169
175
 			reg = <0x10440000 0x1000>;
170
-		};
171
-
172
-		pmu: pmu {
173
-			compatible = "arm,cortex-a9-pmu";
174
-			interrupt-parent = <&combiner>;
175
-			interrupts = <2 2>, <3 2>;
176
176
 		};
177
177
 
178
178
 		sys_reg: syscon@10010000 {
..
..
@@ -380,23 +380,8 @@
380
380
 			clocks = <&clock CLK_USB_HOST>;
381
381
 			clock-names = "usbhost";
382
382
 			status = "disabled";
383
-			#address-cells = <1>;
384
-			#size-cells = <0>;
385
-			port@0 {
386
-				reg = <0>;
387
-				phys = <&exynos_usbphy 1>;
388
-				status = "disabled";
389
-			};
390
-			port@1 {
391
-				reg = <1>;
392
-				phys = <&exynos_usbphy 2>;
393
-				status = "disabled";
394
-			};
395
-			port@2 {
396
-				reg = <2>;
397
-				phys = <&exynos_usbphy 3>;
398
-				status = "disabled";
399
-			};
383
+			phys = <&exynos_usbphy 1>, <&exynos_usbphy 2>, <&exynos_usbphy 3>;
384
+			phy-names = "host", "hsic0", "hsic1";
400
385
 		};
401
386
 
402
387
 		ohci: ohci@12590000 {
..
..
@@ -406,13 +391,22 @@
406
391
 			clocks = <&clock CLK_USB_HOST>;
407
392
 			clock-names = "usbhost";
408
393
 			status = "disabled";
409
-			#address-cells = <1>;
410
-			#size-cells = <0>;
411
-			port@0 {
412
-				reg = <0>;
413
-				phys = <&exynos_usbphy 1>;
414
-				status = "disabled";
415
-			};
394
+			phys = <&exynos_usbphy 1>;
395
+			phy-names = "host";
396
+		};
397
+
398
+		gpu: gpu@13000000 {
399
+			compatible = "samsung,exynos4210-mali", "arm,mali-400";
400
+			reg = <0x13000000 0x10000>;
401
+			/*
402
+			 * CLK_G3D is not actually bus clock but a IP-level clock.
403
+			 * The bus clock is not described in hardware manual.
404
+			 */
405
+			clocks = <&clock CLK_G3D>,
406
+				 <&clock CLK_SCLK_G3D>;
407
+			clock-names = "bus", "core";
408
+			power-domains = <&pd_g3d>;
409
+			status = "disabled";
416
410
 		};
417
411
 
418
412
 		i2s1: i2s@13960000 {
..
..
@@ -611,7 +605,7 @@
611
605
 			status = "disabled";
612
606
 
613
607
 			hdmi_i2c_phy: hdmiphy@38 {
614
-				compatible = "exynos4210-hdmiphy";
608
+				compatible = "samsung,exynos4210-hdmiphy";
615
609
 				reg = <0x38>;
616
610
 			};
617
611
 		};
..
..
@@ -675,45 +669,37 @@
675
669
 			status = "disabled";
676
670
 		};
677
671
 
678
-		amba {
679
-			#address-cells = <1>;
680
-			#size-cells = <1>;
681
-			compatible = "simple-bus";
682
-			interrupt-parent = <&gic>;
683
-			ranges;
672
+		pdma0: pdma@12680000 {
673
+			compatible = "arm,pl330", "arm,primecell";
674
+			reg = <0x12680000 0x1000>;
675
+			interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
676
+			clocks = <&clock CLK_PDMA0>;
677
+			clock-names = "apb_pclk";
678
+			#dma-cells = <1>;
679
+			#dma-channels = <8>;
680
+			#dma-requests = <32>;
681
+		};
684
682
 
685
-			pdma0: pdma@12680000 {
686
-				compatible = "arm,pl330", "arm,primecell";
687
-				reg = <0x12680000 0x1000>;
688
-				interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
689
-				clocks = <&clock CLK_PDMA0>;
690
-				clock-names = "apb_pclk";
691
-				#dma-cells = <1>;
692
-				#dma-channels = <8>;
693
-				#dma-requests = <32>;
694
-			};
683
+		pdma1: pdma@12690000 {
684
+			compatible = "arm,pl330", "arm,primecell";
685
+			reg = <0x12690000 0x1000>;
686
+			interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
687
+			clocks = <&clock CLK_PDMA1>;
688
+			clock-names = "apb_pclk";
689
+			#dma-cells = <1>;
690
+			#dma-channels = <8>;
691
+			#dma-requests = <32>;
692
+		};
695
693
 
696
-			pdma1: pdma@12690000 {
697
-				compatible = "arm,pl330", "arm,primecell";
698
-				reg = <0x12690000 0x1000>;
699
-				interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
700
-				clocks = <&clock CLK_PDMA1>;
701
-				clock-names = "apb_pclk";
702
-				#dma-cells = <1>;
703
-				#dma-channels = <8>;
704
-				#dma-requests = <32>;
705
-			};
706
-
707
-			mdma1: mdma@12850000 {
708
-				compatible = "arm,pl330", "arm,primecell";
709
-				reg = <0x12850000 0x1000>;
710
-				interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
711
-				clocks = <&clock CLK_MDMA>;
712
-				clock-names = "apb_pclk";
713
-				#dma-cells = <1>;
714
-				#dma-channels = <8>;
715
-				#dma-requests = <1>;
716
-			};
694
+		mdma1: mdma@12850000 {
695
+			compatible = "arm,pl330", "arm,primecell";
696
+			reg = <0x12850000 0x1000>;
697
+			interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
698
+			clocks = <&clock CLK_MDMA>;
699
+			clock-names = "apb_pclk";
700
+			#dma-cells = <1>;
701
+			#dma-channels = <8>;
702
+			#dma-requests = <1>;
717
703
 		};
718
704
 
719
705
 		fimd: fimd@11c00000 {