enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove useless patches according to 5.0.y

Browse Source
This commit is contained in:
Martin Ayotte 2019-03-14 18:14:27 -04:00
parent b9cc9c9c71
commit d594f50193
7 changed files with 0 additions and 825 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
patch/kernel/sunxi-dev/0003-net-stmmac-dwmac-sun8i-support-RGMII-modes-with-PHY-.patch
View File

@ -1,35 +0,0 @@
From 98800eeb2244387e821f4af8d21ccf2deaf18da0 Mon Sep 17 00:00:00 2001
From: Icenowy Zheng <icenowy@aosc.io>
Date: Mon, 21 Aug 2017 23:02:32 +0800
Subject: [PATCH 003/146] net: stmmac: dwmac-sun8i: support RGMII modes with
PHY internal delay
Some boards uses a PHY with internal delay with an Allwinner SoC.
Support these PHY modes in the driver.
As the driver has no configuration registers for these modes, just treat
them as ordinary RGMII.
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
---
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
index f9a61f90cfbc..3c18f4a9dd6c 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
@@ -933,6 +933,9 @@ static int sun8i_dwmac_set_syscon(struct stmmac_priv *priv)
/* default */
break;
case PHY_INTERFACE_MODE_RGMII:
+ case PHY_INTERFACE_MODE_RGMII_ID:
+ case PHY_INTERFACE_MODE_RGMII_RXID:
+ case PHY_INTERFACE_MODE_RGMII_TXID:
reg |= SYSCON_EPIT | SYSCON_ETCS_INT_GMII;
break;
case PHY_INTERFACE_MODE_RMII:
--
2.17.1

30
patch/kernel/sunxi-dev/0064-drm-lima-Kconfig-only-depend-on-ARM-or-ARM64.patch
View File

@ -1,30 +0,0 @@
From 6d3f37068bbfac21355642148a182c125eb28d19 Mon Sep 17 00:00:00 2001
From: Qiang Yu <yuq825@gmail.com>
Date: Thu, 24 May 2018 14:22:03 +0800
Subject: [PATCH 064/146] drm/lima: Kconfig only depend on ARM or ARM64
The depend list gets longer and longer. When adding
ARCH_ZYNQMP I decide to just depend on ARM or ARM64
as this GPU can be seen on many ARM SoCs.
Signed-off-by: Qiang Yu <yuq825@gmail.com>
---
drivers/gpu/drm/lima/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/lima/Kconfig b/drivers/gpu/drm/lima/Kconfig
index 7256625aee04..870f66f407b8 100644
--- a/drivers/gpu/drm/lima/Kconfig
+++ b/drivers/gpu/drm/lima/Kconfig
@@ -4,7 +4,7 @@
config DRM_LIMA
tristate "LIMA (DRM support for ARM Mali 400/450 GPU)"
depends on DRM
- depends on ARCH_SUNXI || ARCH_ROCKCHIP || ARCH_EXYNOS || ARCH_MESON
+ depends on ARM || ARM64 || COMPILE_TEST
select DRM_SCHED
select DRM_TTM
help
--
2.17.1

514
patch/kernel/sunxi-dev/0071-drm-lima-update-SPDX-header-to-match-kernel-rules.patch
View File

