From: Olof Johansson <olof@lixom.net>
Date: Wed, 12 Dec 2018 21:59:58 +0000 (-0800)
Subject: Merge tag 'sunxi-h3-h5-for-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=69c5f266d8808cd507a12b2c7c9ed7fc678c6487;p=linux.git

Merge tag 'sunxi-h3-h5-for-4.21' of https://git./linux/kernel/git/sunxi/linux into next/dt

Allwinner H3/H5 changes for 4.21

Our usual pull request with the changes shared between the H3 and H5 SoCs.

The major changes for this release are:
  - Addition of the video engine for the H5
  - H3 Camera support
  - New board: Emlid Neutis N5, Mapleboard MP130

* tag 'sunxi-h3-h5-for-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: dts: allwinner: h5: Add Video Engine node
  ARM/arm64: dts: allwinner: Move H3/H5 syscon label over to soc-specific nodes
  arm64: dts: allwinner: h5: Add system-control node with SRAM C1
  ARM: dts: sun8i: h3: Fix the system-control register range
  ARM: dts: sun8i: Add the H3/H5 CSI controller
  ARM: dts: sun8i-h3: Add dts for the Mapleboard MP130
  arm64: dts: allwinner: new board - Emlid Neutis N5
  dt-bindings: vendor-prefix: new vendor - Emlid
  ARM: dts: sun8i-h3: add sy8106a to orange pi plus

Signed-off-by: Olof Johansson <olof@lixom.net>
---

69c5f266d8808cd507a12b2c7c9ed7fc678c6487
diff --cc arch/arm/boot/dts/sun8i-h3.dtsi
index d50dbd5a7ffa8,e93c4716512e8..959d265e7254c
--- a/arch/arm/boot/dts/sun8i-h3.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3.dtsi
@@@ -119,10 -119,24 +119,10 @@@
  			     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
  	};
  
 -	reserved-memory {
 -		#address-cells = <1>;
 -		#size-cells = <1>;
 -		ranges;
 -
 -		cma_pool: cma@4a000000 {
 -			compatible = "shared-dma-pool";
 -			size = <0x6000000>;
 -			alloc-ranges = <0x4a000000 0x6000000>;
 -			reusable;
 -			linux,cma-default;
 -		};
 -	};
 -
  	soc {
- 		system-control@1c00000 {
+ 		syscon: system-control@1c00000 {
  			compatible = "allwinner,sun8i-h3-system-control";
- 			reg = <0x01c00000 0x30>;
+ 			reg = <0x01c00000 0x1000>;
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges;