Inter-revision diff: patch 2

Comparing v10 (message) to v3 (message)

--- v10
+++ v3
@@ -3,14 +3,14 @@
 
 Signed-off-by: Long Cheng <long.cheng@mediatek.com>
 ---
- arch/arm64/boot/dts/mediatek/mt2712e.dtsi |   51 +++++++++++++++++++++++++++++
- 1 file changed, 51 insertions(+)
+ arch/arm64/boot/dts/mediatek/mt2712e.dtsi |   50 +++++++++++++++++++++++++++++
+ 1 file changed, 50 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/mediatek/mt2712e.dtsi b/arch/arm64/boot/dts/mediatek/mt2712e.dtsi
-index ee627a7..3469a6c 100644
+index 976d92a..a59728b 100644
 --- a/arch/arm64/boot/dts/mediatek/mt2712e.dtsi
 +++ b/arch/arm64/boot/dts/mediatek/mt2712e.dtsi
-@@ -298,6 +298,9 @@
+@@ -300,6 +300,9 @@
  		interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_LOW>;
  		clocks = <&baud_clk>, <&sys_clk>;
  		clock-names = "baud", "bus";
@@ -20,8 +20,8 @@
  		status = "disabled";
  	};
  
-@@ -346,6 +349,39 @@
- 			 (GIC_CPU_MASK_RAW(0x13) | IRQ_TYPE_LEVEL_HIGH)>;
+@@ -378,6 +381,38 @@
+ 		status = "disabled";
  	};
  
 +	apdma: dma-controller@11000400 {
@@ -51,16 +51,15 @@
 +			     <GIC_SPI 112 IRQ_TYPE_LEVEL_LOW>,
 +			     <GIC_SPI 113 IRQ_TYPE_LEVEL_LOW>,
 +			     <GIC_SPI 114 IRQ_TYPE_LEVEL_LOW>;
-+		dma-requests = <12>;
 +		clocks = <&pericfg CLK_PERI_AP_DMA>;
 +		clock-names = "apdma";
 +		#dma-cells = <1>;
 +	};
 +
- 	auxadc: adc@11001000 {
- 		compatible = "mediatek,mt2712-auxadc";
- 		reg = <0 0x11001000 0 0x1000>;
-@@ -362,6 +398,9 @@
+ 	uart0: serial@11002000 {
+ 		compatible = "mediatek,mt2712-uart",
+ 			     "mediatek,mt6577-uart";
+@@ -385,6 +420,9 @@
  		interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_LOW>;
  		clocks = <&baud_clk>, <&sys_clk>;
  		clock-names = "baud", "bus";
@@ -70,7 +69,7 @@
  		status = "disabled";
  	};
  
-@@ -372,6 +411,9 @@
+@@ -395,6 +433,9 @@
  		interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_LOW>;
  		clocks = <&baud_clk>, <&sys_clk>;
  		clock-names = "baud", "bus";
@@ -80,7 +79,7 @@
  		status = "disabled";
  	};
  
-@@ -382,6 +424,9 @@
+@@ -405,6 +446,9 @@
  		interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_LOW>;
  		clocks = <&baud_clk>, <&sys_clk>;
  		clock-names = "baud", "bus";
@@ -90,7 +89,7 @@
  		status = "disabled";
  	};
  
-@@ -392,6 +437,9 @@
+@@ -415,6 +459,9 @@
  		interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_LOW>;
  		clocks = <&baud_clk>, <&sys_clk>;
  		clock-names = "baud", "bus";
@@ -100,7 +99,7 @@
  		status = "disabled";
  	};
  
-@@ -402,6 +450,9 @@
+@@ -629,6 +676,9 @@
  		interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_LOW>;
  		clocks = <&baud_clk>, <&sys_clk>;
  		clock-names = "baud", "bus";
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help