@ -1,514 +0,0 @@
From d1267be906c38af372a6b1ebe5145158667e6768 Mon Sep 17 00:00:00 2001
From: Qiang Yu <yuq825@gmail.com>
Date: Thu, 31 May 2018 22:37:45 +0800
Subject: [PATCH 071/146] drm/lima: update SPDX header to match kernel rules
See
https://www.kernel.org/doc/html/latest/process/license-rules.html
Signed-off-by: Qiang Yu <yuq825@gmail.com>
---
drivers/gpu/drm/lima/Kconfig | 2 +-
drivers/gpu/drm/lima/Makefile | 2 +-
drivers/gpu/drm/lima/lima_bcast.c | 5 ++---
drivers/gpu/drm/lima/lima_bcast.h | 5 ++---
drivers/gpu/drm/lima/lima_ctx.c | 5 ++---
drivers/gpu/drm/lima/lima_ctx.h | 5 ++---
drivers/gpu/drm/lima/lima_device.c | 5 ++---
drivers/gpu/drm/lima/lima_device.h | 5 ++---
drivers/gpu/drm/lima/lima_dlbu.c | 5 ++---
drivers/gpu/drm/lima/lima_dlbu.h | 5 ++---
drivers/gpu/drm/lima/lima_drv.c | 5 ++---
drivers/gpu/drm/lima/lima_drv.h | 5 ++---
drivers/gpu/drm/lima/lima_gem.c | 5 ++---
drivers/gpu/drm/lima/lima_gem.h | 5 ++---
drivers/gpu/drm/lima/lima_gem_prime.c | 5 ++---
drivers/gpu/drm/lima/lima_gem_prime.h | 5 ++---
drivers/gpu/drm/lima/lima_gp.c | 5 ++---
drivers/gpu/drm/lima/lima_gp.h | 5 ++---
drivers/gpu/drm/lima/lima_l2_cache.c | 5 ++---
drivers/gpu/drm/lima/lima_l2_cache.h | 5 ++---
drivers/gpu/drm/lima/lima_mmu.c | 5 ++---
drivers/gpu/drm/lima/lima_mmu.h | 5 ++---
drivers/gpu/drm/lima/lima_object.c | 5 ++---
drivers/gpu/drm/lima/lima_object.h | 5 ++---
drivers/gpu/drm/lima/lima_pmu.c | 5 ++---
drivers/gpu/drm/lima/lima_pmu.h | 5 ++---
drivers/gpu/drm/lima/lima_pp.c | 5 ++---
drivers/gpu/drm/lima/lima_pp.h | 5 ++---
drivers/gpu/drm/lima/lima_regs.h | 2 +-
drivers/gpu/drm/lima/lima_sched.c | 5 ++---
drivers/gpu/drm/lima/lima_sched.h | 5 ++---
drivers/gpu/drm/lima/lima_ttm.c | 5 ++---
drivers/gpu/drm/lima/lima_ttm.h | 5 ++---
drivers/gpu/drm/lima/lima_vm.c | 5 ++---
drivers/gpu/drm/lima/lima_vm.h | 5 ++---
include/uapi/drm/lima_drm.h | 5 ++---
36 files changed, 69 insertions(+), 102 deletions(-)
diff --git a/drivers/gpu/drm/lima/Kconfig b/drivers/gpu/drm/lima/Kconfig
index 870f66f407b8..bb75bcb97ccb 100644
--- a/drivers/gpu/drm/lima/Kconfig
+++ b/drivers/gpu/drm/lima/Kconfig
@@ -1,5 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0 OR MIT
# Copyright 2017-2018 Qiang Yu <yuq825@gmail.com>
-# SPDX-License-Identifier: MIT
config DRM_LIMA
tristate "LIMA (DRM support for ARM Mali 400/450 GPU)"
diff --git a/drivers/gpu/drm/lima/Makefile b/drivers/gpu/drm/lima/Makefile
index 848310557e42..8bb97410d961 100644
--- a/drivers/gpu/drm/lima/Makefile
+++ b/drivers/gpu/drm/lima/Makefile
@@ -1,5 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0 OR MIT
# Copyright 2017-2018 Qiang Yu <yuq825@gmail.com>
-# SPDX-License-Identifier: MIT
lima-y := \
lima_drv.o \
diff --git a/drivers/gpu/drm/lima/lima_bcast.c b/drivers/gpu/drm/lima/lima_bcast.c
index 0786336d3c77..6c2004dce648 100644
--- a/drivers/gpu/drm/lima/lima_bcast.c
+++ b/drivers/gpu/drm/lima/lima_bcast.c
@@ -1,6 +1,5 @@
-/* Copyright 2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/* Copyright 2018 Qiang Yu <yuq825@gmail.com> */
#include <linux/io.h>
#include <linux/device.h>
diff --git a/drivers/gpu/drm/lima/lima_bcast.h b/drivers/gpu/drm/lima/lima_bcast.h
index f1ba32852742..fb8e1f318c5c 100644
--- a/drivers/gpu/drm/lima/lima_bcast.h
+++ b/drivers/gpu/drm/lima/lima_bcast.h
@@ -1,6 +1,5 @@
-/* Copyright 2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/* Copyright 2018 Qiang Yu <yuq825@gmail.com> */
#ifndef __LIMA_BCAST_H__
#define __LIMA_BCAST_H__
diff --git a/drivers/gpu/drm/lima/lima_ctx.c b/drivers/gpu/drm/lima/lima_ctx.c
index 3c8f0aba0169..3f8a944d9266 100644
--- a/drivers/gpu/drm/lima/lima_ctx.c
+++ b/drivers/gpu/drm/lima/lima_ctx.c
@@ -1,6 +1,5 @@
-/* Copyright 2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/* Copyright 2018 Qiang Yu <yuq825@gmail.com> */
#include <linux/slab.h>
diff --git a/drivers/gpu/drm/lima/lima_ctx.h b/drivers/gpu/drm/lima/lima_ctx.h
index f3bee2e1893a..80e55e16619f 100644
--- a/drivers/gpu/drm/lima/lima_ctx.h
+++ b/drivers/gpu/drm/lima/lima_ctx.h
@@ -1,6 +1,5 @@
-/* Copyright 2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/* Copyright 2018 Qiang Yu <yuq825@gmail.com> */
#ifndef __LIMA_CTX_H__
#define __LIMA_CTX_H__
diff --git a/drivers/gpu/drm/lima/lima_device.c b/drivers/gpu/drm/lima/lima_device.c
index 8611ed466a29..c85196af8830 100644
--- a/drivers/gpu/drm/lima/lima_device.c
+++ b/drivers/gpu/drm/lima/lima_device.c
@@ -1,6 +1,5 @@
-/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com> */
#include <linux/regulator/consumer.h>
#include <linux/reset.h>
diff --git a/drivers/gpu/drm/lima/lima_device.h b/drivers/gpu/drm/lima/lima_device.h
index 29501f8361d9..d355a2c5c40b 100644
--- a/drivers/gpu/drm/lima/lima_device.h
+++ b/drivers/gpu/drm/lima/lima_device.h
@@ -1,6 +1,5 @@
-/* Copyright 2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/* Copyright 2018 Qiang Yu <yuq825@gmail.com> */
#ifndef __LIMA_DEVICE_H__
#define __LIMA_DEVICE_H__
diff --git a/drivers/gpu/drm/lima/lima_dlbu.c b/drivers/gpu/drm/lima/lima_dlbu.c
index 0b612149accb..444a74348d5e 100644
--- a/drivers/gpu/drm/lima/lima_dlbu.c
+++ b/drivers/gpu/drm/lima/lima_dlbu.c
@@ -1,6 +1,5 @@
-/* Copyright 2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/* Copyright 2018 Qiang Yu <yuq825@gmail.com> */
#include <linux/io.h>
#include <linux/device.h>
diff --git a/drivers/gpu/drm/lima/lima_dlbu.h b/drivers/gpu/drm/lima/lima_dlbu.h
index bc441dccb1ba..6d85403fa410 100644
--- a/drivers/gpu/drm/lima/lima_dlbu.h
+++ b/drivers/gpu/drm/lima/lima_dlbu.h
@@ -1,6 +1,5 @@
-/* Copyright 2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/* Copyright 2018 Qiang Yu <yuq825@gmail.com> */
#ifndef __LIMA_DLBU_H__
#define __LIMA_DLBU_H__
diff --git a/drivers/gpu/drm/lima/lima_drv.c b/drivers/gpu/drm/lima/lima_drv.c
index d3ab9f7abb93..e7004e4e1853 100644
--- a/drivers/gpu/drm/lima/lima_drv.c
+++ b/drivers/gpu/drm/lima/lima_drv.c
@@ -1,6 +1,5 @@
-/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com> */
#include <linux/module.h>
#include <linux/of_platform.h>
diff --git a/drivers/gpu/drm/lima/lima_drv.h b/drivers/gpu/drm/lima/lima_drv.h
index d7dba79950d6..455bf44ae25e 100644
--- a/drivers/gpu/drm/lima/lima_drv.h
+++ b/drivers/gpu/drm/lima/lima_drv.h
@@ -1,6 +1,5 @@
-/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com> */
#ifndef __LIMA_DRV_H__
#define __LIMA_DRV_H__
diff --git a/drivers/gpu/drm/lima/lima_gem.c b/drivers/gpu/drm/lima/lima_gem.c
index 3bdff19eb2f9..ee903ce17494 100644
--- a/drivers/gpu/drm/lima/lima_gem.c
+++ b/drivers/gpu/drm/lima/lima_gem.c
@@ -1,6 +1,5 @@
-/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com> */
#include <drm/drmP.h>
#include <linux/dma-mapping.h>
diff --git a/drivers/gpu/drm/lima/lima_gem.h b/drivers/gpu/drm/lima/lima_gem.h
index 35098b692b2e..03daad9a85af 100644
--- a/drivers/gpu/drm/lima/lima_gem.h
+++ b/drivers/gpu/drm/lima/lima_gem.h
@@ -1,6 +1,5 @@
-/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com> */
#ifndef __LIMA_GEM_H__
#define __LIMA_GEM_H__
diff --git a/drivers/gpu/drm/lima/lima_gem_prime.c b/drivers/gpu/drm/lima/lima_gem_prime.c
index 9a401a6a039b..0e0350ca7f87 100644
--- a/drivers/gpu/drm/lima/lima_gem_prime.c
+++ b/drivers/gpu/drm/lima/lima_gem_prime.c
@@ -1,6 +1,5 @@
-/* Copyright 2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/* Copyright 2018 Qiang Yu <yuq825@gmail.com> */
#include <linux/dma-buf.h>
#include <drm/drm_prime.h>
diff --git a/drivers/gpu/drm/lima/lima_gem_prime.h b/drivers/gpu/drm/lima/lima_gem_prime.h
index 407482f1a7c0..6dea7dd65b1a 100644
--- a/drivers/gpu/drm/lima/lima_gem_prime.h
+++ b/drivers/gpu/drm/lima/lima_gem_prime.h
@@ -1,6 +1,5 @@
-/* Copyright 2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/* Copyright 2018 Qiang Yu <yuq825@gmail.com> */
#ifndef __LIMA_GEM_PRIME_H__
#define __LIMA_GEM_PRIME_H__
diff --git a/drivers/gpu/drm/lima/lima_gp.c b/drivers/gpu/drm/lima/lima_gp.c
index 10d7ee16a1d5..706652cb1741 100644
--- a/drivers/gpu/drm/lima/lima_gp.c
+++ b/drivers/gpu/drm/lima/lima_gp.c
@@ -1,6 +1,5 @@
-/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com> */
#include <linux/interrupt.h>
#include <linux/io.h>
diff --git a/drivers/gpu/drm/lima/lima_gp.h b/drivers/gpu/drm/lima/lima_gp.h
index 45e654737767..55bc48ec7603 100644
--- a/drivers/gpu/drm/lima/lima_gp.h
+++ b/drivers/gpu/drm/lima/lima_gp.h
@@ -1,6 +1,5 @@
-/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com> */
#ifndef __LIMA_GP_H__
#define __LIMA_GP_H__
diff --git a/drivers/gpu/drm/lima/lima_l2_cache.c b/drivers/gpu/drm/lima/lima_l2_cache.c
index 25313ab5fe92..e7cdec720e5d 100644
--- a/drivers/gpu/drm/lima/lima_l2_cache.c
+++ b/drivers/gpu/drm/lima/lima_l2_cache.c
@@ -1,6 +1,5 @@
-/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com> */
#include <linux/io.h>
#include <linux/device.h>
diff --git a/drivers/gpu/drm/lima/lima_l2_cache.h b/drivers/gpu/drm/lima/lima_l2_cache.h
index 6ecc07e33430..2ff91eafefbe 100644
--- a/drivers/gpu/drm/lima/lima_l2_cache.h
+++ b/drivers/gpu/drm/lima/lima_l2_cache.h
@@ -1,6 +1,5 @@
-/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com> */
#ifndef __LIMA_L2_CACHE_H__
#define __LIMA_L2_CACHE_H__
diff --git a/drivers/gpu/drm/lima/lima_mmu.c b/drivers/gpu/drm/lima/lima_mmu.c
index 7de3935b5cc6..234fb90a4285 100644
--- a/drivers/gpu/drm/lima/lima_mmu.c
+++ b/drivers/gpu/drm/lima/lima_mmu.c
@@ -1,6 +1,5 @@
-/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com> */
#include <linux/interrupt.h>
#include <linux/io.h>
diff --git a/drivers/gpu/drm/lima/lima_mmu.h b/drivers/gpu/drm/lima/lima_mmu.h
index ac32f620e3d9..ca173b60fc73 100644
--- a/drivers/gpu/drm/lima/lima_mmu.h
+++ b/drivers/gpu/drm/lima/lima_mmu.h
@@ -1,6 +1,5 @@
-/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com> */
#ifndef __LIMA_MMU_H__
#define __LIMA_MMU_H__
diff --git a/drivers/gpu/drm/lima/lima_object.c b/drivers/gpu/drm/lima/lima_object.c
index 6ca17ef2e701..c44e1f81abf8 100644
--- a/drivers/gpu/drm/lima/lima_object.c
+++ b/drivers/gpu/drm/lima/lima_object.c
@@ -1,6 +1,5 @@
-/* Copyright 2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/* Copyright 2018 Qiang Yu <yuq825@gmail.com> */
#include <drm/drm_prime.h>
diff --git a/drivers/gpu/drm/lima/lima_object.h b/drivers/gpu/drm/lima/lima_object.h
index ae67de9d2565..7286514c0f07 100644
--- a/drivers/gpu/drm/lima/lima_object.h
+++ b/drivers/gpu/drm/lima/lima_object.h
@@ -1,6 +1,5 @@
-/* Copyright 2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/* Copyright 2018 Qiang Yu <yuq825@gmail.com> */
#ifndef __LIMA_OBJECT_H__
#define __LIMA_OBJECT_H__
diff --git a/drivers/gpu/drm/lima/lima_pmu.c b/drivers/gpu/drm/lima/lima_pmu.c
index f4548c90b6b7..e852077c1e52 100644
--- a/drivers/gpu/drm/lima/lima_pmu.c
+++ b/drivers/gpu/drm/lima/lima_pmu.c
@@ -1,6 +1,5 @@
-/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com> */
#include <linux/of.h>
#include <linux/io.h>
diff --git a/drivers/gpu/drm/lima/lima_pmu.h b/drivers/gpu/drm/lima/lima_pmu.h
index b807e9f42928..1cf94a35bdf9 100644
--- a/drivers/gpu/drm/lima/lima_pmu.h
+++ b/drivers/gpu/drm/lima/lima_pmu.h
@@ -1,6 +1,5 @@
-/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com> */
#ifndef __LIMA_PMU_H__
#define __LIMA_PMU_H__
diff --git a/drivers/gpu/drm/lima/lima_pp.c b/drivers/gpu/drm/lima/lima_pp.c
index 8db3d134e244..29e3ddfb394b 100644
--- a/drivers/gpu/drm/lima/lima_pp.c
+++ b/drivers/gpu/drm/lima/lima_pp.c
@@ -1,6 +1,5 @@
-/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com> */
#include <linux/interrupt.h>
#include <linux/io.h>
diff --git a/drivers/gpu/drm/lima/lima_pp.h b/drivers/gpu/drm/lima/lima_pp.h
index b928f9516d30..f83f8cb4d30a 100644
--- a/drivers/gpu/drm/lima/lima_pp.h
+++ b/drivers/gpu/drm/lima/lima_pp.h
@@ -1,6 +1,5 @@
-/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com> */
#ifndef __LIMA_PP_H__
#define __LIMA_PP_H__
diff --git a/drivers/gpu/drm/lima/lima_regs.h b/drivers/gpu/drm/lima/lima_regs.h
index d8c762c17e52..d5ade8fc8901 100644
--- a/drivers/gpu/drm/lima/lima_regs.h
+++ b/drivers/gpu/drm/lima/lima_regs.h
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright 2010-2017 ARM Limited. All rights reserved.
* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __LIMA_REGS_H__
diff --git a/drivers/gpu/drm/lima/lima_sched.c b/drivers/gpu/drm/lima/lima_sched.c
index 20ed966578a3..e725e793a668 100644
--- a/drivers/gpu/drm/lima/lima_sched.c
+++ b/drivers/gpu/drm/lima/lima_sched.c
@@ -1,6 +1,5 @@
-/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com> */
#include <linux/kthread.h>
#include <linux/slab.h>
diff --git a/drivers/gpu/drm/lima/lima_sched.h b/drivers/gpu/drm/lima/lima_sched.h
index 581b8601fe81..e1393767128f 100644
--- a/drivers/gpu/drm/lima/lima_sched.h
+++ b/drivers/gpu/drm/lima/lima_sched.h
@@ -1,6 +1,5 @@
-/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com> */
#ifndef __LIMA_SCHED_H__
#define __LIMA_SCHED_H__
diff --git a/drivers/gpu/drm/lima/lima_ttm.c b/drivers/gpu/drm/lima/lima_ttm.c
index 4be441b02f6c..a79ff0e86929 100644
--- a/drivers/gpu/drm/lima/lima_ttm.c
+++ b/drivers/gpu/drm/lima/lima_ttm.c
@@ -1,6 +1,5 @@
-/* Copyright 2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/* Copyright 2018 Qiang Yu <yuq825@gmail.com> */
#include <linux/mm.h>
#include <drm/ttm/ttm_page_alloc.h>
diff --git a/drivers/gpu/drm/lima/lima_ttm.h b/drivers/gpu/drm/lima/lima_ttm.h
index 42af0b136ffb..df3c06aa92a9 100644
--- a/drivers/gpu/drm/lima/lima_ttm.h
+++ b/drivers/gpu/drm/lima/lima_ttm.h
@@ -1,6 +1,5 @@
-/* Copyright 2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/* Copyright 2018 Qiang Yu <yuq825@gmail.com> */
#ifndef __LIMA_TTM_H__
#define __LIMA_TTM_H__
diff --git a/drivers/gpu/drm/lima/lima_vm.c b/drivers/gpu/drm/lima/lima_vm.c
index 514115df4e4c..a264f3ae83fe 100644
--- a/drivers/gpu/drm/lima/lima_vm.c
+++ b/drivers/gpu/drm/lima/lima_vm.c
@@ -1,6 +1,5 @@
-/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com> */
#include <linux/slab.h>
#include <linux/dma-mapping.h>
diff --git a/drivers/gpu/drm/lima/lima_vm.h b/drivers/gpu/drm/lima/lima_vm.h
index 598708ac0d31..f615f8dfe71d 100644
--- a/drivers/gpu/drm/lima/lima_vm.h
+++ b/drivers/gpu/drm/lima/lima_vm.h
@@ -1,6 +1,5 @@
-/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com> */
#ifndef __LIMA_VM_H__
#define __LIMA_VM_H__
diff --git a/include/uapi/drm/lima_drm.h b/include/uapi/drm/lima_drm.h
index a489bba517c7..e453bc4f0de4 100644
--- a/include/uapi/drm/lima_drm.h
+++ b/include/uapi/drm/lima_drm.h
@@ -1,6 +1,5 @@
-/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com>
- * SPDX-License-Identifier: MIT
- */
+/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR MIT */
+/* Copyright 2017-2018 Qiang Yu <yuq825@gmail.com> */
#ifndef __LIMA_DRM_H__
#define __LIMA_DRM_H__
--
2.17.1

