Merge pull request #3496 from jernejsk/linux_51_final

Allwinner: update to Linux 5.1

packages/linux-drivers/gpu-sunxi-midgard/patches/09-fix-building-with-5.1.patch

@@ -0,0 +1,15 @@
+diff -Nur a/driver/product/kernel/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c b/driver/product/kernel/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
+--- a/driver/product/kernel/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c	2019-04-18 22:11:29.000000000 +0200
++++ b/driver/product/kernel/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c	2019-04-18 22:15:09.982940904 +0200
+@@ -1661,7 +1661,11 @@
+ static int kbase_cpu_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+ {
+ #else
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0))
+ static int kbase_cpu_vm_fault(struct vm_fault *vmf)
++#else
++static vm_fault_t kbase_cpu_vm_fault(struct vm_fault *vmf)
++#endif
+ {
+ 	struct vm_area_struct *vma = vmf->vma;
+ #endif

packages/linux-drivers/gpu-sunxi/patches/fix-building-with-5.1.patch

@@ -0,0 +1,14 @@
+diff -Nur a/driver/src/devicedrv/mali/linux/mali_memory.c b/driver/src/devicedrv/mali/linux/mali_memory.c
+--- a/driver/src/devicedrv/mali/linux/mali_memory.c	2018-09-13 08:52:20.000000000 +0200
++++ b/driver/src/devicedrv/mali/linux/mali_memory.c	2019-04-18 19:58:27.389785486 +0200
+@@ -70,7 +70,9 @@
+ 	}
+ }
+
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
++static vm_fault_t mali_mem_vma_fault(struct vm_fault *vmf)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+ static int mali_mem_vma_fault(struct vm_fault *vmf)
+ #else
+ static int mali_mem_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)

projects/Allwinner/devices/H3/patches/linux/01-increase-bt-speed.patch

@@ -0,0 +1,12 @@
+diff --git a/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi b/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi
+index 39263e74fbb5..0ec6109ec625 100644
+--- a/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi
++++ b/arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi
+@@ -219,6 +219,7 @@
+
+ 	bluetooth {
+ 		compatible = "brcm,bcm43438-bt";
++		max-speed = <1500000>;
+ 		clocks = <&rtc 1>;
+ 		clock-names = "lpo";
+ 		vbat-supply = <&reg_vcc3v3>;

projects/Allwinner/devices/H6/patches/linux/03-VPU.patch

@@ -125,81 +125,6 @@ index ff11cbeba205..b98add3cdedd 100644
 2.20.1
 
 
-From b4ca53c594950b80d71ac320b3505a303e7f6092 Mon Sep 17 00:00:00 2001
-From: Jernej Skrabec <[email protected]>
-Date: Mon, 28 Jan 2019 20:05:47 +0100
-Subject: [PATCH 4/6] dt-bindings: sram: sunxi: Add compatible for the H6 SRAM
- C1
-
-This introduces a new compatible for the H6 SRAM C1 section, that is
-compatible with the SRAM C1 section as found on the A10.
-
-Signed-off-by: Jernej Skrabec <[email protected]>
----
- Documentation/devicetree/bindings/sram/sunxi-sram.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Documentation/devicetree/bindings/sram/sunxi-sram.txt b/Documentation/devicetree/bindings/sram/sunxi-sram.txt
-index ab5a70bb9a64..380246a805f2 100644
---- a/Documentation/devicetree/bindings/sram/sunxi-sram.txt
-+++ b/Documentation/devicetree/bindings/sram/sunxi-sram.txt
-@@ -63,6 +63,7 @@ The valid sections compatible for H5 are:
-
- The valid sections compatible for H6 are:
-     - allwinner,sun50i-h6-sram-c, allwinner,sun50i-a64-sram-c
-+    - allwinner,sun50i-h6-sram-c1, allwinner,sun4i-a10-sram-c1
-
- The valid sections compatible for F1C100s are:
-     - allwinner,suniv-f1c100s-sram-d, allwinner,sun4i-a10-sram-d
--- 
-2.20.1
-
-
-From 6a505c910b90581b2a980e52f9b6fcb03d234cb7 Mon Sep 17 00:00:00 2001
-From: Jernej Skrabec <[email protected]>
-Date: Mon, 28 Jan 2019 19:53:30 +0100
-Subject: [PATCH 5/6] arm64: dts: allwinner: h6: Add support for the SRAM C1
- section
-
-Add a node for H6 SRAM C1 section.
-
-Manual calls it VE SRAM, but for consistency with older SoCs, SRAM C1
-name is used.
-
-Signed-off-by: Jernej Skrabec <[email protected]>
----
- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
-index d93a7add67e7..247dc0a5ce89 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
-@@ -167,6 +167,20 @@
- 					reg = <0x0000 0x1e000>;
- 				};
- 			};
-+
-+			sram_c1: sram@1a00000 {
-+				compatible = "mmio-sram";
-+				reg = <0x01a00000 0x200000>;
-+				#address-cells = <1>;
-+				#size-cells = <1>;
-+				ranges = <0 0x01a00000 0x200000>;
-+
-+				ve_sram: sram-section@0 {
-+					compatible = "allwinner,sun50i-h6-sram-c1",
-+						     "allwinner,sun4i-a10-sram-c1";
-+					reg = <0x000000 0x200000>;
-+				};
-+			};
- 		};
-
- 		ccu: clock@3001000 {
--- 
-2.20.1
-
-
 From c1b3128ac98c05c0afde4e6e065d6b1f2ae1dfa7 Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <[email protected]>
 Date: Mon, 28 Jan 2019 19:59:27 +0100