107
patch/kernel/sunxi-dev/0085-clk-sunxi-ng-Adjust-MP-clock-parent-rate-when-allowe.patch
View File

@ -1,107 +0,0 @@
From b0019c82e8ffbce13b5a98eb4fa16b966809c04a Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@siol.net>
Date: Sun, 7 Oct 2018 11:38:38 +0200
Subject: [PATCH 085/146] clk: sunxi-ng: Adjust MP clock parent rate when
allowed
Currently MP clocks don't consider adjusting parent rate even if they
are allowed to do so. Such behaviour considerably lowers amount of
possible rates, which is very inconvenient when such clock is used for
pixel clock, for example.
In order to improve the situation, adjusting parent rate is considered
when allowed.
This code is inspired by clk_divider_bestdiv() function, which does
basically the same thing for different clock type.
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
---
drivers/clk/sunxi-ng/ccu_mp.c | 64 +++++++++++++++++++++++++++++++++--
1 file changed, 62 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/sunxi-ng/ccu_mp.c b/drivers/clk/sunxi-ng/ccu_mp.c
index 5d0af4051737..0357349eb767 100644
--- a/drivers/clk/sunxi-ng/ccu_mp.c
+++ b/drivers/clk/sunxi-ng/ccu_mp.c
@@ -40,6 +40,61 @@ static void ccu_mp_find_best(unsigned long parent, unsigned long rate,
*p = best_p;
}
+static unsigned long ccu_mp_find_best_with_parent_adj(struct clk_hw *hw,
+ unsigned long *parent,
+ unsigned long rate,
+ unsigned int max_m,
+ unsigned int max_p)
+{
+ unsigned long parent_rate_saved;
+ unsigned long parent_rate, now;
+ unsigned long best_rate = 0;
+ unsigned int _m, _p, div;
+ unsigned long maxdiv;
+
+ parent_rate_saved = *parent;
+
+ /*
+ * The maximum divider we can use without overflowing
+ * unsigned long in rate * m * p below
+ */
+ maxdiv = max_m * max_p;
+ maxdiv = min(ULONG_MAX / rate, maxdiv);
+
+ for (_p = 1; _p <= max_p; _p <<= 1) {
+ for (_m = 1; _m <= max_m; _m++) {
+ div = _m * _p;
+
+ if (div > maxdiv)
+ break;
+
+ if (rate * div == parent_rate_saved) {
+ /*
+ * It's the most ideal case if the requested
+ * rate can be divided from parent clock without
+ * needing to change parent rate, so return the
+ * divider immediately.
+ */
+ *parent = parent_rate_saved;
+ return rate;
+ }
+
+ parent_rate = clk_hw_round_rate(hw, rate * div);
+ now = parent_rate / div;
+
+ if (now <= rate && now > best_rate) {
+ best_rate = now;
+ *parent = parent_rate;
+
+ if (now == rate)
+ return rate;
+ }
+ }
+ }
+
+ return best_rate;
+}
+
static unsigned long ccu_mp_round_rate(struct ccu_mux_internal *mux,
struct clk_hw *hw,
unsigned long *parent_rate,
@@ -56,8 +111,13 @@ static unsigned long ccu_mp_round_rate(struct ccu_mux_internal *mux,
max_m = cmp->m.max ?: 1 << cmp->m.width;
max_p = cmp->p.max ?: 1 << ((1 << cmp->p.width) - 1);
- ccu_mp_find_best(*parent_rate, rate, max_m, max_p, &m, &p);
- rate = *parent_rate / p / m;
+ if (!(clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT)) {
+ ccu_mp_find_best(*parent_rate, rate, max_m, max_p, &m, &p);
+ rate = *parent_rate / p / m;
+ } else {
+ rate = ccu_mp_find_best_with_parent_adj(hw, parent_rate, rate,
+ max_m, max_p);
+ }
if (cmp->common.features & CCU_FEATURE_FIXED_POSTDIV)
rate /= cmp->fixed_post_div;
--
2.17.1

42
patch/kernel/sunxi-dev/0102-dt-bindings-power-supply-axp20x-add-AXP813-AC-power-.patch
View File

@ -1,42 +0,0 @@
From 7e6f7bf5c8a482c2391a16d76a50aff7a47c8223 Mon Sep 17 00:00:00 2001
From: Oskari Lemmela <oskari@lemmela.net>
Date: Tue, 23 Oct 2018 21:53:20 +0300
Subject: [PATCH 102/146] dt-bindings: power: supply: axp20x: add AXP813 AC
power DT binding
The AXP803/AXP813 AC power supply can limit input current and voltage.
Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
Reviewed-by: Rob Herring <robh@kernel.org>
Reviewed-by: Quentin Schulz <quentin.schulz@bootlin.com>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Tested-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
.../devicetree/bindings/power/supply/axp20x_ac_power.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Documentation/devicetree/bindings/power/supply/axp20x_ac_power.txt b/Documentation/devicetree/bindings/power/supply/axp20x_ac_power.txt
index 826e8a879121..7a1fb532abe5 100644
--- a/Documentation/devicetree/bindings/power/supply/axp20x_ac_power.txt
+++ b/Documentation/devicetree/bindings/power/supply/axp20x_ac_power.txt
@@ -4,6 +4,7 @@ Required Properties:
- compatible: One of:
"x-powers,axp202-ac-power-supply"
"x-powers,axp221-ac-power-supply"
+ "x-powers,axp813-ac-power-supply"
This node is a subnode of the axp20x PMIC.
@@ -13,6 +14,8 @@ reading ADC channels from the AXP20X ADC.
The AXP22X is only able to tell if an AC power supply is present and
usable.
+AXP813/AXP803 are able to limit current and supply voltage
+
Example:
&axp209 {
--
2.17.1

34
patch/kernel/sunxi-dev/0106-ARM-dts-axp81x-add-AC-power-supply-subnode.patch
View File

@ -1,34 +0,0 @@
From 89dba78ca59cf4f8973fff843abfe956a7788f27 Mon Sep 17 00:00:00 2001
From: Oskari Lemmela <oskari@lemmela.net>
Date: Tue, 23 Oct 2018 21:53:24 +0300
Subject: [PATCH 106/146] ARM: dts: axp81x: add AC power supply subnode
Add AC power supply subnode for AXP81X PMIC.
Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
Reviewed-by: Quentin Schulz <quentin.schulz@bootlin.com>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Tested-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
arch/arm/boot/dts/axp81x.dtsi | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/boot/dts/axp81x.dtsi b/arch/arm/boot/dts/axp81x.dtsi
index 043c717dcef1..bd83962d3627 100644
--- a/arch/arm/boot/dts/axp81x.dtsi
+++ b/arch/arm/boot/dts/axp81x.dtsi
@@ -48,6 +48,11 @@
interrupt-controller;
#interrupt-cells = <1>;
+ ac_power_supply: ac-power-supply {
+ compatible = "x-powers,axp813-ac-power-supply";
+ status = "disabled";
+ };
+
axp_adc: adc {
compatible = "x-powers,axp813-adc";
#io-channel-cells = <1>;
--
2.17.1

63
patch/kernel/sunxi-dev/0107-arm64-dts-allwinner-axp803-add-AC-and-battery-power-.patch
View File

@ -1,63 +0,0 @@
From 7466a08110850f608e2843a4b8089d184f05fb32 Mon Sep 17 00:00:00 2001
From: Oskari Lemmela <oskari@lemmela.net>
Date: Tue, 23 Oct 2018 21:53:25 +0300
Subject: [PATCH 107/146] arm64: dts: allwinner: axp803: add AC and battery
power supplies
Parts of the AXP803 are compatible with their counterparts on the AXP813.
Add DT nodes ADC, GPIO, AC and battery power supplies.
Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
Reviewed-by: Quentin Schulz <quentin.schulz@bootlin.com>
Tested-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
arch/arm64/boot/dts/allwinner/axp803.dtsi | 33 +++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/axp803.dtsi b/arch/arm64/boot/dts/allwinner/axp803.dtsi
index e5eae8bafc42..c3a618e1279a 100644
--- a/arch/arm64/boot/dts/allwinner/axp803.dtsi
+++ b/arch/arm64/boot/dts/allwinner/axp803.dtsi
@@ -49,6 +49,39 @@
interrupt-controller;
#interrupt-cells = <1>;
+ ac_power_supply: ac-power-supply {
+ compatible = "x-powers,axp803-ac-power-supply",
+ "x-powers,axp813-ac-power-supply";
+ status = "disabled";
+ };
+
+ axp_adc: adc {
+ compatible = "x-powers,axp803-adc", "x-powers,axp813-adc";
+ #io-channel-cells = <1>;
+ };
+
+ axp_gpio: gpio {
+ compatible = "x-powers,axp803-gpio", "x-powers,axp813-gpio";
+ gpio-controller;
+ #gpio-cells = <2>;
+
+ gpio0_ldo: gpio0-ldo {
+ pins = "GPIO0";
+ function = "ldo";
+ };
+
+ gpio1_ldo: gpio1-ldo {
+ pins = "GPIO1";
+ function = "ldo";
+ };
+ };
+
+ battery_power_supply: battery-power-supply {
+ compatible = "x-powers,axp803-battery-power-supply",
+ "x-powers,axp813-battery-power-supply";
+ status = "disabled";
+ };
+
regulators {
/* Default work frequency for buck regulators */
x-powers,dcdc-freq = <3000>;
--
2.17.1