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

rockchip64 legacy: rebase+archeology all patches against ayufan's refs/tags/4.4.202-1237-rockchip-ayufan

Browse Source
This commit is contained in:
Ricardo Pardini 2023-06-13 19:49:12 +02:00 committed by Igor
parent fcddac6cab
commit 1383724e44
60 changed files with 4253 additions and 849 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
patch/kernel/archive/rockchip64-4.4/0001-Add-link-to-all-Rockpi-variant.patch
View File

@ -1,7 +1,7 @@
From 87243fb9e90ac2a2c9a701073bb391c34d364848 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Sun, 9 Aug 2020 11:08:07 +0200
Subject: [PATCH] Add link to all Rockpi variant
Subject: Add link to all Rockpi variant
Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
---
@ -10,15 +10,12 @@ Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts | 1 +
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts | 1 +
4 files changed, 6 insertions(+)
create mode 120000 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts
create mode 120000 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts
create mode 120000 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index 467565859..704ecfdfa 100644
index 4906fd0a4da9..9d2bb78dd939 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -105,6 +105,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator-edp-avb.dtb
@@ -103,6 +103,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator-edp-avb.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator-linux.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator-linux-for-rk1808-cascade.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpi4b.dtb
@ -30,7 +27,7 @@ index 467565859..704ecfdfa 100644
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-tve1205g.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts
new file mode 120000
index 000000000..d365c482d
index 000000000000..d365c482d9be
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts
@@ -0,0 +1 @@
@ -38,7 +35,7 @@ index 000000000..d365c482d
\ No newline at end of file
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts
new file mode 120000
index 000000000..d365c482d
index 000000000000..d365c482d9be
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts
@@ -0,0 +1 @@
@ -46,12 +43,12 @@ index 000000000..d365c482d
\ No newline at end of file
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts
new file mode 120000
index 000000000..d365c482d
index 000000000000..d365c482d9be
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts
@@ -0,0 +1 @@
+rk3399-rockpi4b.dts
\ No newline at end of file
--
Created with Armbian build tools https://github.com/armbian/build
Armbian

185
patch/kernel/archive/rockchip64-4.4/0001-HDMI-CEC-support-from-LibreELEC-kwiboo.patch
View File

@ -1,76 +1,53 @@
From 031d51d2eeb8c6e1c21693457c62efb44ce35af9 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Wed, 18 Sep 2019 14:56:39 +0200
Subject: [PATCH] HDMI CEC support from LibreELEC / kwiboo
Subject: HDMI CEC support from LibreELEC / kwiboo
---
.../devicetree/bindings/media/cec.txt | 8 +
Documentation/media/kapi/cec-core.rst | 381 +++++++++
Documentation/media/uapi/cec/cec-api.rst | 46 ++
.../media/uapi/cec/cec-func-close.rst | 47 ++
.../media/uapi/cec/cec-func-ioctl.rst | 66 ++
.../media/uapi/cec/cec-func-open.rst | 78 ++
.../media/uapi/cec/cec-func-poll.rst | 77 ++
Documentation/media/uapi/cec/cec-funcs.rst | 20 +
Documentation/media/uapi/cec/cec-header.rst | 10 +
Documentation/media/uapi/cec/cec-intro.rst | 40 +
.../media/uapi/cec/cec-ioc-adap-g-caps.rst | 139 ++++
.../uapi/cec/cec-ioc-adap-g-log-addrs.rst | 371 +++++++++
.../uapi/cec/cec-ioc-adap-g-phys-addr.rst | 93 +++
.../media/uapi/cec/cec-ioc-dqevent.rst | 226 ++++++
.../media/uapi/cec/cec-ioc-g-mode.rst | 293 +++++++
.../media/uapi/cec/cec-ioc-receive.rst | 344 ++++++++
MAINTAINERS | 30 +
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 23 +-
drivers/input/serio/serport.c | 17 +-
drivers/media/cec/cec-adap.c | 11 +-
drivers/media/cec/cec-core.c | 2 +-
drivers/media/rc/keymaps/Makefile | 1 +
drivers/media/rc/keymaps/rc-cec.c | 182 +++++
drivers/media/usb/Kconfig | 6 +
drivers/media/usb/Makefile | 2 +
drivers/media/usb/pulse8-cec/Kconfig | 11 +
drivers/media/usb/pulse8-cec/Makefile | 1 +
drivers/media/usb/pulse8-cec/pulse8-cec.c | 757 ++++++++++++++++++
drivers/media/usb/rainshadow-cec/Kconfig | 11 +
drivers/media/usb/rainshadow-cec/Makefile | 1 +
.../media/usb/rainshadow-cec/rainshadow-cec.c | 384 +++++++++
fs/compat_ioctl.c | 12 +
include/media/cec-notifier.h | 22 +
include/media/cec.h | 27 +-
include/uapi/linux/cec-funcs.h | 1 +
include/uapi/linux/cec.h | 2 +-
include/uapi/linux/input-event-codes.h | 31 +
include/uapi/linux/input.h | 1 +
include/uapi/linux/serio.h | 2 +
Documentation/devicetree/bindings/media/cec.txt | 8 +
Documentation/media/kapi/cec-core.rst | 381 +++++
Documentation/media/uapi/cec/cec-api.rst | 46 +
Documentation/media/uapi/cec/cec-func-close.rst | 47 +
Documentation/media/uapi/cec/cec-func-ioctl.rst | 66 +
Documentation/media/uapi/cec/cec-func-open.rst | 78 +
Documentation/media/uapi/cec/cec-func-poll.rst | 77 +
Documentation/media/uapi/cec/cec-funcs.rst | 20 +
Documentation/media/uapi/cec/cec-header.rst | 10 +
Documentation/media/uapi/cec/cec-intro.rst | 40 +
Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst | 139 ++
Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst | 371 +++++
Documentation/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst | 93 ++
Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 226 +++
Documentation/media/uapi/cec/cec-ioc-g-mode.rst | 293 ++++
Documentation/media/uapi/cec/cec-ioc-receive.rst | 344 +++++
MAINTAINERS | 30 +
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 23 +-
drivers/input/serio/serport.c | 17 +-
drivers/media/cec/cec-adap.c | 11 +-
drivers/media/cec/cec-core.c | 2 +-
drivers/media/rc/keymaps/Makefile | 1 +
drivers/media/rc/keymaps/rc-cec.c | 182 +++
drivers/media/usb/Kconfig | 6 +
drivers/media/usb/Makefile | 2 +
drivers/media/usb/pulse8-cec/Kconfig | 11 +
drivers/media/usb/pulse8-cec/Makefile | 1 +
drivers/media/usb/pulse8-cec/pulse8-cec.c | 757 ++++++++++
drivers/media/usb/rainshadow-cec/Kconfig | 11 +
drivers/media/usb/rainshadow-cec/Makefile | 1 +
drivers/media/usb/rainshadow-cec/rainshadow-cec.c | 384 +++++
fs/compat_ioctl.c | 12 +
include/media/cec-notifier.h | 22 +
include/media/cec.h | 27 +-
include/uapi/linux/cec-funcs.h | 1 +
include/uapi/linux/cec.h | 2 +-
include/uapi/linux/input-event-codes.h | 31 +
include/uapi/linux/input.h | 1 +
include/uapi/linux/serio.h | 2 +
39 files changed, 3757 insertions(+), 19 deletions(-)
create mode 100644 Documentation/devicetree/bindings/media/cec.txt
create mode 100644 Documentation/media/kapi/cec-core.rst
create mode 100644 Documentation/media/uapi/cec/cec-api.rst
create mode 100644 Documentation/media/uapi/cec/cec-func-close.rst
create mode 100644 Documentation/media/uapi/cec/cec-func-ioctl.rst
create mode 100644 Documentation/media/uapi/cec/cec-func-open.rst
create mode 100644 Documentation/media/uapi/cec/cec-func-poll.rst
create mode 100644 Documentation/media/uapi/cec/cec-funcs.rst
create mode 100644 Documentation/media/uapi/cec/cec-header.rst
create mode 100644 Documentation/media/uapi/cec/cec-intro.rst
create mode 100644 Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst
create mode 100644 Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst
create mode 100644 Documentation/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst
create mode 100644 Documentation/media/uapi/cec/cec-ioc-dqevent.rst
create mode 100644 Documentation/media/uapi/cec/cec-ioc-g-mode.rst
create mode 100644 Documentation/media/uapi/cec/cec-ioc-receive.rst
create mode 100644 drivers/media/rc/keymaps/rc-cec.c
create mode 100644 drivers/media/usb/pulse8-cec/Kconfig
create mode 100644 drivers/media/usb/pulse8-cec/Makefile
create mode 100644 drivers/media/usb/pulse8-cec/pulse8-cec.c
create mode 100644 drivers/media/usb/rainshadow-cec/Kconfig
create mode 100644 drivers/media/usb/rainshadow-cec/Makefile
create mode 100644 drivers/media/usb/rainshadow-cec/rainshadow-cec.c
diff --git a/Documentation/devicetree/bindings/media/cec.txt b/Documentation/devicetree/bindings/media/cec.txt
new file mode 100644
index 00000000..22d7aae3
index 000000000000..22d7aae3d3d7
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/cec.txt
@@ -0,0 +1,8 @@
@ -84,7 +61,7 @@ index 00000000..22d7aae3
+ up or down.
diff --git a/Documentation/media/kapi/cec-core.rst b/Documentation/media/kapi/cec-core.rst
new file mode 100644
index 00000000..d37e107f
index 000000000000..d37e107f2fde
--- /dev/null
+++ b/Documentation/media/kapi/cec-core.rst
@@ -0,0 +1,381 @@
@ -471,7 +448,7 @@ index 00000000..d37e107f
+.. kernel-doc:: include/media/cec-notifier.h
diff --git a/Documentation/media/uapi/cec/cec-api.rst b/Documentation/media/uapi/cec/cec-api.rst
new file mode 100644
index 00000000..b68ca9c1
index 000000000000..b68ca9c1d2e0
--- /dev/null
+++ b/Documentation/media/uapi/cec/cec-api.rst
@@ -0,0 +1,46 @@
@ -523,7 +500,7 @@ index 00000000..b68ca9c1
+Initial revision
diff --git a/Documentation/media/uapi/cec/cec-func-close.rst b/Documentation/media/uapi/cec/cec-func-close.rst
new file mode 100644
index 00000000..334358df
index 000000000000..334358dfa72e
--- /dev/null
+++ b/Documentation/media/uapi/cec/cec-func-close.rst
@@ -0,0 +1,47 @@
@ -576,7 +553,7 @@ index 00000000..334358df
+ ``fd`` is not a valid open file descriptor.
diff --git a/Documentation/media/uapi/cec/cec-func-ioctl.rst b/Documentation/media/uapi/cec/cec-func-ioctl.rst
new file mode 100644
index 00000000..e2b6260b
index 000000000000..e2b6260b0086
--- /dev/null
+++ b/Documentation/media/uapi/cec/cec-func-ioctl.rst
@@ -0,0 +1,66 @@
@ -648,7 +625,7 @@ index 00000000..e2b6260b
+parameter remains unmodified.
diff --git a/Documentation/media/uapi/cec/cec-func-open.rst b/Documentation/media/uapi/cec/cec-func-open.rst
new file mode 100644
index 00000000..5d6663a6
index 000000000000..5d6663a649bd
--- /dev/null
+++ b/Documentation/media/uapi/cec/cec-func-open.rst
@@ -0,0 +1,78 @@
@ -732,7 +709,7 @@ index 00000000..5d6663a6
+ No device corresponding to this device special file exists.
diff --git a/Documentation/media/uapi/cec/cec-func-poll.rst b/Documentation/media/uapi/cec/cec-func-poll.rst
new file mode 100644
index 00000000..d49f1ee0
index 000000000000..d49f1ee0742d
--- /dev/null
+++ b/Documentation/media/uapi/cec/cec-func-poll.rst
@@ -0,0 +1,77 @@
@ -815,7 +792,7 @@ index 00000000..d49f1ee0
+ The ``nfds`` argument is greater than ``OPEN_MAX``.
diff --git a/Documentation/media/uapi/cec/cec-funcs.rst b/Documentation/media/uapi/cec/cec-funcs.rst
new file mode 100644
index 00000000..6d696cea
index 000000000000..6d696cead5cb
--- /dev/null
+++ b/Documentation/media/uapi/cec/cec-funcs.rst
@@ -0,0 +1,20 @@
@ -841,7 +818,7 @@ index 00000000..6d696cea
+ cec-ioc-receive
diff --git a/Documentation/media/uapi/cec/cec-header.rst b/Documentation/media/uapi/cec/cec-header.rst
new file mode 100644
index 00000000..d5a9a282
index 000000000000..d5a9a2828274
--- /dev/null
+++ b/Documentation/media/uapi/cec/cec-header.rst
@@ -0,0 +1,10 @@
@ -857,7 +834,7 @@ index 00000000..d5a9a282
+
diff --git a/Documentation/media/uapi/cec/cec-intro.rst b/Documentation/media/uapi/cec/cec-intro.rst
new file mode 100644
index 00000000..07ee2b8f
index 000000000000..07ee2b8f89d6
--- /dev/null
+++ b/Documentation/media/uapi/cec/cec-intro.rst
@@ -0,0 +1,40 @@
@ -903,7 +880,7 @@ index 00000000..07ee2b8f
+- cec-follower: emulates a CEC follower.
diff --git a/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst b/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst
new file mode 100644
index 00000000..6c1f6efb
index 000000000000..6c1f6efb822e
--- /dev/null
+++ b/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst
@@ -0,0 +1,139 @@
@ -1048,7 +1025,7 @@ index 00000000..6c1f6efb
+:ref:`Generic Error Codes <gen-errors>` chapter.
diff --git a/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst b/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst
new file mode 100644
index 00000000..84f431a0
index 000000000000..84f431a022ad
--- /dev/null
+++ b/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst
@@ -0,0 +1,371 @@
@ -1425,7 +1402,7 @@ index 00000000..84f431a0
+ The contents of struct :c:type:`cec_log_addrs` is invalid.
diff --git a/Documentation/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst b/Documentation/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst
new file mode 100644
index 00000000..9e49d4be
index 000000000000..9e49d4be35d5
--- /dev/null
+++ b/Documentation/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst
@@ -0,0 +1,93 @@
@ -1524,7 +1501,7 @@ index 00000000..9e49d4be
+ The physical address is malformed.
diff --git a/Documentation/media/uapi/cec/cec-ioc-dqevent.rst b/Documentation/media/uapi/cec/cec-ioc-dqevent.rst
new file mode 100644
index 00000000..b6fd8642
index 000000000000..b6fd86424fbb
--- /dev/null
+++ b/Documentation/media/uapi/cec/cec-ioc-dqevent.rst
@@ -0,0 +1,226 @@
@ -1756,7 +1733,7 @@ index 00000000..b6fd8642
+ events to arrive.
diff --git a/Documentation/media/uapi/cec/cec-ioc-g-mode.rst b/Documentation/media/uapi/cec/cec-ioc-g-mode.rst
new file mode 100644
index 00000000..508e2e32
index 000000000000..508e2e325683
--- /dev/null
+++ b/Documentation/media/uapi/cec/cec-ioc-g-mode.rst
@@ -0,0 +1,293 @@
@ -2055,7 +2032,7 @@ index 00000000..508e2e32
+ Someone else is already an exclusive follower or initiator.
diff --git a/Documentation/media/uapi/cec/cec-ioc-receive.rst b/Documentation/media/uapi/cec/cec-ioc-receive.rst
new file mode 100644
index 00000000..bdad4b19
index 000000000000..bdad4b197bcd
--- /dev/null
+++ b/Documentation/media/uapi/cec/cec-ioc-receive.rst
@@ -0,0 +1,344 @@
@ -2404,7 +2381,7 @@ index 00000000..bdad4b19
+ERESTARTSYS
+ The wait for a successful transmit was interrupted (e.g. by Ctrl-C).
diff --git a/MAINTAINERS b/MAINTAINERS
index d09e4c9c..8c80ce67 100644
index b6834437f387..6a882c7bcac4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2674,6 +2674,22 @@ F: drivers/net/ieee802154/cc2520.c
@ -2459,7 +2436,7 @@ index d09e4c9c..8c80ce67 100644
P: rt2x00 project
M: Stanislaw Gruszka <sgruszka@redhat.com>
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index 68d99852..6157cb00 100644
index 68d998526071..6157cb00663f 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -2489,6 +2489,7 @@ static void dw_hdmi_bridge_nop(struct drm_bridge *bridge)
@ -2507,7 +2484,7 @@ index 68d99852..6157cb00 100644
check_hdmi_irq(hdmi, intr_stat, phy_int_pol);
diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c
index 9c927d35..d189843f 100644
index 9c927d35c1f5..d189843f3727 100644
--- a/drivers/input/serio/serport.c
+++ b/drivers/input/serio/serport.c
@@ -71,10 +71,7 @@ static void serport_serio_close(struct serio *serio)
@ -2550,7 +2527,7 @@ index 9c927d35..d189843f 100644
};
diff --git a/drivers/media/cec/cec-adap.c b/drivers/media/cec/cec-adap.c
index 8c75a513..66c3c16c 100644
index 8c75a51333b2..66c3c16c31d4 100644
--- a/drivers/media/cec/cec-adap.c
+++ b/drivers/media/cec/cec-adap.c
@@ -202,7 +202,10 @@ static void cec_queue_msg_fh(struct cec_fh *fh, const struct cec_msg *msg)
@ -2588,7 +2565,7 @@ index 8c75a513..66c3c16c 100644
}
#endif
diff --git a/drivers/media/cec/cec-core.c b/drivers/media/cec/cec-core.c
index cb4f0cca..f9320a3d 100644
index cb4f0cca0224..f9320a3df4a0 100644
--- a/drivers/media/cec/cec-core.c
+++ b/drivers/media/cec/cec-core.c
@@ -284,7 +284,7 @@ struct cec_adapter *cec_allocate_adapter(const struct cec_adap_ops *ops,
@ -2601,7 +2578,7 @@ index cb4f0cca..f9320a3d 100644
adap->rc->map_name = RC_MAP_CEC;
adap->rc->timeout = MS_TO_NS(550);
diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
index 793df376..f2446a5d 100644
index 793df376e15f..f2446a5d252d 100644
--- a/drivers/media/rc/keymaps/Makefile
+++ b/drivers/media/rc/keymaps/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
@ -2614,7 +2591,7 @@ index 793df376..f2446a5d 100644
rc-delock-61959.o \
diff --git a/drivers/media/rc/keymaps/rc-cec.c b/drivers/media/rc/keymaps/rc-cec.c
new file mode 100644
index 00000000..6556934f
index 000000000000..6556934f5335
--- /dev/null
+++ b/drivers/media/rc/keymaps/rc-cec.c
@@ -0,0 +1,182 @@
@ -2801,7 +2778,7 @@ index 00000000..6556934f
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Kamil Debski");
diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig
index 7496f332..b24e753c 100644
index 7496f332f3f5..b24e753c4766 100644
--- a/drivers/media/usb/Kconfig
+++ b/drivers/media/usb/Kconfig
@@ -60,5 +60,11 @@ source "drivers/media/usb/hackrf/Kconfig"
@ -2817,7 +2794,7 @@ index 7496f332..b24e753c 100644
endif #MEDIA_USB_SUPPORT
endif #USB
diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile
index 8874ba77..738b993e 100644
index 8874ba774a34..738b993ec8b0 100644
--- a/drivers/media/usb/Makefile
+++ b/drivers/media/usb/Makefile
@@ -24,3 +24,5 @@ obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
@ -2828,7 +2805,7 @@ index 8874ba77..738b993e 100644
+obj-$(CONFIG_USB_RAINSHADOW_CEC) += rainshadow-cec/
diff --git a/drivers/media/usb/pulse8-cec/Kconfig b/drivers/media/usb/pulse8-cec/Kconfig
new file mode 100644
index 00000000..18ead448
index 000000000000..18ead44824ba
--- /dev/null
+++ b/drivers/media/usb/pulse8-cec/Kconfig
@@ -0,0 +1,11 @@
@ -2845,14 +2822,14 @@ index 00000000..18ead448
+ module will be called pulse8-cec.
diff --git a/drivers/media/usb/pulse8-cec/Makefile b/drivers/media/usb/pulse8-cec/Makefile
new file mode 100644
index 00000000..9800690b
index 000000000000..9800690bc25a
--- /dev/null
+++ b/drivers/media/usb/pulse8-cec/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_USB_PULSE8_CEC) += pulse8-cec.o
diff --git a/drivers/media/usb/pulse8-cec/pulse8-cec.c b/drivers/media/usb/pulse8-cec/pulse8-cec.c
new file mode 100644
index 00000000..50146f26
index 000000000000..50146f263d90
--- /dev/null
+++ b/drivers/media/usb/pulse8-cec/pulse8-cec.c
@@ -0,0 +1,757 @@
@ -3615,7 +3592,7 @@ index 00000000..50146f26
+module_serio_driver(pulse8_drv);
diff --git a/drivers/media/usb/rainshadow-cec/Kconfig b/drivers/media/usb/rainshadow-cec/Kconfig
new file mode 100644
index 00000000..030ef01b
index 000000000000..030ef01b1ff0
--- /dev/null
+++ b/drivers/media/usb/rainshadow-cec/Kconfig
@@ -0,0 +1,11 @@
@ -3632,14 +3609,14 @@ index 00000000..030ef01b
+ module will be called rainshadow-cec.
diff --git a/drivers/media/usb/rainshadow-cec/Makefile b/drivers/media/usb/rainshadow-cec/Makefile
new file mode 100644
index 00000000..a79fbc77
index 000000000000..a79fbc77e1f7
--- /dev/null
+++ b/drivers/media/usb/rainshadow-cec/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_USB_RAINSHADOW_CEC) += rainshadow-cec.o
diff --git a/drivers/media/usb/rainshadow-cec/rainshadow-cec.c b/drivers/media/usb/rainshadow-cec/rainshadow-cec.c
new file mode 100644
index 00000000..cecdcbcd
index 000000000000..cecdcbcd400c
--- /dev/null
+++ b/drivers/media/usb/rainshadow-cec/rainshadow-cec.c
@@ -0,0 +1,384 @@
@ -4028,7 +4005,7 @@ index 00000000..cecdcbcd
+
+module_serio_driver(rain_drv);
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index 5af97362..e39ca3c3 100644
index 5af973621c73..e39ca3c305b1 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -57,6 +57,7 @@
@ -4058,7 +4035,7 @@ index 5af97362..e39ca3c3 100644
/* joystick */
COMPATIBLE_IOCTL(JSIOCGVERSION)
diff --git a/include/media/cec-notifier.h b/include/media/cec-notifier.h
index ca19a930..8bb169ac 100644
index ca19a9305782..8bb169ac7afd 100644
--- a/include/media/cec-notifier.h
+++ b/include/media/cec-notifier.h
@@ -91,6 +91,14 @@ void cec_notifier_register(struct cec_notifier *n,
@ -4098,7 +4075,7 @@ index ca19a930..8bb169ac 100644
/**
diff --git a/include/media/cec.h b/include/media/cec.h
index 1048888a..5db31bbd 100644
index 1048888a96c2..5db31bbdf133 100644
--- a/include/media/cec.h
+++ b/include/media/cec.h
@@ -31,6 +31,9 @@
@ -4160,7 +4137,7 @@ index 1048888a..5db31bbd 100644
+
#endif /* _MEDIA_CEC_H */
diff --git a/include/uapi/linux/cec-funcs.h b/include/uapi/linux/cec-funcs.h
index c451eec4..270b251a 100644
index c451eec42a83..270b251a3d9b 100644
--- a/include/uapi/linux/cec-funcs.h
+++ b/include/uapi/linux/cec-funcs.h
@@ -895,6 +895,7 @@ static inline void cec_ops_report_features(const struct cec_msg *msg,
@ -4172,7 +4149,7 @@ index c451eec4..270b251a 100644
p++;
if (!(*p & CEC_OP_FEAT_EXT)) {
diff --git a/include/uapi/linux/cec.h b/include/uapi/linux/cec.h
index af6682f5..b9f8df3a 100644
index af6682f5ea85..b9f8df3a0477 100644
--- a/include/uapi/linux/cec.h
+++ b/include/uapi/linux/cec.h
@@ -223,7 +223,7 @@ static inline int cec_msg_status_is_ok(const struct cec_msg *msg)
@ -4185,7 +4162,7 @@ index af6682f5..b9f8df3a 100644
/* The logical address types that the CEC device wants to claim */
#define CEC_LOG_ADDR_TYPE_TV 0
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
index 9e07bf42..68ab0d35 100644
index 9e07bf4259e1..68ab0d357e4c 100644
--- a/include/uapi/linux/input-event-codes.h
+++ b/include/uapi/linux/input-event-codes.h
@@ -611,6 +611,37 @@
@ -4227,7 +4204,7 @@ index 9e07bf42..68ab0d35 100644
#define BTN_TRIGGER_HAPPY1 0x2c0
#define BTN_TRIGGER_HAPPY2 0x2c1
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
index 27586873..41e8dff5 100644
index 2758687300b4..41e8dff588e1 100644
--- a/include/uapi/linux/input.h
+++ b/include/uapi/linux/input.h
@@ -246,6 +246,7 @@ struct input_mask {
@ -4239,7 +4216,7 @@ index 27586873..41e8dff5 100644
/*
* MT_TOOL types
diff --git a/include/uapi/linux/serio.h b/include/uapi/linux/serio.h
index becdd782..89b72003 100644
index becdd78295cc..89b72003fb68 100644
--- a/include/uapi/linux/serio.h
+++ b/include/uapi/linux/serio.h
@@ -77,5 +77,7 @@
@ -4251,5 +4228,5 @@ index becdd782..89b72003 100644
#endif /* _UAPI_SERIO_H */
--
2.17.1
Armbian

8
patch/kernel/archive/rockchip64-4.4/0001-fixing-dtc-error.patch
View File

@ -1,7 +1,7 @@
From 3a3274fe09d70fd25607eac945f5c17bd48d4e7b Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Mon, 8 Mar 2021 06:54:40 +0000
Subject: [PATCH] fixing dtc error
Subject: fixing dtc error
Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
---
@ -9,7 +9,7 @@ Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/dtc/dtc-lexer.lex.c_shipped b/scripts/dtc/dtc-lexer.lex.c_shipped
index 011bb963..c3b63163 100644
index 011bb9632ff2..c3b631631cb6 100644
--- a/scripts/dtc/dtc-lexer.lex.c_shipped
+++ b/scripts/dtc/dtc-lexer.lex.c_shipped
@@ -631,7 +631,7 @@ char *yytext;
@ -22,5 +22,5 @@ index 011bb963..c3b63163 100644
/* CAUTION: this will stop working if we ever use yyless() or yyunput() */
--
Created with Armbian build tools https://github.com/armbian/build
Armbian

12
patch/kernel/archive/rockchip64-4.4/0003-enable-rga-rockchip64.patch
View File

@ -1,7 +1,7 @@
From f1f3e20f9c9cd4d697c6e3862791e5ebb198623f Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: JMCC <JMCC@localhost>
Date: Sat, 2 Jan 2021 22:42:11 +0100
Subject: [PATCH] enable-rga
Subject: enable-rga
Signed-off-by: JMCC <JMCC@localhost>
---
@ -10,10 +10,10 @@ Signed-off-by: JMCC <JMCC@localhost>
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index e2f897baf..ac71ce493 100644
index 085c684842e2..e4debf4d6363 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -991,7 +991,7 @@
@@ -977,7 +977,7 @@
clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru SCLK_RGA>;
clock-names = "aclk_rga", "hclk_rga", "clk_rga";
dma-coherent;
@ -23,7 +23,7 @@ index e2f897baf..ac71ce493 100644
iep: iep@ff3a0000 {
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 0ddb03f36..0125fc6e2 100644
index 0ddb03f3686b..0125fc6e2731 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -1447,15 +1447,16 @@
@ -47,5 +47,5 @@ index 0ddb03f36..0125fc6e2 100644
efuse0: efuse@ff690000 {
--
Created with Armbian build tools https://github.com/armbian/build
Armbian

45
patch/kernel/archive/rockchip64-4.4/320_fix_kernelcrash_with_isp1.patch
View File

@ -1,5 +1,45 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: chwe17 <weberc18@gmail.com>
Date: Sun, 4 Aug 2019 18:05:50 -0400
Subject: [ARCHEOLOGY] Tinkerboard camera support (#1482)
> X-Git-Archeology: > recovered message: > * fix kernelcrash with config_of_overlay combined with isp1 camera driver,based on:
> X-Git-Archeology: > recovered message: > https://github.com/TinkerBoard/debian_kernel/commit/30a8401c2f3851f4e9b46c9d3e8e1138ce8d5b51
> X-Git-Archeology: > recovered message: > * add basic dtbo infrastucture
> X-Git-Archeology: > recovered message: > * set ov5647 (RPi cam rev 1.3) as default, imx219 (RPi cam V2.1) outputs a blurry green videostream at the moment
> X-Git-Archeology: > recovered message: > * maybe fix powering for camera
> X-Git-Archeology: > recovered message: > * adjust mainline dtbo patch to bsp kernel
> X-Git-Archeology: > recovered message: > * got you! little.. dtbo's are properly built and applied during boot.
> X-Git-Archeology: > recovered message: > * add imx219 overlay to switch between cameras & add ae/awb fix for ov 5647 from asus tinker repo
> X-Git-Archeology: > recovered message: > * patch imx219 up to https://github.com/TinkerBoard/debian_kernel/commit/96396323fa3d8941e4d556be83591333329d2799
> X-Git-Archeology: > recovered message: > * bring back wireguard, otherwise igor gets grumpy :D
> X-Git-Archeology: > recovered message: > * fix camera status
> X-Git-Archeology: - Revision a040785d4299e10255d87fdfcfa70b56e0b6779f: https://github.com/armbian/build/commit/a040785d4299e10255d87fdfcfa70b56e0b6779f
> X-Git-Archeology: Date: Sun, 04 Aug 2019 18:05:50 -0400
> X-Git-Archeology: From: chwe17 <weberc18@gmail.com>
> X-Git-Archeology: Subject: Tinkerboard camera support (#1482)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 150ac0c2afa147d9e3b036c8ecd8238fe5648cf3: https://github.com/armbian/build/commit/150ac0c2afa147d9e3b036c8ecd8238fe5648cf3
> X-Git-Archeology: Date: Tue, 19 Nov 2019 23:25:39 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Remove K<4, change branches, new features (#1586)
> X-Git-Archeology:
> X-Git-Archeology: - Revision b2751ab56f2a0f8e4ff1e55b4de3a1fdf5647236: https://github.com/armbian/build/commit/b2751ab56f2a0f8e4ff1e55b4de3a1fdf5647236
> X-Git-Archeology: Date: Tue, 29 Dec 2020 22:52:09 +0100
> X-Git-Archeology: From: JMCC <JMCC@localhost>
> X-Git-Archeology: Subject: rk3399's-legacy: Kernel patch to fix panic when RKISP1 is enabled
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
drivers/of/property.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/of/property.c b/drivers/of/property.c
index 2c201e2c..ae79a6f8 100644
index 2c201e2c257d..ae79a6f82b27 100644
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@ -900,7 +900,7 @@ of_fwnode_graph_get_port_parent(struct fwnode_handle *fwnode)
@ -11,3 +51,6 @@ index 2c201e2c..ae79a6f8 100644
if (!np)
return NULL;
--
Armbian

15
patch/kernel/archive/rockchip64-4.4/323_ov5647_ae_awb_control.patch
View File

@ -1,19 +1,15 @@
From e94564e21c62e313dbe455db44acb9e8c0f92a0a Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jungchi_Liao <Jungchi_Liao@asus.com>
Date: Wed, 4 Jul 2018 12:33:45 +0800
Subject: [PATCH] Use auto AE/AWB control form OV5647
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: Use auto AE/AWB control form OV5647
Change-Id: I991aa4c56a795b21dd28b45c9938624f6510dba6
Reviewed-on: https://tp-biosrd-v02/gerrit/83090
Reviewed-by: Jamess Huang(黃以民) <Jamess_Huang@asus.com>
Tested-by: Jamess Huang(黃以民) <Jamess_Huang@asus.com>
Reviewed-by: Jamess Huang(Huang Yi Min ) <Jamess_Huang@asus.com>
Tested-by: Jamess Huang(Huang Yi Min ) <Jamess_Huang@asus.com>
---
drivers/media/i2c/ov5647.c | 2 ++
1 file changed, 2 insertions(+)
mode change 100644 => 100755 drivers/media/i2c/ov5647.c
diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
old mode 100644
@ -37,3 +33,6 @@ index b8b011ece42f..cdd77b868eb0
{0x3011, 0x62},
/* mipi */
{0x3016, 0x08},
--
Armbian

12
patch/kernel/archive/rockchip64-4.4/51-enable-hdmicec-rockpi4b-rockpro64.patch
View File

@ -1,16 +1,16 @@
From 05ea2fa0ed01b7ef1895bce96bb572f9185644ce Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: JMCC <JMCC@localhost>
Date: Fri, 18 Dec 2020 16:29:21 +0100
Subject: [PATCH] 0050-enable-hdmicec-rockpi4b-rockpro64
Subject: 0050-enable-hdmicec-rockpi4b-rockpro64
Signed-off-by: JMCC <JMCC@localhost>
---
arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts | 2 ++
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 2 ++
2 files changed, 6 insertions(+), 0 deletions(-)
2 files changed, 4 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts
index 9d88c06c5..5cc57e16b 100644
index 3db06a26024a..672a897db849 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts
@@ -296,6 +296,8 @@
@ -23,7 +23,7 @@ index 9d88c06c5..5cc57e16b 100644
rockchip,phy-table =
<74250000 0x8009 0x0004 0x0272>,
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
index d7daa3d40..7a8d9031c 100644
index acfbdf22180d..f10e1bf0e2a6 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
@@ -854,6 +854,8 @@
@ -36,5 +36,5 @@ index d7daa3d40..7a8d9031c 100644
<74250000 0x8009 0x0004 0x0272>,
<165000000 0x802b 0x0004 0x0209>,
--
Created with Armbian build tools https://github.com/armbian/build
Armbian

298
patch/kernel/archive/rockchip64-4.4/Add_dts_rk3328-roc-cc.patch
View File

@ -1,8 +1,54 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: daijh <you@example.com>
Date: Wed, 11 Apr 2018 15:37:15 +0800
Subject: [ARCHEOLOGY] Add ROC-RK3328-CC support
> X-Git-Archeology: - Revision 9efdeaaf568d29acafe31f4152322d1520ff59ec: https://github.com/armbian/build/commit/9efdeaaf568d29acafe31f4152322d1520ff59ec
> X-Git-Archeology: Date: Wed, 11 Apr 2018 15:37:15 +0800
> X-Git-Archeology: From: daijh <you@example.com>
> X-Git-Archeology: Subject: Add ROC-RK3328-CC support
> X-Git-Archeology:
> X-Git-Archeology: - Revision 98100bf764235e153bb6ce6fe558fc3a06f4aa39: https://github.com/armbian/build/commit/98100bf764235e153bb6ce6fe558fc3a06f4aa39
> X-Git-Archeology: Date: Fri, 29 Jun 2018 23:58:15 +0200
> X-Git-Archeology: From: JMCC <root@localhost>
> X-Git-Archeology: Subject: Modify rk3328-roc-cc.dts according to last Firefly
> X-Git-Archeology:
> X-Git-Archeology: - Revision 41b589372f2c1a8450033db78f3d8ed9db1b2196: https://github.com/armbian/build/commit/41b589372f2c1a8450033db78f3d8ed9db1b2196
> X-Git-Archeology: Date: Sun, 26 Aug 2018 14:14:14 +0200
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Creating new family rockchip64. 3288 and 3399 was merged in, except Nanopi which stays in RK3399 family with sources attached to FA repository until we manage to join that in. Enabled Nanopc T4, Nanopi M4, Renegade. Tested on Rock64 and Nanopc T4.
> X-Git-Archeology:
> X-Git-Archeology: - Revision f1affad5c7be62d6e93832af3556c7609edd0858: https://github.com/armbian/build/commit/f1affad5c7be62d6e93832af3556c7609edd0858
> X-Git-Archeology: Date: Fri, 11 Jan 2019 01:55:19 +0100
> X-Git-Archeology: From: JMCC <JMCC@localhost>
> X-Git-Archeology: Subject: Give some life to Renegade LED's
> X-Git-Archeology:
> X-Git-Archeology: - Revision 58725209d970c98489a4ee5cdf085a80347c5d47: https://github.com/armbian/build/commit/58725209d970c98489a4ee5cdf085a80347c5d47
> X-Git-Archeology: Date: Tue, 09 Apr 2019 14:44:44 +0200
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: [ rockchip64 default and dev ] Attaching to latest Ayufan branch, patches adjustement, disabled CEC due to issues @darinatoda and briefly tested on both kernels
> X-Git-Archeology:
> X-Git-Archeology: - Revision 150ac0c2afa147d9e3b036c8ecd8238fe5648cf3: https://github.com/armbian/build/commit/150ac0c2afa147d9e3b036c8ecd8238fe5648cf3
> X-Git-Archeology: Date: Tue, 19 Nov 2019 23:25:39 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Remove K<4, change branches, new features (#1586)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/Makefile | 1 +
arch/arm64/boot/dts/rockchip/rk3328-box-plus-dram-timing.dtsi | 502 +++---
arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 864 ++++++++++
3 files changed, 1161 insertions(+), 206 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index f610d40..53efcd4 100644
index 9d2bb78dd939..b1211e43ec13 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -63,6 +63,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator-linux.dtb
@@ -111,6 +111,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-tve1030g-avb.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-tve1205g.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-videostrong-linux.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-vr-android.dtb
@ -11,14 +57,15 @@ index f610d40..53efcd4 100644
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-evb-v10-linux.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-evb-v11.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-box-plus-dram-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-box-plus-dram-timing.dtsi
new file mode 100644
index 0000000..59cae37
--- /dev/null
index 0ea270539a23..59cae3738e54 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-box-plus-dram-timing.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328-box-plus-dram-timing.dtsi
@@ -0,0 +1,311 @@
+/*
@@ -1,221 +1,311 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
- * Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd
+ * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd
+ *
*
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
@ -56,10 +103,42 @@ index 0000000..59cae37
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+#include <dt-bindings/clock/rockchip-ddr.h>
+#include <dt-bindings/memory/rk3328-dram.h>
+
*/
#include <dt-bindings/clock/rockchip-ddr.h>
#include <dt-bindings/memory/rk3328-dram.h>
-&ddr_timing {
- /* CA de-skew, one step is 47.8ps, range 0-15 */
- ddr3a1_ddr4a9_de-skew = <0>;
- ddr3a0_ddr4a10_de-skew = <0>;
- ddr3a3_ddr4a6_de-skew = <1>;
- ddr3a2_ddr4a4_de-skew = <1>;
- ddr3a5_ddr4a8_de-skew = <0>;
- ddr3a4_ddr4a5_de-skew = <2>;
- ddr3a7_ddr4a11_de-skew = <0>;
- ddr3a6_ddr4a7_de-skew = <2>;
- ddr3a9_ddr4a0_de-skew = <1>;
- ddr3a8_ddr4a13_de-skew = <0>;
- ddr3a11_ddr4a3_de-skew = <2>;
- ddr3a10_ddr4cs0_de-skew = <0>;
- ddr3a13_ddr4a2_de-skew = <1>;
- ddr3a12_ddr4ba1_de-skew = <0>;
- ddr3a15_ddr4odt0_de-skew = <0>;
- ddr3a14_ddr4a1_de-skew = <1>;
- ddr3ba1_ddr4a15_de-skew = <0>;
- ddr3ba0_ddr4bg0_de-skew = <0>;
- ddr3ras_ddr4cke_de-skew = <0>;
- ddr3ba2_ddr4ba0_de-skew = <1>;
- ddr3we_ddr4bg1_de-skew = <1>;
- ddr3cas_ddr4a12_de-skew = <0>;
- ddr3ckn_ddr4ckn_de-skew = <5>;
- ddr3ckp_ddr4ckp_de-skew = <5>;
- ddr3cke_ddr4a16_de-skew = <1>;
- ddr3odt0_ddr4a14_de-skew = <0>;
- ddr3cs0_ddr4act_de-skew = <1>;
- ddr3reset_ddr4reset_de-skew = <0>;
- ddr3cs1_ddr4cs1_de-skew = <0>;
- ddr3odt1_ddr4odt1_de-skew = <0>;
+/ {
+ ddr_timing: ddr_timing {
+ compatible = "rockchip,ddr-timing";
@ -145,7 +224,32 @@ index 0000000..59cae37
+ ddr3reset_ddr4reset_de-skew = <3>;
+ ddr3cs1_ddr4cs1_de-skew = <2>;
+ ddr3odt1_ddr4odt1_de-skew = <2>;
+
- /* DATA de-skew
- * RX one step is 25.1ps, range 0-15
- * TX one step is 47.8ps, range 0-15
- */
- cs0_dm0_rx_de-skew = <7>;
- cs0_dm0_tx_de-skew = <8>;
- cs0_dq0_rx_de-skew = <7>;
- cs0_dq0_tx_de-skew = <8>;
- cs0_dq1_rx_de-skew = <7>;
- cs0_dq1_tx_de-skew = <8>;
- cs0_dq2_rx_de-skew = <7>;
- cs0_dq2_tx_de-skew = <8>;
- cs0_dq3_rx_de-skew = <7>;
- cs0_dq3_tx_de-skew = <8>;
- cs0_dq4_rx_de-skew = <7>;
- cs0_dq4_tx_de-skew = <8>;
- cs0_dq5_rx_de-skew = <7>;
- cs0_dq5_tx_de-skew = <8>;
- cs0_dq6_rx_de-skew = <7>;
- cs0_dq6_tx_de-skew = <8>;
- cs0_dq7_rx_de-skew = <7>;
- cs0_dq7_tx_de-skew = <8>;
- cs0_dqs0_rx_de-skew = <6>;
- cs0_dqs0p_tx_de-skew = <9>;
- cs0_dqs0n_tx_de-skew = <9>;
+ /* DATA de-skew
+ * RX one step is 25.1ps, range 0-15
+ * TX one step is 47.8ps, range 0-15
@ -171,7 +275,28 @@ index 0000000..59cae37
+ cs0_dqs0_rx_de-skew = <7>;
+ cs0_dqs0p_tx_de-skew = <10>;
+ cs0_dqs0n_tx_de-skew = <10>;
+
- cs0_dm1_rx_de-skew = <7>;
- cs0_dm1_tx_de-skew = <7>;
- cs0_dq8_rx_de-skew = <7>;
- cs0_dq8_tx_de-skew = <8>;
- cs0_dq9_rx_de-skew = <7>;
- cs0_dq9_tx_de-skew = <7>;
- cs0_dq10_rx_de-skew = <7>;
- cs0_dq10_tx_de-skew = <8>;
- cs0_dq11_rx_de-skew = <7>;
- cs0_dq11_tx_de-skew = <7>;
- cs0_dq12_rx_de-skew = <7>;
- cs0_dq12_tx_de-skew = <8>;
- cs0_dq13_rx_de-skew = <7>;
- cs0_dq13_tx_de-skew = <7>;
- cs0_dq14_rx_de-skew = <7>;
- cs0_dq14_tx_de-skew = <8>;
- cs0_dq15_rx_de-skew = <7>;
- cs0_dq15_tx_de-skew = <7>;
- cs0_dqs1_rx_de-skew = <7>;
- cs0_dqs1p_tx_de-skew = <9>;
- cs0_dqs1n_tx_de-skew = <9>;
+ cs0_dm1_rx_de-skew = <8>;
+ cs0_dm1_tx_de-skew = <8>;
+ cs0_dq8_rx_de-skew = <8>;
@ -193,7 +318,28 @@ index 0000000..59cae37
+ cs0_dqs1_rx_de-skew = <8>;
+ cs0_dqs1p_tx_de-skew = <10>;
+ cs0_dqs1n_tx_de-skew = <10>;
+
- cs0_dm2_rx_de-skew = <7>;
- cs0_dm2_tx_de-skew = <8>;
- cs0_dq16_rx_de-skew = <7>;
- cs0_dq16_tx_de-skew = <8>;
- cs0_dq17_rx_de-skew = <7>;
- cs0_dq17_tx_de-skew = <8>;
- cs0_dq18_rx_de-skew = <7>;
- cs0_dq18_tx_de-skew = <8>;
- cs0_dq19_rx_de-skew = <7>;
- cs0_dq19_tx_de-skew = <8>;
- cs0_dq20_rx_de-skew = <7>;
- cs0_dq20_tx_de-skew = <8>;
- cs0_dq21_rx_de-skew = <7>;
- cs0_dq21_tx_de-skew = <8>;
- cs0_dq22_rx_de-skew = <7>;
- cs0_dq22_tx_de-skew = <8>;
- cs0_dq23_rx_de-skew = <7>;
- cs0_dq23_tx_de-skew = <8>;
- cs0_dqs2_rx_de-skew = <6>;
- cs0_dqs2p_tx_de-skew = <9>;
- cs0_dqs2n_tx_de-skew = <9>;
+ cs0_dm2_rx_de-skew = <8>;
+ cs0_dm2_tx_de-skew = <9>;
+ cs0_dq16_rx_de-skew = <8>;
@ -215,7 +361,28 @@ index 0000000..59cae37
+ cs0_dqs2_rx_de-skew = <7>;
+ cs0_dqs2p_tx_de-skew = <10>;
+ cs0_dqs2n_tx_de-skew = <10>;
+
- cs0_dm3_rx_de-skew = <7>;
- cs0_dm3_tx_de-skew = <7>;
- cs0_dq24_rx_de-skew = <7>;
- cs0_dq24_tx_de-skew = <8>;
- cs0_dq25_rx_de-skew = <7>;
- cs0_dq25_tx_de-skew = <7>;
- cs0_dq26_rx_de-skew = <7>;
- cs0_dq26_tx_de-skew = <7>;
- cs0_dq27_rx_de-skew = <7>;
- cs0_dq27_tx_de-skew = <7>;
- cs0_dq28_rx_de-skew = <7>;
- cs0_dq28_tx_de-skew = <7>;
- cs0_dq29_rx_de-skew = <7>;
- cs0_dq29_tx_de-skew = <7>;
- cs0_dq30_rx_de-skew = <7>;
- cs0_dq30_tx_de-skew = <7>;
- cs0_dq31_rx_de-skew = <7>;
- cs0_dq31_tx_de-skew = <7>;
- cs0_dqs3_rx_de-skew = <7>;
- cs0_dqs3p_tx_de-skew = <9>;
- cs0_dqs3n_tx_de-skew = <9>;
+ cs0_dm3_rx_de-skew = <8>;
+ cs0_dm3_tx_de-skew = <8>;
+ cs0_dq24_rx_de-skew = <8>;
@ -237,7 +404,28 @@ index 0000000..59cae37
+ cs0_dqs3_rx_de-skew = <8>;
+ cs0_dqs3p_tx_de-skew = <10>;
+ cs0_dqs3n_tx_de-skew = <10>;
+
- cs1_dm0_rx_de-skew = <7>;
- cs1_dm0_tx_de-skew = <8>;
- cs1_dq0_rx_de-skew = <7>;
- cs1_dq0_tx_de-skew = <8>;
- cs1_dq1_rx_de-skew = <7>;
- cs1_dq1_tx_de-skew = <8>;
- cs1_dq2_rx_de-skew = <7>;
- cs1_dq2_tx_de-skew = <8>;
- cs1_dq3_rx_de-skew = <7>;
- cs1_dq3_tx_de-skew = <8>;
- cs1_dq4_rx_de-skew = <7>;
- cs1_dq4_tx_de-skew = <8>;
- cs1_dq5_rx_de-skew = <7>;
- cs1_dq5_tx_de-skew = <8>;
- cs1_dq6_rx_de-skew = <7>;
- cs1_dq6_tx_de-skew = <8>;
- cs1_dq7_rx_de-skew = <7>;
- cs1_dq7_tx_de-skew = <8>;
- cs1_dqs0_rx_de-skew = <6>;
- cs1_dqs0p_tx_de-skew = <9>;
- cs1_dqs0n_tx_de-skew = <9>;
+ cs1_dm0_rx_de-skew = <8>;
+ cs1_dm0_tx_de-skew = <9>;
+ cs1_dq0_rx_de-skew = <8>;
@ -259,7 +447,28 @@ index 0000000..59cae37
+ cs1_dqs0_rx_de-skew = <7>;
+ cs1_dqs0p_tx_de-skew = <10>;
+ cs1_dqs0n_tx_de-skew = <10>;
+
- cs1_dm1_rx_de-skew = <7>;
- cs1_dm1_tx_de-skew = <7>;
- cs1_dq8_rx_de-skew = <7>;
- cs1_dq8_tx_de-skew = <8>;
- cs1_dq9_rx_de-skew = <7>;
- cs1_dq9_tx_de-skew = <7>;
- cs1_dq10_rx_de-skew = <7>;
- cs1_dq10_tx_de-skew = <8>;
- cs1_dq11_rx_de-skew = <7>;
- cs1_dq11_tx_de-skew = <7>;
- cs1_dq12_rx_de-skew = <7>;
- cs1_dq12_tx_de-skew = <8>;
- cs1_dq13_rx_de-skew = <7>;
- cs1_dq13_tx_de-skew = <7>;
- cs1_dq14_rx_de-skew = <7>;
- cs1_dq14_tx_de-skew = <8>;
- cs1_dq15_rx_de-skew = <7>;
- cs1_dq15_tx_de-skew = <7>;
- cs1_dqs1_rx_de-skew = <7>;
- cs1_dqs1p_tx_de-skew = <9>;
- cs1_dqs1n_tx_de-skew = <9>;
+ cs1_dm1_rx_de-skew = <8>;
+ cs1_dm1_tx_de-skew = <8>;
+ cs1_dq8_rx_de-skew = <8>;
@ -281,7 +490,28 @@ index 0000000..59cae37
+ cs1_dqs1_rx_de-skew = <8>;
+ cs1_dqs1p_tx_de-skew = <10>;
+ cs1_dqs1n_tx_de-skew = <10>;
+
- cs1_dm2_rx_de-skew = <7>;
- cs1_dm2_tx_de-skew = <8>;
- cs1_dq16_rx_de-skew = <7>;
- cs1_dq16_tx_de-skew = <8>;
- cs1_dq17_rx_de-skew = <7>;
- cs1_dq17_tx_de-skew = <8>;
- cs1_dq18_rx_de-skew = <7>;
- cs1_dq18_tx_de-skew = <8>;
- cs1_dq19_rx_de-skew = <7>;
- cs1_dq19_tx_de-skew = <8>;
- cs1_dq20_rx_de-skew = <7>;
- cs1_dq20_tx_de-skew = <8>;
- cs1_dq21_rx_de-skew = <7>;
- cs1_dq21_tx_de-skew = <8>;
- cs1_dq22_rx_de-skew = <7>;
- cs1_dq22_tx_de-skew = <8>;
- cs1_dq23_rx_de-skew = <7>;
- cs1_dq23_tx_de-skew = <8>;
- cs1_dqs2_rx_de-skew = <6>;
- cs1_dqs2p_tx_de-skew = <9>;
- cs1_dqs2n_tx_de-skew = <9>;
+ cs1_dm2_rx_de-skew = <8>;
+ cs1_dm2_tx_de-skew = <9>;
+ cs1_dq16_rx_de-skew = <8>;
@ -303,7 +533,28 @@ index 0000000..59cae37
+ cs1_dqs2_rx_de-skew = <7>;
+ cs1_dqs2p_tx_de-skew = <10>;
+ cs1_dqs2n_tx_de-skew = <10>;
+
- cs1_dm3_rx_de-skew = <7>;
- cs1_dm3_tx_de-skew = <7>;
- cs1_dq24_rx_de-skew = <7>;
- cs1_dq24_tx_de-skew = <8>;
- cs1_dq25_rx_de-skew = <7>;
- cs1_dq25_tx_de-skew = <7>;
- cs1_dq26_rx_de-skew = <7>;
- cs1_dq26_tx_de-skew = <7>;
- cs1_dq27_rx_de-skew = <7>;
- cs1_dq27_tx_de-skew = <7>;
- cs1_dq28_rx_de-skew = <7>;
- cs1_dq28_tx_de-skew = <7>;
- cs1_dq29_rx_de-skew = <7>;
- cs1_dq29_tx_de-skew = <7>;
- cs1_dq30_rx_de-skew = <7>;
- cs1_dq30_tx_de-skew = <7>;
- cs1_dq31_rx_de-skew = <7>;
- cs1_dq31_tx_de-skew = <7>;
- cs1_dqs3_rx_de-skew = <7>;
- cs1_dqs3p_tx_de-skew = <9>;
- cs1_dqs3n_tx_de-skew = <9>;
+ cs1_dm3_rx_de-skew = <8>;
+ cs1_dm3_tx_de-skew = <8>;
+ cs1_dq24_rx_de-skew = <8>;
@ -326,10 +577,10 @@ index 0000000..59cae37
+ cs1_dqs3p_tx_de-skew = <10>;
+ cs1_dqs3n_tx_de-skew = <10>;
+ };
+};
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
new file mode 100644
index 0000000..457359c
index 000000000000..dee5a395fb55
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
@@ -0,0 +1,864 @@
@ -1197,3 +1448,6 @@ index 0000000..457359c
+ <0xb5 KEY_BACKSPACE>;
+ };
+};
--
Armbian

59
patch/kernel/archive/rockchip64-4.4/arm64_increasing_DMA_block_memory_allocation_to_2048.patch
View File

@ -1,13 +1,62 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Mon, 21 Aug 2017 08:54:53 +0200
Subject: [ARCHEOLOGY] Increasing DMA block memory allocation to 2048k on all
relevant kernels.
> X-Git-Archeology: > recovered message: > https://forum.armbian.com/index.php?/topic/4811-uas-mainline-kernel-coherent-pool-memory-size
> X-Git-Archeology: - Revision 908bb199ec2defd77f7f05d2016980abf100d627: https://github.com/armbian/build/commit/908bb199ec2defd77f7f05d2016980abf100d627
> X-Git-Archeology: Date: Mon, 21 Aug 2017 08:54:53 +0200
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Increasing DMA block memory allocation to 2048k on all relevant kernels.
> X-Git-Archeology:
> X-Git-Archeology: - Revision a3cf7b74858e1f862db8ca238bd44f6406be6662: https://github.com/armbian/build/commit/a3cf7b74858e1f862db8ca238bd44f6406be6662
> X-Git-Archeology: Date: Mon, 21 Aug 2017 17:52:29 +0200
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Revert "Increasing DMA block memory allocation to 2048k on all relevant kernels."
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2be21aad5dc965b3bc67e136a1e1170119d60f74: https://github.com/armbian/build/commit/2be21aad5dc965b3bc67e136a1e1170119d60f74
> X-Git-Archeology: Date: Mon, 21 Aug 2017 17:52:48 +0200
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Increasing DMA block memory allocation to 2048k on all relevant kernels. https://forum.armbian.com/index.php?/topic/4811-uas-mainline-kernel-coherent-pool-memory-size
> X-Git-Archeology:
> X-Git-Archeology: - Revision 13e94e58f04be27db51d18b7dac1d15a1864b79e: https://github.com/armbian/build/commit/13e94e58f04be27db51d18b7dac1d15a1864b79e
> X-Git-Archeology: Date: Fri, 27 Oct 2017 16:14:21 +0300
> X-Git-Archeology: From: zador-blood-stained <zador-blood-stained@users.noreply.github.com>
> X-Git-Archeology: Subject: Remove random executable bits from patch files
> X-Git-Archeology:
> X-Git-Archeology: - Revision 41b589372f2c1a8450033db78f3d8ed9db1b2196: https://github.com/armbian/build/commit/41b589372f2c1a8450033db78f3d8ed9db1b2196
> X-Git-Archeology: Date: Sun, 26 Aug 2018 14:14:14 +0200
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Creating new family rockchip64. 3288 and 3399 was merged in, except Nanopi which stays in RK3399 family with sources attached to FA repository until we manage to join that in. Enabled Nanopc T4, Nanopi M4, Renegade. Tested on Rock64 and Nanopc T4.
> X-Git-Archeology:
> X-Git-Archeology: - Revision 150ac0c2afa147d9e3b036c8ecd8238fe5648cf3: https://github.com/armbian/build/commit/150ac0c2afa147d9e3b036c8ecd8238fe5648cf3
> X-Git-Archeology: Date: Tue, 19 Nov 2019 23:25:39 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Remove K<4, change branches, new features (#1586)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
arch/arm64/mm/dma-mapping.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
index 3216e09..21bce28
index 2b05653e8156..2ad8515cd4da 100644
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
@@ -44,7 +44,7 @@ static pgprot_t __get_dma_pgprot(unsigned long attrs, pgprot_t prot,
@@ -32,7 +32,7 @@
static struct gen_pool *atomic_pool;
-#define DEFAULT_DMA_COHERENT_POOL_SIZE SZ_256K
+#define DEFAULT_DMA_COHERENT_POOL_SIZE SZ_2M
static size_t atomic_pool_size __initdata = DEFAULT_DMA_COHERENT_POOL_SIZE;
static int __init early_coherent_pool(char *p)
--
Armbian

30
patch/kernel/archive/rockchip64-4.4/arm64_makefile_fix_build_of_i-file_in_external_module_case.patch
View File

@ -1,5 +1,30 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Matthias Riechmann <21068765+mmriech@users.noreply.github.com>
Date: Tue, 21 Jan 2020 14:57:45 +0100
Subject: [ARCHEOLOGY] Fixed makefile of kernel headers 4.4.210 for rk3399
(#1753)
> X-Git-Archeology: - Revision e0b17387ea6614340a58c75ed111d13141cb5886: https://github.com/armbian/build/commit/e0b17387ea6614340a58c75ed111d13141cb5886
> X-Git-Archeology: Date: Tue, 21 Jan 2020 14:57:45 +0100
> X-Git-Archeology: From: Matthias Riechmann <21068765+mmriech@users.noreply.github.com>
> X-Git-Archeology: Subject: Fixed makefile of kernel headers 4.4.210 for rk3399 (#1753)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 23604e8a0dcdf81ec6c28ccd4b2a64b90816d8e7: https://github.com/armbian/build/commit/23604e8a0dcdf81ec6c28ccd4b2a64b90816d8e7
> X-Git-Archeology: Date: Fri, 19 Jun 2020 17:27:27 +0200
> X-Git-Archeology: From: Paolo <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: Introducing Rockchip RK322X SoC support (#2032)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
arch/arm64/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index 605f6cf4..08b797df 100644
index 197c08ee6af6..d36b42ca1e51 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -141,6 +141,7 @@ archclean:
@ -18,3 +43,6 @@ index 605f6cf4..08b797df 100644
define archhelp
echo '* Image.gz - Compressed kernel image (arch/$(ARCH)/boot/Image.gz)'
--
Armbian

71
patch/kernel/archive/rockchip64-4.4/ayufan-packagin-restore-default.patch
View File

@ -1,39 +1,88 @@
reverted:
--- b/scripts/package/builddeb
+++ a/scripts/package/builddeb
@@ -293,7 +293,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Tue, 27 Feb 2018 16:21:49 +0100
Subject: [ARCHEOLOGY] RK3328 kernel and u-boot upstream patches and few small
fixes
> X-Git-Archeology: - Revision 9e32020d1aa974462d82d5c404e305da04bdb432: https://github.com/armbian/build/commit/9e32020d1aa974462d82d5c404e305da04bdb432
> X-Git-Archeology: Date: Tue, 27 Feb 2018 16:21:49 +0100
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: RK3328 kernel and u-boot upstream patches and few small fixes
> X-Git-Archeology:
> X-Git-Archeology: - Revision 7d2f3af08f23049c91c88eec5062613bbfbc85d4: https://github.com/armbian/build/commit/7d2f3af08f23049c91c88eec5062613bbfbc85d4
> X-Git-Archeology: Date: Thu, 24 May 2018 15:44:15 +0200
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Merging Rockchip family
> X-Git-Archeology:
> X-Git-Archeology: - Revision 41b589372f2c1a8450033db78f3d8ed9db1b2196: https://github.com/armbian/build/commit/41b589372f2c1a8450033db78f3d8ed9db1b2196
> X-Git-Archeology: Date: Sun, 26 Aug 2018 14:14:14 +0200
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Creating new family rockchip64. 3288 and 3399 was merged in, except Nanopi which stays in RK3399 family with sources attached to FA repository until we manage to join that in. Enabled Nanopc T4, Nanopi M4, Renegade. Tested on Rock64 and Nanopc T4.
> X-Git-Archeology:
> X-Git-Archeology: - Revision 150ac0c2afa147d9e3b036c8ecd8238fe5648cf3: https://github.com/armbian/build/commit/150ac0c2afa147d9e3b036c8ecd8238fe5648cf3
> X-Git-Archeology: Date: Tue, 19 Nov 2019 23:25:39 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Remove K<4, change branches, new features (#1586)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 42ecf1582f83241e18ce329193c5eac66fd244de: https://github.com/armbian/build/commit/42ecf1582f83241e18ce329193c5eac66fd244de
> X-Git-Archeology: Date: Fri, 03 Jan 2020 11:37:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Move rockchip64 legacy to most recent kernel. Tested with standard https://github.com/armbian/autotests stress test on RockPro64 and Rock64.
> X-Git-Archeology:
> X-Git-Archeology: - Revision 5597ecfe073a70e11a3d832ca210471217706a0f: https://github.com/armbian/build/commit/5597ecfe073a70e11a3d832ca210471217706a0f
> X-Git-Archeology: Date: Fri, 03 Jan 2020 11:42:56 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move rockchip64 legacy to most recent kernel. Tested with standard https://github.com/armbian/autotests stress test on RockPro64 and Rock64. (#1714)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
scripts/package/builddeb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index de4bfb55e128..530f310b4c5b 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -293,7 +293,7 @@ if [ "$ARCH" = "um" ]; then
cat <<EOF >> debian/control
Package: $packagename
+Provides: linux-image, linux-image-2.6, linux-modules-$version
-Provides: linux-image, linux-image-rockchip, linux-image-rockchip-4.4, linux-modules-$version
+Provides: linux-image, linux-image-2.6, linux-modules-$version
Architecture: any
Description: User Mode Linux kernel, version $version
User-mode Linux is a port of the Linux kernel to its own system call
@@ -310,7 +310,7 @@
@@ -310,7 +310,7 @@ else
cat <<EOF >> debian/control
Package: $packagename
+Provides: linux-image, linux-image-2.6, linux-modules-$version
-Provides: linux-image, linux-image-rockchip, linux-image-rockchip-4.4, linux-modules-$version
+Provides: linux-image, linux-image-2.6, linux-modules-$version
Suggests: $fwpackagename
Architecture: any
Description: Linux kernel, version $version
@@ -365,7 +365,7 @@
@@ -366,7 +366,7 @@ cat <<EOF >> debian/control
Package: $libc_headers_packagename
Section: devel
+Provides: linux-kernel-headers
-Provides: linux-kernel-headers, linux-kernel-headers-rockchip, linux-kernel-headers-rockchip-4.4
+Provides: linux-kernel-headers
Architecture: any
Description: Linux support headers for userspace development
This package provides userspaces headers from the Linux kernel. These headers
@@ -395,7 +395,7 @@
@@ -396,7 +396,7 @@ if [ -n "$BUILD_DEBUG" ] ; then
Package: $dbg_packagename
Section: debug
+Provides: linux-debug, linux-debug-$version
-Provides: linux-debug, linux-debug-$version, linux-debug-rockchip, linux-debug-rockchip-4.4
+Provides: linux-debug, linux-debug-$version
Architecture: any
Description: Linux kernel debugging symbols for $version
This package will come in handy if you need to debug the kernel. It provides
--
Armbian

31
patch/kernel/archive/rockchip64-4.4/board-rockpro64-disable-sd-uhs.patch
View File

@ -1,8 +1,32 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Piotr Szczepanik <piter75@gmail.com>
Date: Mon, 5 Oct 2020 23:17:55 +0200
Subject: [ARCHEOLOGY] Switched RockPro64 to mainline u-boot (#2218)
> X-Git-Archeology: > recovered message: > * Switched RockPro64 to mainline u-boot
> X-Git-Archeology: > recovered message: > * Enabled rockusb and ums for RockPro64 in mainline u-boot
> X-Git-Archeology: > recovered message: > * Switched RockPro64 u-boot to TPL/SPL/BLOB scenario
> X-Git-Archeology: > recovered message: > * Enabled advanced recovery button support for RockPro64
> X-Git-Archeology: > recovered message: > * Disabled SDR104 mode for RockPro64 in legacy
> X-Git-Archeology: - Revision f2db96252530d2f5585755b518e7fd020b5f0392: https://github.com/armbian/build/commit/f2db96252530d2f5585755b518e7fd020b5f0392
> X-Git-Archeology: Date: Mon, 05 Oct 2020 23:17:55 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switched RockPro64 to mainline u-boot (#2218)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
index 079358437..d7daa3d40 100644
index f10e1bf0e2a6..83bc06cf1306 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
@@ -896,7 +896,7 @@
@@ -898,7 +898,7 @@
cap-sd-highspeed;
disable-wp;
num-slots = <1>;
@ -11,3 +35,6 @@ index 079358437..d7daa3d40 100644
vqmmc-supply = <&vcc_sd>;
pinctrl-names = "default";
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
--
Armbian

89
patch/kernel/archive/rockchip64-4.4/board-rockpro64-work-led-heartbeat.patch
View File

@ -1,5 +1,89 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Piotr Szczepanik <piter75@gmail.com>
Date: Mon, 24 Aug 2020 22:47:03 +0200
Subject: [ARCHEOLOGY] Switch RockPro64 work led to heartbeat trigger
> X-Git-Archeology: - Revision 42e76b9277ad492e935cc76c2b37c9f6d882a675: https://github.com/armbian/build/commit/42e76b9277ad492e935cc76c2b37c9f6d882a675
> X-Git-Archeology: Date: Mon, 24 Aug 2020 22:47:03 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switch RockPro64 work led to heartbeat trigger
> X-Git-Archeology:
> X-Git-Archeology: - Revision d1eb0003854909824d17b529cd513feb542bf228: https://github.com/armbian/build/commit/d1eb0003854909824d17b529cd513feb542bf228
> X-Git-Archeology: Date: Mon, 24 Aug 2020 23:11:20 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switch RockPro64 work led to heartbeat trigger (in legacy too)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 4d4c3f58ffc1cbfbb060cbabc9eb414036a2fda5: https://github.com/armbian/build/commit/4d4c3f58ffc1cbfbb060cbabc9eb414036a2fda5
> X-Git-Archeology: Date: Wed, 02 Sep 2020 23:22:09 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switched rockchip64 curent to kernel 5.8.y (#2175)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
> X-Git-Archeology: - Revision e7377248b3cae186e24e2be781cd3365b43246f0: https://github.com/armbian/build/commit/e7377248b3cae186e24e2be781cd3365b43246f0
> X-Git-Archeology: Date: Thu, 22 Jul 2021 00:15:54 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Second part of EDGE bumping to 5.13.y (#3045)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 744ea89a589d62cb6f409baab60fc6664520bc39: https://github.com/armbian/build/commit/744ea89a589d62cb6f409baab60fc6664520bc39
> X-Git-Archeology: Date: Wed, 08 Sep 2021 17:51:34 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Bumping EDGE kernel to 5.14.y (#3125)
> X-Git-Archeology:
> X-Git-Archeology: - Revision dd51f9f2afcbc83a3e10b32eb6a5061d91d1558e: https://github.com/armbian/build/commit/dd51f9f2afcbc83a3e10b32eb6a5061d91d1558e
> X-Git-Archeology: Date: Tue, 09 Nov 2021 18:06:34 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Bump imx6, xu4, rockchip64 and jetson-nano to 5.15 (#3238)
> X-Git-Archeology:
> X-Git-Archeology: - Revision ac8fc4385594d59257ee9dffd9efa85e3497fa7d: https://github.com/armbian/build/commit/ac8fc4385594d59257ee9dffd9efa85e3497fa7d
> X-Git-Archeology: Date: Sat, 26 Feb 2022 07:46:44 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switch rockchip64 current to linux 5.15.y (#3489)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 897674aa74bce0326ed7fe06f5336bf4709a8a1f: https://github.com/armbian/build/commit/897674aa74bce0326ed7fe06f5336bf4709a8a1f
> X-Git-Archeology: Date: Tue, 03 May 2022 08:27:32 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Bump and freeze kernel at last known working versions (#3736)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 597d2dac11f00d9070a4e49d6bad1b2244e36cb3: https://github.com/armbian/build/commit/597d2dac11f00d9070a4e49d6bad1b2244e36cb3
> X-Git-Archeology: Date: Sat, 28 May 2022 07:56:22 +0200
> X-Git-Archeology: From: Jianfeng Liu <liujianfeng1994@gmail.com>
> X-Git-Archeology: Subject: update rockchip64-edge to 5.18 (#3814)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 8c6641e7b79f0d50acdc306d140e586a4e923cf0: https://github.com/armbian/build/commit/8c6641e7b79f0d50acdc306d140e586a4e923cf0
> X-Git-Archeology: Date: Wed, 03 Aug 2022 22:22:55 +0200
> X-Git-Archeology: From: Jianfeng Liu <liujianfeng1994@gmail.com>
> X-Git-Archeology: Subject: update rockchip64 edge to 5.19 (#4039)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 6765f734cc4a22aeaa9f99a3ad28c8c322de26f6: https://github.com/armbian/build/commit/6765f734cc4a22aeaa9f99a3ad28c8c322de26f6
> X-Git-Archeology: Date: Tue, 25 Oct 2022 11:26:51 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Bump rockchip64 edge to 6.0.y (#4337)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 92f1a22d76b987afa7ba555d5b509adc51d689e7: https://github.com/armbian/build/commit/92f1a22d76b987afa7ba555d5b509adc51d689e7
> X-Git-Archeology: Date: Fri, 16 Dec 2022 13:38:13 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Re-add rockchip64 6.0 patches (#4575)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 85bab47bba73e0ef0e4ea5fde60e0aab56f82906: https://github.com/armbian/build/commit/85bab47bba73e0ef0e4ea5fde60e0aab56f82906
> X-Git-Archeology: Date: Sat, 06 May 2023 12:55:10 +0200
> X-Git-Archeology: From: amazingfate <liujianfeng1994@gmail.com>
> X-Git-Archeology: Subject: bump rockchip64 edge to v6.3
> X-Git-Archeology:
> X-Git-Archeology: - Revision 906ca66430329ab774f5b9d0f62eef1ce5e398fe: https://github.com/armbian/build/commit/906ca66430329ab774f5b9d0f62eef1ce5e398fe
> X-Git-Archeology: Date: Tue, 16 May 2023 08:55:33 +0200
> X-Git-Archeology: From: Ricardo Pardini <ricardo@pardini.net>
> X-Git-Archeology: Subject: `rockchip64`/`edge`/`6.3`: rebase/rewrite patches against `v6.3.1`; do archeology for mbox-less patches; materialize overwrites
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
index acfbdf221..079358437 100644
index 83bc06cf1306..7a8d9031cb0c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
@@ -209,7 +209,7 @@
@ -11,3 +95,6 @@ index acfbdf221..079358437 100644
default-state = "on";
};
--
Armbian

77
patch/kernel/archive/rockchip64-4.4/board-tvbox-rk3318.patch
View File

@ -1,6 +1,66 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Paolo <paolo.sabatino@gmail.com>
Date: Thu, 23 Jun 2022 08:30:54 +0200
Subject: [ARCHEOLOGY] rockchip64: add rk3318-box tvbox board patch and
configurations (#3921)
> X-Git-Archeology: > recovered message: > * rockchip64: add rk3318-box tvbox board patch and configurations
> X-Git-Archeology: > recovered message: > * rockchip64: add missing bcm43342 patch for edge kernel
> X-Git-Archeology: - Revision 2ca6a9381db4b875533926e0eae9d3d17f68ad06: https://github.com/armbian/build/commit/2ca6a9381db4b875533926e0eae9d3d17f68ad06
> X-Git-Archeology: Date: Thu, 23 Jun 2022 08:30:54 +0200
> X-Git-Archeology: From: Paolo <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: rockchip64: add rk3318-box tvbox board patch and configurations (#3921)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0310f955051adafee3a9701e7e54f01d6a496ff5: https://github.com/armbian/build/commit/0310f955051adafee3a9701e7e54f01d6a496ff5
> X-Git-Archeology: Date: Sat, 09 Jul 2022 16:30:16 +0200
> X-Git-Archeology: From: Paolo <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: rockchip64: fix rk3318-box cpu voltages (#3976)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 8c6641e7b79f0d50acdc306d140e586a4e923cf0: https://github.com/armbian/build/commit/8c6641e7b79f0d50acdc306d140e586a4e923cf0
> X-Git-Archeology: Date: Wed, 03 Aug 2022 22:22:55 +0200
> X-Git-Archeology: From: Jianfeng Liu <liujianfeng1994@gmail.com>
> X-Git-Archeology: Subject: update rockchip64 edge to 5.19 (#4039)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 85bab47bba73e0ef0e4ea5fde60e0aab56f82906: https://github.com/armbian/build/commit/85bab47bba73e0ef0e4ea5fde60e0aab56f82906
> X-Git-Archeology: Date: Sat, 06 May 2023 12:55:10 +0200
> X-Git-Archeology: From: amazingfate <liujianfeng1994@gmail.com>
> X-Git-Archeology: Subject: bump rockchip64 edge to v6.3
> X-Git-Archeology:
> X-Git-Archeology: - Revision 906ca66430329ab774f5b9d0f62eef1ce5e398fe: https://github.com/armbian/build/commit/906ca66430329ab774f5b9d0f62eef1ce5e398fe
> X-Git-Archeology: Date: Tue, 16 May 2023 08:55:33 +0200
> X-Git-Archeology: From: Ricardo Pardini <ricardo@pardini.net>
> X-Git-Archeology: Subject: `rockchip64`/`edge`/`6.3`: rebase/rewrite patches against `v6.3.1`; do archeology for mbox-less patches; materialize overwrites
> X-Git-Archeology:
> X-Git-Archeology: - Revision 19d532b13cabc1a749f61b9c400d933ba5aeb7e3: https://github.com/armbian/build/commit/19d532b13cabc1a749f61b9c400d933ba5aeb7e3
> X-Git-Archeology: Date: Tue, 13 Jun 2023 12:33:59 +0200
> X-Git-Archeology: From: Ricardo Pardini <ricardo@pardini.net>
> X-Git-Archeology: Subject: `rockchip64` `edge` 6.3: rename most remaining "add-board" patches to "board" (all "add-board"s are now bare .dts in `dt/` folder)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 028281f0d673c41e827e6795e5d55c16e12474b3: https://github.com/armbian/build/commit/028281f0d673c41e827e6795e5d55c16e12474b3
> X-Git-Archeology: Date: Tue, 13 Jun 2023 12:33:59 +0200
> X-Git-Archeology: From: Ricardo Pardini <ricardo@pardini.net>
> X-Git-Archeology: Subject: `rockchip64` `edge` 6.3: drop null-patched DTS files, add them bare in `dt/` folder
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/Makefile | 1 +
arch/arm64/boot/dts/rockchip/rk3318-box.dts | 719 ++++++++++
2 files changed, 720 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index b1211e43ec13..014b8c2701b7 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -25,6 +25,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-evb-dmic-pdm-v11.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-fpga.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-voice-module-board-v10.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308b-evb-amic-v10.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-box.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-evb-ai-va-v10.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-evb-ai-va-v11.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-evb-ai-va-v11-i2s-dmic.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3318-box.dts b/arch/arm64/boot/dts/rockchip/rk3318-box.dts
new file mode 100644
index 00000000..93e102c0
index 000000000000..93e102c055cd
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3318-box.dts
@@ -0,0 +1,719 @@
@ -723,15 +783,6 @@ index 00000000..93e102c0
+ /delete-node/ opp-1392000000;
+ /delete-node/ opp-1512000000;
+};
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index e2aa7e9c..497e3b7c 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -25,6 +25,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-evb-dmic-pdm-v11.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-fpga.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-voice-module-board-v10.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308b-evb-amic-v10.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-box.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-evb-ai-va-v10.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-evb-ai-va-v11.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-evb-ai-va-v11-i2s-dmic.dtb
--
Armbian

22
patch/kernel/archive/rockchip64-4.4/brcmfmac-add-ap6334-fw-load.patch
View File

@ -1,5 +1,22 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Paolo <paolo.sabatino@gmail.com>
Date: Thu, 23 Jun 2022 08:30:54 +0200
Subject: [ARCHEOLOGY] rockchip64: add rk3318-box tvbox board patch and
configurations (#3921)
> X-Git-Archeology: > recovered message: > * rockchip64: add rk3318-box tvbox board patch and configurations
> X-Git-Archeology: > recovered message: > * rockchip64: add missing bcm43342 patch for edge kernel
> X-Git-Archeology: - Revision 2ca6a9381db4b875533926e0eae9d3d17f68ad06: https://github.com/armbian/build/commit/2ca6a9381db4b875533926e0eae9d3d17f68ad06
> X-Git-Archeology: Date: Thu, 23 Jun 2022 08:30:54 +0200
> X-Git-Archeology: From: Paolo <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: rockchip64: add rk3318-box tvbox board patch and configurations (#3921)
> X-Git-Archeology:
---
drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
index b082b885..a23d6aab 100644
index b082b8859b17..a23d6aab8054 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
@@ -611,6 +611,8 @@ static const struct sdiod_drive_str sdiod_drvstr_tab2_3v3[] = {
@ -29,3 +46,6 @@ index b082b885..a23d6aab 100644
{ BRCM_CC_43340_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM43340) },
{ BRCM_CC_4335_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4335) },
{ BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, BRCMF_FIRMWARE_NVRAM(BCM43362) },
--
Armbian

35
patch/kernel/archive/rockchip64-4.4/compiler-fixes.patch
View File

@ -1,8 +1,34 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Thu, 7 Feb 2019 15:24:06 +0100
Subject: [ARCHEOLOGY] [ general ] Attach Realtek 8811, 8812, 8814 and 8821
drivers source, remove our old patches, adjust configs, tested on all
combinations
> X-Git-Archeology: - Revision 9758711ed42e345453eddc4b3314f8eaf81d01b5: https://github.com/armbian/build/commit/9758711ed42e345453eddc4b3314f8eaf81d01b5
> X-Git-Archeology: Date: Thu, 07 Feb 2019 15:24:06 +0100
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: [ general ] Attach Realtek 8811, 8812, 8814 and 8821 drivers source, remove our old patches, adjust configs, tested on all combinations
> X-Git-Archeology:
> X-Git-Archeology: - Revision 150ac0c2afa147d9e3b036c8ecd8238fe5648cf3: https://github.com/armbian/build/commit/150ac0c2afa147d9e3b036c8ecd8238fe5648cf3
> X-Git-Archeology: Date: Tue, 19 Nov 2019 23:25:39 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Remove K<4, change branches, new features (#1586)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
Makefile | 14 +++++++---
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index adf05079..82d77dda 100644
index 4fb61874d20f..1583e6108225 100644
--- a/Makefile
+++ b/Makefile
@@ -382,9 +382,17 @@ CHECK = sparse
@@ -377,9 +377,17 @@ CHECK = sparse
# Use the wrapper for the compiler. This wrapper scans for new
# warnings and causes the build to stop upon encountering them.
@ -20,7 +46,7 @@ index adf05079..82d77dda 100644
CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
-Wbitwise -Wno-return-void $(CF)
@@ -442,10 +450,8 @@ export MAKE AWK GENKSYMS INSTALLKERNEL PERL PYTHON UTS_MACHINE
@@ -437,10 +445,8 @@ export MAKE AWK GENKSYMS INSTALLKERNEL PERL PYTHON UTS_MACHINE
export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
@ -33,3 +59,6 @@ index adf05079..82d77dda 100644
export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_LDFLAGS_MODULE
export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL
export KBUILD_ARFLAGS
--
Armbian

38
patch/kernel/archive/rockchip64-4.4/enable-1392mhz-opp.patch
View File

@ -1,9 +1,38 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: ThomasKaiser <github@kaiser-edv.de>
Date: Thu, 5 Jul 2018 05:32:09 -0700
Subject: [ARCHEOLOGY] Enable 1392 MHz cpufreq OPP on all RK3328 devices
> X-Git-Archeology: - Revision a79d5932cf21c1c7221bfa6cd036a3f47e506318: https://github.com/armbian/build/commit/a79d5932cf21c1c7221bfa6cd036a3f47e506318
> X-Git-Archeology: Date: Thu, 05 Jul 2018 05:32:09 -0700
> X-Git-Archeology: From: ThomasKaiser <github@kaiser-edv.de>
> X-Git-Archeology: Subject: Enable 1392 MHz cpufreq OPP on all RK3328 devices
> X-Git-Archeology:
> X-Git-Archeology: - Revision 41b589372f2c1a8450033db78f3d8ed9db1b2196: https://github.com/armbian/build/commit/41b589372f2c1a8450033db78f3d8ed9db1b2196
> X-Git-Archeology: Date: Sun, 26 Aug 2018 14:14:14 +0200
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Creating new family rockchip64. 3288 and 3399 was merged in, except Nanopi which stays in RK3399 family with sources attached to FA repository until we manage to join that in. Enabled Nanopc T4, Nanopi M4, Renegade. Tested on Rock64 and Nanopc T4.
> X-Git-Archeology:
> X-Git-Archeology: - Revision 150ac0c2afa147d9e3b036c8ecd8238fe5648cf3: https://github.com/armbian/build/commit/150ac0c2afa147d9e3b036c8ecd8238fe5648cf3
> X-Git-Archeology: Date: Tue, 19 Nov 2019 23:25:39 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Remove K<4, change branches, new features (#1586)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index d08231c..0710ab8 100644
index e4debf4d6363..3ab51435101e 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -164,6 +164,13 @@
opp-microvolt-L1 = <1300000 1300000 1325000>;
@@ -165,6 +165,13 @@
opp-microvolt-L1 = <1300000 1300000 1350000>;
clock-latency-ns = <40000>;
};
+ opp-1392000000 {
@ -16,3 +45,6 @@ index d08231c..0710ab8 100644
};
arm-pmu {
--
Armbian

72
patch/kernel/archive/rockchip64-4.4/enable-1512mhz-opp.patch
View File

@ -1,25 +1,39 @@
diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index b7c84b52..9f11025a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -152,6 +152,13 @@
opp-microvolt-L1 = <1325000 1325000 1325000>;
clock-latency-ns = <40000>;
};
+ opp-1512000000 {
+ opp-hz = /bits/ 64 <1512000000>;
+ opp-microvolt = <1450000 1450000 1450000>;
+ opp-microvolt-L0 = <1450000 1450000 1450000>;
+ opp-microvolt-L1 = <1425000 1425000 1425000>;
+ clock-latency-ns = <40000>;
+ };
};
arm-pmu {
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Sun, 26 Aug 2018 14:14:14 +0200
Subject: [ARCHEOLOGY] Creating new family rockchip64. 3288 and 3399 was merged
in, except Nanopi which stays in RK3399 family with sources attached to FA
repository until we manage to join that in. Enabled Nanopc T4, Nanopi M4,
Renegade. Tested on Rock64 and Nanopc T4.
> X-Git-Archeology: > recovered message: > Some clenaup, removed dragonboard820c, adjusted board descriptions, added another OPP for 3288 family,
> X-Git-Archeology: - Revision 41b589372f2c1a8450033db78f3d8ed9db1b2196: https://github.com/armbian/build/commit/41b589372f2c1a8450033db78f3d8ed9db1b2196
> X-Git-Archeology: Date: Sun, 26 Aug 2018 14:14:14 +0200
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Creating new family rockchip64. 3288 and 3399 was merged in, except Nanopi which stays in RK3399 family with sources attached to FA repository until we manage to join that in. Enabled Nanopc T4, Nanopi M4, Renegade. Tested on Rock64 and Nanopc T4.
> X-Git-Archeology:
> X-Git-Archeology: - Revision 08614f398205625151ea5fa1d995734110b45fe1: https://github.com/armbian/build/commit/08614f398205625151ea5fa1d995734110b45fe1
> X-Git-Archeology: Date: Fri, 11 Jan 2019 11:43:35 +0100
> X-Git-Archeology: From: JMCC <JMCC@localhost>
> X-Git-Archeology: Subject: Fix 1512MHz OPP for Renegade
> X-Git-Archeology:
> X-Git-Archeology: - Revision 150ac0c2afa147d9e3b036c8ecd8238fe5648cf3: https://github.com/armbian/build/commit/150ac0c2afa147d9e3b036c8ecd8238fe5648cf3
> X-Git-Archeology: Date: Tue, 19 Nov 2019 23:25:39 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Remove K<4, change branches, new features (#1586)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 7 +++----
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 7 +++++++
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
index dee5a395..bfacc080 100644
index dee5a395fb55..bfacc080d5de 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
@@ -360,11 +360,10 @@
@ -37,4 +51,24 @@ index dee5a395..bfacc080 100644
clock-latency-ns = <40000>;
};
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index 3ab51435101e..ac71ce493833 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -172,6 +172,13 @@
opp-microvolt-L1 = <1325000 1325000 1325000>;
clock-latency-ns = <40000>;
};
+ opp-1512000000 {
+ opp-hz = /bits/ 64 <1512000000>;
+ opp-microvolt = <1450000 1450000 1450000>;
+ opp-microvolt-L0 = <1450000 1450000 1450000>;
+ opp-microvolt-L1 = <1425000 1425000 1425000>;
+ clock-latency-ns = <40000>;
+ };
};
arm-pmu {
--
Armbian

366
patch/kernel/archive/rockchip64-4.4/general-add-overlay-compilation-support.patch
View File

@ -1,5 +1,348 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: zador-blood-stained <zador-blood-stained@users.noreply.github.com>
Date: Sat, 11 Feb 2017 20:32:53 +0300
Subject: [ARCHEOLOGY] Rename, split and improve H3 DT overlays
> X-Git-Archeology: > recovered message: > Fix OPi Zero DT
> X-Git-Archeology: > recovered message: > Improve DT loading reliability
> X-Git-Archeology: - Revision bacf56710491e3307e0fb2bc1c828dad828c9f23: https://github.com/armbian/build/commit/bacf56710491e3307e0fb2bc1c828dad828c9f23
> X-Git-Archeology: Date: Sat, 11 Feb 2017 20:32:53 +0300
> X-Git-Archeology: From: zador-blood-stained <zador-blood-stained@users.noreply.github.com>
> X-Git-Archeology: Subject: Rename, split and improve H3 DT overlays
> X-Git-Archeology:
> X-Git-Archeology: - Revision c7bbc3257e8dcbf75398301602150fe9f1666c86: https://github.com/armbian/build/commit/c7bbc3257e8dcbf75398301602150fe9f1666c86
> X-Git-Archeology: Date: Sun, 26 Feb 2017 19:46:15 +0300
> X-Git-Archeology: From: zador-blood-stained <zador-blood-stained@users.noreply.github.com>
> X-Git-Archeology: Subject: Initial A20 overlays support for sunxi-next kernel
> X-Git-Archeology:
> X-Git-Archeology: - Revision caf4b1b037e7510cae7edd1b5f75482eed41b547: https://github.com/armbian/build/commit/caf4b1b037e7510cae7edd1b5f75482eed41b547
> X-Git-Archeology: Date: Mon, 13 Mar 2017 20:32:37 +0300
> X-Git-Archeology: From: zador-blood-stained <zador-blood-stained@users.noreply.github.com>
> X-Git-Archeology: Subject: Add new A20 overlays
> X-Git-Archeology:
> X-Git-Archeology: - Revision b30fcea3f95804175199bc1865a7e39cdf07cf73: https://github.com/armbian/build/commit/b30fcea3f95804175199bc1865a7e39cdf07cf73
> X-Git-Archeology: Date: Sun, 14 May 2017 17:59:35 +0300
> X-Git-Archeology: From: zador-blood-stained <zador-blood-stained@users.noreply.github.com>
> X-Git-Archeology: Subject: Update sunxi-next branch to 4.11
> X-Git-Archeology:
> X-Git-Archeology: - Revision 20240e9669055030076e69452cf6a1ccb368cc2e: https://github.com/armbian/build/commit/20240e9669055030076e69452cf6a1ccb368cc2e
> X-Git-Archeology: Date: Tue, 30 May 2017 21:30:38 -0400
> X-Git-Archeology: From: Martin Ayotte <martinayotte@yahoo.ca>
> X-Git-Archeology: Subject: add overlays to sunxi-dev
> X-Git-Archeology:
> X-Git-Archeology: - Revision b0fcb64aaca589359338a500e7bc07eb7ca1cb71: https://github.com/armbian/build/commit/b0fcb64aaca589359338a500e7bc07eb7ca1cb71
> X-Git-Archeology: Date: Thu, 07 Dec 2017 07:09:10 +0100
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Temporally disabling broken patches on sunxi DEV branch
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2123e539ed288e3355ef3d3adc79788a187f62df: https://github.com/armbian/build/commit/2123e539ed288e3355ef3d3adc79788a187f62df
> X-Git-Archeology: Date: Thu, 15 Feb 2018 11:21:51 +0200
> X-Git-Archeology: From: Stefan Mavrodiev <stefan@olimex.com>
> X-Git-Archeology: Subject: Add overlays support for upstream kernel
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2c08ec8f5a210de35f9482f482ac01ea15381792: https://github.com/armbian/build/commit/2c08ec8f5a210de35f9482f482ac01ea15381792
> X-Git-Archeology: Date: Thu, 24 May 2018 13:32:29 +0200
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Merge sunxi family into stable
> X-Git-Archeology:
> X-Git-Archeology: - Revision 1a12994e79b6ef173dc58efe4df8919cb6cc7781: https://github.com/armbian/build/commit/1a12994e79b6ef173dc58efe4df8919cb6cc7781
> X-Git-Archeology: Date: Tue, 17 Jul 2018 15:53:30 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Moving sunxi-next to 4.17.y (#1049)
> X-Git-Archeology:
> X-Git-Archeology: - Revision a57ce78b37f8dd2eb94a3836f4a7f6969f2ffd72: https://github.com/armbian/build/commit/a57ce78b37f8dd2eb94a3836f4a7f6969f2ffd72
> X-Git-Archeology: Date: Tue, 21 Aug 2018 10:41:10 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Reverting sunxi/sunxi64 NEXT to 4.14. (#1087)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 871bed1a24e21952f7aeb1981c26ad5fc573be9d: https://github.com/armbian/build/commit/871bed1a24e21952f7aeb1981c26ad5fc573be9d
> X-Git-Archeology: Date: Tue, 04 Dec 2018 16:25:53 -0500
> X-Git-Archeology: From: Martin Ayotte <martinayotte@yahoo.ca>
> X-Git-Archeology: Subject: add overlay-compilation-support to meson64-dev
> X-Git-Archeology:
> X-Git-Archeology: - Revision 7c5fb27d79d1c737fc2ca92a1069226e9aae2154: https://github.com/armbian/build/commit/7c5fb27d79d1c737fc2ca92a1069226e9aae2154
> X-Git-Archeology: Date: Wed, 09 Jan 2019 23:33:47 -0500
> X-Git-Archeology: From: Thomas McKahan <tonymckahan@gmail.com>
> X-Git-Archeology: Subject: [ meson64-next ] Shift Next to 4.19
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2fa7c680c29a144214706dda35c2a6afdd708858: https://github.com/armbian/build/commit/2fa7c680c29a144214706dda35c2a6afdd708858
> X-Git-Archeology: Date: Thu, 21 Mar 2019 14:57:07 -0400
> X-Git-Archeology: From: Martin Ayotte <martinayotte@yahoo.ca>
> X-Git-Archeology: Subject: fix overlay patch
> X-Git-Archeology:
> X-Git-Archeology: - Revision a040785d4299e10255d87fdfcfa70b56e0b6779f: https://github.com/armbian/build/commit/a040785d4299e10255d87fdfcfa70b56e0b6779f
> X-Git-Archeology: Date: Sun, 04 Aug 2019 18:05:50 -0400
> X-Git-Archeology: From: chwe17 <weberc18@gmail.com>
> X-Git-Archeology: Subject: Tinkerboard camera support (#1482)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 150ac0c2afa147d9e3b036c8ecd8238fe5648cf3: https://github.com/armbian/build/commit/150ac0c2afa147d9e3b036c8ecd8238fe5648cf3
> X-Git-Archeology: Date: Tue, 19 Nov 2019 23:25:39 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Remove K<4, change branches, new features (#1586)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 23604e8a0dcdf81ec6c28ccd4b2a64b90816d8e7: https://github.com/armbian/build/commit/23604e8a0dcdf81ec6c28ccd4b2a64b90816d8e7
> X-Git-Archeology: Date: Fri, 19 Jun 2020 17:27:27 +0200
> X-Git-Archeology: From: Paolo <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: Introducing Rockchip RK322X SoC support (#2032)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 99afbdfe7e08334bb5dde05c4f3dab536e87224e: https://github.com/armbian/build/commit/99afbdfe7e08334bb5dde05c4f3dab536e87224e
> X-Git-Archeology: Date: Fri, 26 Jun 2020 15:53:20 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Bump meson64 current to 5.7.y (#2069)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 812245def37a695bce9e7ece148b2920d82c8b37: https://github.com/armbian/build/commit/812245def37a695bce9e7ece148b2920d82c8b37
> X-Git-Archeology: Date: Sat, 18 Jul 2020 23:07:01 +0200
> X-Git-Archeology: From: Werner <EvilOlaf@users.noreply.github.com>
> X-Git-Archeology: Subject: Move rockchip/64 current to 5.7.y (#2099)
> X-Git-Archeology:
> X-Git-Archeology: - Revision caa47bad650f82cb8045d19c384595b1760bd9e1: https://github.com/armbian/build/commit/caa47bad650f82cb8045d19c384595b1760bd9e1
> X-Git-Archeology: Date: Sat, 18 Jul 2020 23:08:52 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move sunxi/64 current to 5.7, legacy to 5.4 (#2098)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 804a6b60d4c2724ada9eb975e3caf2d9753beba9: https://github.com/armbian/build/commit/804a6b60d4c2724ada9eb975e3caf2d9753beba9
> X-Git-Archeology: Date: Fri, 28 Aug 2020 18:48:55 +0200
> X-Git-Archeology: From: Paolo <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: Moved rk322x-dev to rk322x-current (current now is 5.7.y) (#2153)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 661371868def63655e46e8c513d8ba0f42cf4066: https://github.com/armbian/build/commit/661371868def63655e46e8c513d8ba0f42cf4066
> X-Git-Archeology: Date: Fri, 28 Aug 2020 19:26:08 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Enable overlays for rk3399-legacy (#2144)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 4cdf3c3d0e31fb9fa05d9b818915d54c465dffa0: https://github.com/armbian/build/commit/4cdf3c3d0e31fb9fa05d9b818915d54c465dffa0
> X-Git-Archeology: Date: Sun, 18 Oct 2020 14:43:30 -0400
> X-Git-Archeology: From: tonymac32 <tonymckahan@gmail.com>
> X-Git-Archeology: Subject: [ rockchip ] add overlay compilation support
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 3b3d85e25c2ecde30df7b5274fc6f1b9c0299ea2: https://github.com/armbian/build/commit/3b3d85e25c2ecde30df7b5274fc6f1b9c0299ea2
> X-Git-Archeology: Date: Sat, 22 May 2021 17:08:44 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Upgrade EDGE to 5.12.y (#2825)
> X-Git-Archeology:
> X-Git-Archeology: - Revision e7377248b3cae186e24e2be781cd3365b43246f0: https://github.com/armbian/build/commit/e7377248b3cae186e24e2be781cd3365b43246f0
> X-Git-Archeology: Date: Thu, 22 Jul 2021 00:15:54 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Second part of EDGE bumping to 5.13.y (#3045)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 744ea89a589d62cb6f409baab60fc6664520bc39: https://github.com/armbian/build/commit/744ea89a589d62cb6f409baab60fc6664520bc39
> X-Git-Archeology: Date: Wed, 08 Sep 2021 17:51:34 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Bumping EDGE kernel to 5.14.y (#3125)
> X-Git-Archeology:
> X-Git-Archeology: - Revision f15bc37276f8a06c024628b41905a7255934e93b: https://github.com/armbian/build/commit/f15bc37276f8a06c024628b41905a7255934e93b
> X-Git-Archeology: Date: Sat, 11 Sep 2021 12:51:28 +0000
> X-Git-Archeology: From: Paolo Sabatino <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: rk322x: add back edge kernel patches lost in the process, hardware cursor dedicated plane
> X-Git-Archeology:
> X-Git-Archeology: - Revision dd51f9f2afcbc83a3e10b32eb6a5061d91d1558e: https://github.com/armbian/build/commit/dd51f9f2afcbc83a3e10b32eb6a5061d91d1558e
> X-Git-Archeology: Date: Tue, 09 Nov 2021 18:06:34 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Bump imx6, xu4, rockchip64 and jetson-nano to 5.15 (#3238)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 4c3dcbf4fcd3616999cb91a1dddfa74668eb6de9: https://github.com/armbian/build/commit/4c3dcbf4fcd3616999cb91a1dddfa74668eb6de9
> X-Git-Archeology: Date: Tue, 09 Nov 2021 21:58:35 +0100
> X-Git-Archeology: From: Paolo <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: Rockchip 5.15 (#3242)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 6b490e16944b30ff69bf9c13678905187df0d9d4: https://github.com/armbian/build/commit/6b490e16944b30ff69bf9c13678905187df0d9d4
> X-Git-Archeology: Date: Tue, 11 Jan 2022 15:26:11 +0100
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: move kernel edge to 5.16 (#3387)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 1e37959e5381a0a1d1eaf0629cdc19658f30df9a: https://github.com/armbian/build/commit/1e37959e5381a0a1d1eaf0629cdc19658f30df9a
> X-Git-Archeology: Date: Thu, 10 Feb 2022 20:32:58 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Bumping sunxi/64, xu4, rockchip and mvebu64 to 5.16.y (#3453)
> X-Git-Archeology:
> X-Git-Archeology: - Revision ac8fc4385594d59257ee9dffd9efa85e3497fa7d: https://github.com/armbian/build/commit/ac8fc4385594d59257ee9dffd9efa85e3497fa7d
> X-Git-Archeology: Date: Sat, 26 Feb 2022 07:46:44 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switch rockchip64 current to linux 5.15.y (#3489)
> X-Git-Archeology:
> X-Git-Archeology: - Revision f52a4193d02ef88333ba117c68d49486dfd7ff41: https://github.com/armbian/build/commit/f52a4193d02ef88333ba117c68d49486dfd7ff41
> X-Git-Archeology: Date: Sun, 20 Mar 2022 22:58:21 +0100
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: Adding Pine64 Quartz64a as WIP target (#3539)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2fe1ddfe451d3a3dba01e4ba1204d2b9fe7eb44e: https://github.com/armbian/build/commit/2fe1ddfe451d3a3dba01e4ba1204d2b9fe7eb44e
> X-Git-Archeology: Date: Sat, 26 Mar 2022 17:59:23 +0000
> X-Git-Archeology: From: Paolo Sabatino <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: rockchip: add tinkerboard overlays for current 5.15 kernel
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0777be9e754c8bd24cff0297226b5158564bbc96: https://github.com/armbian/build/commit/0777be9e754c8bd24cff0297226b5158564bbc96
> X-Git-Archeology: Date: Sun, 10 Apr 2022 16:45:06 +0200
> X-Git-Archeology: From: Paolo Sabatino <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: rk322x: move edge flavour to kernel 5.17, adapt patches were necessary
> X-Git-Archeology:
> X-Git-Archeology: - Revision 49b2aba89124b15a0f6b81ccf44b3792b6b35497: https://github.com/armbian/build/commit/49b2aba89124b15a0f6b81ccf44b3792b6b35497
> X-Git-Archeology: Date: Mon, 11 Apr 2022 22:05:28 +0200
> X-Git-Archeology: From: Paolo Sabatino <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: rockchip: copy patch archive from 5.16 to 5.17
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0afe24c95729044910e0b3f84dc5500bcdc6524c: https://github.com/armbian/build/commit/0afe24c95729044910e0b3f84dc5500bcdc6524c
> X-Git-Archeology: Date: Sun, 24 Apr 2022 22:33:47 +0200
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: move kernel media edge to 5.17 (#3704)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 897674aa74bce0326ed7fe06f5336bf4709a8a1f: https://github.com/armbian/build/commit/897674aa74bce0326ed7fe06f5336bf4709a8a1f
> X-Git-Archeology: Date: Tue, 03 May 2022 08:27:32 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Bump and freeze kernel at last known working versions (#3736)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 597d2dac11f00d9070a4e49d6bad1b2244e36cb3: https://github.com/armbian/build/commit/597d2dac11f00d9070a4e49d6bad1b2244e36cb3
> X-Git-Archeology: Date: Sat, 28 May 2022 07:56:22 +0200
> X-Git-Archeology: From: Jianfeng Liu <liujianfeng1994@gmail.com>
> X-Git-Archeology: Subject: update rockchip64-edge to 5.18 (#3814)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 3c4189e311ca60427d47dae796620a9fc98dc1f3: https://github.com/armbian/build/commit/3c4189e311ca60427d47dae796620a9fc98dc1f3
> X-Git-Archeology: Date: Sun, 29 May 2022 17:15:36 +0200
> X-Git-Archeology: From: Paolo <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: rockchip: upgrade edge kernel to v5.18 (#3842)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 809ce98a75163e3d37cffae811e1d19fd0758ef4: https://github.com/armbian/build/commit/809ce98a75163e3d37cffae811e1d19fd0758ef4
> X-Git-Archeology: Date: Sun, 29 May 2022 17:26:16 +0200
> X-Git-Archeology: From: Paolo <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: rk322x: move edge kernel to v5.18 (#3844)
> X-Git-Archeology:
> X-Git-Archeology: - Revision d064b2dce2a58299bff98e8ccb275fec861777e9: https://github.com/armbian/build/commit/d064b2dce2a58299bff98e8ccb275fec861777e9
> X-Git-Archeology: Date: Wed, 03 Aug 2022 19:10:25 +0200
> X-Git-Archeology: From: Paolo Sabatino <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: rk322x: advance edge kernel to 5.19
> X-Git-Archeology:
> X-Git-Archeology: - Revision 8c6641e7b79f0d50acdc306d140e586a4e923cf0: https://github.com/armbian/build/commit/8c6641e7b79f0d50acdc306d140e586a4e923cf0
> X-Git-Archeology: Date: Wed, 03 Aug 2022 22:22:55 +0200
> X-Git-Archeology: From: Jianfeng Liu <liujianfeng1994@gmail.com>
> X-Git-Archeology: Subject: update rockchip64 edge to 5.19 (#4039)
> X-Git-Archeology:
> X-Git-Archeology: - Revision c87542aba26b01703746d3db94ac0820575b23b2: https://github.com/armbian/build/commit/c87542aba26b01703746d3db94ac0820575b23b2
> X-Git-Archeology: Date: Thu, 04 Aug 2022 11:20:06 +0200
> X-Git-Archeology: From: Paolo <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: rockchip: switch edge kernel to v5.19 (#4045)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 73691a9e24440e0a8104b2c25d168ba8947a10ad: https://github.com/armbian/build/commit/73691a9e24440e0a8104b2c25d168ba8947a10ad
> X-Git-Archeology: Date: Thu, 04 Aug 2022 21:50:40 +0200
> X-Git-Archeology: From: Ricardo Pardini <ricardo@pardini.net>
> X-Git-Archeology: Subject: meson64: edge: rework to kernel 5.19 (#3941)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 6765f734cc4a22aeaa9f99a3ad28c8c322de26f6: https://github.com/armbian/build/commit/6765f734cc4a22aeaa9f99a3ad28c8c322de26f6
> X-Git-Archeology: Date: Tue, 25 Oct 2022 11:26:51 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Bump rockchip64 edge to 6.0.y (#4337)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 1b12209ded2c356df514e3dd99bd945c0afd7a32: https://github.com/armbian/build/commit/1b12209ded2c356df514e3dd99bd945c0afd7a32
> X-Git-Archeology: Date: Tue, 25 Oct 2022 20:38:31 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Bump meson64 edge to 6.0.y (#4341)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 35db7a3995d0d6e92638a0ed173e7252a927e339: https://github.com/armbian/build/commit/35db7a3995d0d6e92638a0ed173e7252a927e339
> X-Git-Archeology: Date: Tue, 15 Nov 2022 20:19:17 +0100
> X-Git-Archeology: From: Paolo <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: rk322x: bump kernel to 6.0 (#4443)
> X-Git-Archeology:
> X-Git-Archeology: - Revision ed2c6d3c6764e9da4f54cb3b210e5106864dfa0f: https://github.com/armbian/build/commit/ed2c6d3c6764e9da4f54cb3b210e5106864dfa0f
> X-Git-Archeology: Date: Tue, 15 Nov 2022 20:22:47 +0100
> X-Git-Archeology: From: Paolo <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: rockchip: advance edge kernel to v6.0 (#4445)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 5b46bd7273909a2a9688efe85c4d45d00d407865: https://github.com/armbian/build/commit/5b46bd7273909a2a9688efe85c4d45d00d407865
> X-Git-Archeology: Date: Mon, 12 Dec 2022 08:02:25 +0100
> X-Git-Archeology: From: Ricardo Pardini <ricardo@pardini.net>
> X-Git-Archeology: Subject: `meson64-6.0` kernel patches: mbox formatting, archeology to find lost authors/descriptions; rebase against 6.0.12; no actual changes (#4546)
> X-Git-Archeology:
> X-Git-Archeology: - Revision eb7d4a0bd20e56118f9c8c9089c063154c58a239: https://github.com/armbian/build/commit/eb7d4a0bd20e56118f9c8c9089c063154c58a239
> X-Git-Archeology: Date: Mon, 12 Dec 2022 08:02:49 +0100
> X-Git-Archeology: From: Ricardo Pardini <ricardo@pardini.net>
> X-Git-Archeology: Subject: `meson64`: bump `edge` to `6.1-rc8` (#4554)
> X-Git-Archeology:
> X-Git-Archeology: - Revision c0001d566b3770dae722c47180dcb942bed7006a: https://github.com/armbian/build/commit/c0001d566b3770dae722c47180dcb942bed7006a
> X-Git-Archeology: Date: Wed, 14 Dec 2022 01:43:31 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Bump bcm, imx, mvebu64 and xu4 EDGE to 6.1.y (#4560)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 92f1a22d76b987afa7ba555d5b509adc51d689e7: https://github.com/armbian/build/commit/92f1a22d76b987afa7ba555d5b509adc51d689e7
> X-Git-Archeology: Date: Fri, 16 Dec 2022 13:38:13 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Re-add rockchip64 6.0 patches (#4575)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 80dffbc7611bd76d675fcf74d352e1c55ce51f29: https://github.com/armbian/build/commit/80dffbc7611bd76d675fcf74d352e1c55ce51f29
> X-Git-Archeology: Date: Tue, 10 Jan 2023 00:31:35 +0100
> X-Git-Archeology: From: Ricardo Pardini <ricardo@pardini.net>
> X-Git-Archeology: Subject: `meson64`: `edge`: bump to `6.2` - copy patches as-is from 6.1
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0ea5a3547b393059da92da9925a76bccef93631a: https://github.com/armbian/build/commit/0ea5a3547b393059da92da9925a76bccef93631a
> X-Git-Archeology: Date: Tue, 10 Jan 2023 00:31:41 +0100
> X-Git-Archeology: From: Ricardo Pardini <ricardo@pardini.net>
> X-Git-Archeology: Subject: `meson64`: `edge`: bump to `6.2` - rebased patches against tag `v6.2-rc3`
> X-Git-Archeology:
> X-Git-Archeology: - Revision 8652bf3d37c9d9f7d87588dc1f97e82626dac489: https://github.com/armbian/build/commit/8652bf3d37c9d9f7d87588dc1f97e82626dac489
> X-Git-Archeology: Date: Sun, 12 Feb 2023 21:20:35 +0100
> X-Git-Archeology: From: Joao Assuncao <joao@joaoassuncao.com>
> X-Git-Archeology: Subject: Adds SPI, I2C, and PWM DTS overlays for odroid-m1 (#4825)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 3f704692a7933a67b5e8cc6ff690d92ef3a5e735: https://github.com/armbian/build/commit/3f704692a7933a67b5e8cc6ff690d92ef3a5e735
> X-Git-Archeology: Date: Fri, 24 Mar 2023 23:12:56 +0100
> X-Git-Archeology: From: Paolo Sabatino <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.2
> X-Git-Archeology:
> X-Git-Archeology: - Revision 5930e5e536d6b2f1a1446b8910648d7b0183919e: https://github.com/armbian/build/commit/5930e5e536d6b2f1a1446b8910648d7b0183919e
> X-Git-Archeology: Date: Fri, 24 Mar 2023 23:14:09 +0100
> X-Git-Archeology: From: Paolo Sabatino <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: rk322x: move edge kernel to 6.2
> X-Git-Archeology:
> X-Git-Archeology: - Revision 98b6aec55439c5aa8cee13898451e0969f7df9ce: https://github.com/armbian/build/commit/98b6aec55439c5aa8cee13898451e0969f7df9ce
> X-Git-Archeology: Date: Thu, 27 Apr 2023 21:30:02 +0200
> X-Git-Archeology: From: Paolo Sabatino <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: rk322x: bump edge kernel to 6.3
> X-Git-Archeology:
> X-Git-Archeology: - Revision da0ab48b7939235608c8fc042c61ae997681e865: https://github.com/armbian/build/commit/da0ab48b7939235608c8fc042c61ae997681e865
> X-Git-Archeology: Date: Thu, 27 Apr 2023 21:31:27 +0200
> X-Git-Archeology: From: Paolo Sabatino <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.3
> X-Git-Archeology:
> X-Git-Archeology: - Revision 7a5cd0b246d3f0ae5949b6afa5a59081bd2376e9: https://github.com/armbian/build/commit/7a5cd0b246d3f0ae5949b6afa5a59081bd2376e9
> X-Git-Archeology: Date: Sat, 29 Apr 2023 07:46:18 +0200
> X-Git-Archeology: From: Paolo Sabatino <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: rockchip: fix dtbs_install step for overlays
> X-Git-Archeology:
> X-Git-Archeology: - Revision 85bab47bba73e0ef0e4ea5fde60e0aab56f82906: https://github.com/armbian/build/commit/85bab47bba73e0ef0e4ea5fde60e0aab56f82906
> X-Git-Archeology: Date: Sat, 06 May 2023 12:55:10 +0200
> X-Git-Archeology: From: amazingfate <liujianfeng1994@gmail.com>
> X-Git-Archeology: Subject: bump rockchip64 edge to v6.3
> X-Git-Archeology:
> X-Git-Archeology: - Revision 906ca66430329ab774f5b9d0f62eef1ce5e398fe: https://github.com/armbian/build/commit/906ca66430329ab774f5b9d0f62eef1ce5e398fe
> X-Git-Archeology: Date: Tue, 16 May 2023 08:55:33 +0200
> X-Git-Archeology: From: Ricardo Pardini <ricardo@pardini.net>
> X-Git-Archeology: Subject: `rockchip64`/`edge`/`6.3`: rebase/rewrite patches against `v6.3.1`; do archeology for mbox-less patches; materialize overwrites
> X-Git-Archeology:
> X-Git-Archeology: - Revision eb4320f4243fb11380078623d67880bf7c9d4951: https://github.com/armbian/build/commit/eb4320f4243fb11380078623d67880bf7c9d4951
> X-Git-Archeology: Date: Sun, 21 May 2023 13:58:31 +0200
> X-Git-Archeology: From: Ricardo Pardini <ricardo@pardini.net>
> X-Git-Archeology: Subject: `odroidm1` / `rk3568-odroid`: recover overlays from 6.1; update .config; fix patch dir name
> X-Git-Archeology:
> X-Git-Archeology: - Revision 30ea65b68ec5b51cf274b92df584626b77eeb61f: https://github.com/armbian/build/commit/30ea65b68ec5b51cf274b92df584626b77eeb61f
> X-Git-Archeology: Date: Tue, 13 Jun 2023 12:33:47 +0200
> X-Git-Archeology: From: Ricardo Pardini <ricardo@pardini.net>
> X-Git-Archeology: Subject: `meson64` `edge` 6.4: rebase to 6.4-rc5; 7 are failing to apply
> X-Git-Archeology:
> X-Git-Archeology: - Revision 38d34e52698eb651866f6586ed4b9e838b76413c: https://github.com/armbian/build/commit/38d34e52698eb651866f6586ed4b9e838b76413c
> X-Git-Archeology: Date: Tue, 13 Jun 2023 12:33:47 +0200
> X-Git-Archeology: From: Ricardo Pardini <ricardo@pardini.net>
> X-Git-Archeology: Subject: `meson64` `edge` 6.4: initial copy (as-is) of 6.2 patches
> X-Git-Archeology:
---
arch/arm/boot/.gitignore | 5 ++-
scripts/Makefile.dtbinst | 20 ++++++++--
scripts/Makefile.lib | 20 ++++++++++
3 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/.gitignore b/arch/arm/boot/.gitignore
index 3c79f859..4e5c1d59 100644
index ad7a0253ea96..e064e5f27927 100644
--- a/arch/arm/boot/.gitignore
+++ b/arch/arm/boot/.gitignore
@@ -3,5 +3,6 @@ zImage
@ -13,7 +356,7 @@ index 3c79f859..4e5c1d59 100644
+*.scr
+zImage-dtb
diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
index 50d580d77..94bd15617 100644
index 1c15717e0d56..839b2bf46e30 100644
--- a/scripts/Makefile.dtbinst
+++ b/scripts/Makefile.dtbinst
@@ -28,8 +28,11 @@ ifeq ("$(dtbinst-root)", "$(obj)")
@ -53,23 +396,23 @@ index 50d580d77..94bd15617 100644
.PHONY: $(PHONY)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 58c05e5d..2b95dda9 100644
index 3fb2aaa00411..8d72db5cdc5d 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -278,6 +278,9 @@ cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \
# ---------------------------------------------------------------------------
DTC ?= $(objtree)/scripts/dtc/dtc
@@ -275,6 +275,9 @@ ifeq ($(CONFIG_ANDROID),y)
DTC_FLAGS += -@
endif
+# Overlay support
+DTC_FLAGS += -@ -Wno-unit_address_format -Wno-simple_bus_reg
+
# Disable noisy checks by default
ifeq ($(KBUILD_ENABLE_EXTRA_GCC_CHECKS),)
DTC_FLAGS += -Wno-unit_address_vs_reg \
@@ -324,6 +327,23 @@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
@@ -319,6 +322,23 @@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
$(obj)/%.dtb: $(src)/%.dts FORCE
$(call if_changed_dep,dtc)
+quiet_cmd_dtco = DTCO $@
+cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ; \
+ $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
@ -88,5 +431,8 @@ index 58c05e5d..2b95dda9 100644
+ $(call if_changed,scr)
+
dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
# cat
--
Armbian
# Bzip2

8
patch/kernel/archive/rockchip64-4.4/general-add-xtx-spi-nor-chips.patch
View File

@ -1,7 +1,7 @@
From eadba58294b8d33d3ce18876ace70fe492224811 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Piotr Szczepanik <piter75@gmail.com>
Date: Tue, 11 Aug 2020 09:33:30 +0200
Subject: [PATCH] Added xt25f32b and xt25f128b SPI NOR flashes from XTX
Subject: Added xt25f32b and xt25f128b SPI NOR flashes from XTX
These flash chips are used by Radxa in ROCK Pi 4.
Based on:
@ -14,7 +14,7 @@ Signed-off-by: Piotr Szczepanik <piter75@gmail.com>
1 file changed, 4 insertions(+)
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index 276998ea..cbef5b7f 100644
index 276998ea0267..cbef5b7f5088 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -851,6 +851,10 @@ static const struct flash_info spi_nor_ids[] = {
@ -29,5 +29,5 @@ index 276998ea..cbef5b7f 100644
};
--
2.17.1
Armbian

242
patch/kernel/archive/rockchip64-4.4/general-rockchip-overlays.patch
View File

@ -1,8 +1,213 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Ayotte <martinayotte@yahoo.ca>
Date: Wed, 5 Dec 2018 15:00:44 -0500
Subject: [ARCHEOLOGY] add overlays framework for rockchip
> X-Git-Archeology: - Revision 677cf44f4620e11ff573257551c8231eceee1d4b: https://github.com/armbian/build/commit/677cf44f4620e11ff573257551c8231eceee1d4b
> X-Git-Archeology: Date: Wed, 05 Dec 2018 15:00:44 -0500
> X-Git-Archeology: From: Martin Ayotte <martinayotte@yahoo.ca>
> X-Git-Archeology: Subject: add overlays framework for rockchip
> X-Git-Archeology:
> X-Git-Archeology: - Revision 40ab5ee22b0055e2a67a73bdcda94217d23fe2a0: https://github.com/armbian/build/commit/40ab5ee22b0055e2a67a73bdcda94217d23fe2a0
> X-Git-Archeology: Date: Fri, 07 Dec 2018 16:23:35 -0500
> X-Git-Archeology: From: Martin Ayotte <martinayotte@yahoo.ca>
> X-Git-Archeology: Subject: add W1-GPIO overlay to rockchip64
> X-Git-Archeology:
> X-Git-Archeology: - Revision 5a7e35d59d385c4adb5c4bfd605211e59e72939e: https://github.com/armbian/build/commit/5a7e35d59d385c4adb5c4bfd605211e59e72939e
> X-Git-Archeology: Date: Tue, 05 Mar 2019 20:19:58 -0500
> X-Git-Archeology: From: Martin Ayotte <martinayotte@yahoo.ca>
> X-Git-Archeology: Subject: add rockchip-spi-spidev overlay
> X-Git-Archeology:
> X-Git-Archeology: - Revision 4722859bc1da10dc59f38615ef1683f9334412ac: https://github.com/armbian/build/commit/4722859bc1da10dc59f38615ef1683f9334412ac
> X-Git-Archeology: Date: Tue, 05 Mar 2019 20:28:25 -0500
> X-Git-Archeology: From: Martin Ayotte <martinayotte@yahoo.ca>
> X-Git-Archeology: Subject: fix spi-spidev pins in README
> X-Git-Archeology:
> X-Git-Archeology: - Revision e4e34c7f15b33a3a186033a0c40555c208f035ee: https://github.com/armbian/build/commit/e4e34c7f15b33a3a186033a0c40555c208f035ee
> X-Git-Archeology: Date: Wed, 06 Mar 2019 17:34:59 -0500
> X-Git-Archeology: From: Martin Ayotte <martinayotte@yahoo.ca>
> X-Git-Archeology: Subject: add param_w1_pin management to rockchip-fixup.scr
> X-Git-Archeology:
> X-Git-Archeology: - Revision 85285a492e203c26cf0704ac8c08dbf7e59127df: https://github.com/armbian/build/commit/85285a492e203c26cf0704ac8c08dbf7e59127df
> X-Git-Archeology: Date: Sun, 10 Mar 2019 09:27:53 -0400
> X-Git-Archeology: From: Martin Ayotte <martinayotte@yahoo.ca>
> X-Git-Archeology: Subject: add I2C7 overlay
> X-Git-Archeology:
> X-Git-Archeology: - Revision eda653ae254c43b548889157171ce0873c918426: https://github.com/armbian/build/commit/eda653ae254c43b548889157171ce0873c918426
> X-Git-Archeology: Date: Sun, 10 Mar 2019 11:38:07 -0400
> X-Git-Archeology: From: Martin Ayotte <martinayotte@yahoo.ca>
> X-Git-Archeology: Subject: fix typo in README overlays
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2e3a338d481b1637b7ff55d52e43612791e6d23a: https://github.com/armbian/build/commit/2e3a338d481b1637b7ff55d52e43612791e6d23a
> X-Git-Archeology: Date: Thu, 20 Jun 2019 10:11:25 -0400
> X-Git-Archeology: From: Martin Ayotte <martinayotte@yahoo.ca>
> X-Git-Archeology: Subject: fix SPIs registers in overlays
> X-Git-Archeology:
> X-Git-Archeology: - Revision 5ae502fa0af30f1edc089c76ecc698887acc8c5e: https://github.com/armbian/build/commit/5ae502fa0af30f1edc089c76ecc698887acc8c5e
> X-Git-Archeology: Date: Sun, 21 Jul 2019 13:24:42 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piotr.szczepanik@allegro.pl>
> X-Git-Archeology: Subject: [rockchip64-dev] UART4 activating overlay
> X-Git-Archeology:
> X-Git-Archeology: - Revision 6dceae89ce35a4f7145003ddbcc9a53ed8999ff8: https://github.com/armbian/build/commit/6dceae89ce35a4f7145003ddbcc9a53ed8999ff8
> X-Git-Archeology: Date: Mon, 22 Jul 2019 10:08:41 -0400
> X-Git-Archeology: From: Martin Ayotte <martinayotte@yahoo.ca>
> X-Git-Archeology: Subject: swap fragments order in UART4 overlay
> X-Git-Archeology:
> X-Git-Archeology: - Revision f0d3670ff9a2bc148ee4f7762c3ea7a6da04860d: https://github.com/armbian/build/commit/f0d3670ff9a2bc148ee4f7762c3ea7a6da04860d
> X-Git-Archeology: Date: Tue, 23 Jul 2019 12:31:18 -0400
> X-Git-Archeology: From: Martin Ayotte <martinayotte@yahoo.ca>
> X-Git-Archeology: Subject: fix typo in UART4 overlay
> X-Git-Archeology:
> X-Git-Archeology: - Revision fadde96f2b0a0221b9e7abe7efe7f94377f3e651: https://github.com/armbian/build/commit/fadde96f2b0a0221b9e7abe7efe7f94377f3e651
> X-Git-Archeology: Date: Wed, 24 Jul 2019 17:41:52 -0400
> X-Git-Archeology: From: Martin Ayotte <martinayotte@yahoo.ca>
> X-Git-Archeology: Subject: fix SPIDEV overlay and add SPI-JEDEC-NOR overlay
> X-Git-Archeology:
> X-Git-Archeology: - Revision 776a5e7eb265d0fb62f2dec2ae99b684a11db5ea: https://github.com/armbian/build/commit/776a5e7eb265d0fb62f2dec2ae99b684a11db5ea
> X-Git-Archeology: Date: Wed, 24 Jul 2019 17:43:52 -0400
> X-Git-Archeology: From: Martin Ayotte <martinayotte@yahoo.ca>
> X-Git-Archeology: Subject: fix SPI default spi-max-frequency
> X-Git-Archeology:
> X-Git-Archeology: - Revision b3bb9345439250d8247f0e24a8e1ef6290b2c279: https://github.com/armbian/build/commit/b3bb9345439250d8247f0e24a8e1ef6290b2c279
> X-Git-Archeology: Date: Mon, 18 Nov 2019 18:23:10 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Rock Pi 4 enable PCIe in device tree for "dev" target (#1624)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 150ac0c2afa147d9e3b036c8ecd8238fe5648cf3: https://github.com/armbian/build/commit/150ac0c2afa147d9e3b036c8ecd8238fe5648cf3
> X-Git-Archeology: Date: Tue, 19 Nov 2019 23:25:39 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Remove K<4, change branches, new features (#1586)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 812245def37a695bce9e7ece148b2920d82c8b37: https://github.com/armbian/build/commit/812245def37a695bce9e7ece148b2920d82c8b37
> X-Git-Archeology: Date: Sat, 18 Jul 2020 23:07:01 +0200
> X-Git-Archeology: From: Werner <EvilOlaf@users.noreply.github.com>
> X-Git-Archeology: Subject: Move rockchip/64 current to 5.7.y (#2099)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 661371868def63655e46e8c513d8ba0f42cf4066: https://github.com/armbian/build/commit/661371868def63655e46e8c513d8ba0f42cf4066
> X-Git-Archeology: Date: Fri, 28 Aug 2020 19:26:08 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Enable overlays for rk3399-legacy (#2144)
> X-Git-Archeology:
> X-Git-Archeology: - Revision e36ce875b025e112127cf8cc2d34825ebfe36569: https://github.com/armbian/build/commit/e36ce875b025e112127cf8cc2d34825ebfe36569
> X-Git-Archeology: Date: Tue, 10 Nov 2020 21:43:13 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switched rockchip64-current to linux 5.9.y (#2309)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
> X-Git-Archeology: - Revision e7377248b3cae186e24e2be781cd3365b43246f0: https://github.com/armbian/build/commit/e7377248b3cae186e24e2be781cd3365b43246f0
> X-Git-Archeology: Date: Thu, 22 Jul 2021 00:15:54 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Second part of EDGE bumping to 5.13.y (#3045)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 744ea89a589d62cb6f409baab60fc6664520bc39: https://github.com/armbian/build/commit/744ea89a589d62cb6f409baab60fc6664520bc39
> X-Git-Archeology: Date: Wed, 08 Sep 2021 17:51:34 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Bumping EDGE kernel to 5.14.y (#3125)
> X-Git-Archeology:
> X-Git-Archeology: - Revision dd51f9f2afcbc83a3e10b32eb6a5061d91d1558e: https://github.com/armbian/build/commit/dd51f9f2afcbc83a3e10b32eb6a5061d91d1558e
> X-Git-Archeology: Date: Tue, 09 Nov 2021 18:06:34 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Bump imx6, xu4, rockchip64 and jetson-nano to 5.15 (#3238)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 6b490e16944b30ff69bf9c13678905187df0d9d4: https://github.com/armbian/build/commit/6b490e16944b30ff69bf9c13678905187df0d9d4
> X-Git-Archeology: Date: Tue, 11 Jan 2022 15:26:11 +0100
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: move kernel edge to 5.16 (#3387)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 27771d0e8a7f512dbcf10cbca8e88eedd47d1b55: https://github.com/armbian/build/commit/27771d0e8a7f512dbcf10cbca8e88eedd47d1b55
> X-Git-Archeology: Date: Thu, 17 Feb 2022 22:06:54 +0100
> X-Git-Archeology: From: Leif <akhepcat@users.noreply.github.com>
> X-Git-Archeology: Subject: Remove incorrectly duplicated GPIO pins from I2C7, name I2C7/I2C8 bus, from README.rockchip-overlays (#3495)
> X-Git-Archeology:
> X-Git-Archeology: - Revision ac8fc4385594d59257ee9dffd9efa85e3497fa7d: https://github.com/armbian/build/commit/ac8fc4385594d59257ee9dffd9efa85e3497fa7d
> X-Git-Archeology: Date: Sat, 26 Feb 2022 07:46:44 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switch rockchip64 current to linux 5.15.y (#3489)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 897674aa74bce0326ed7fe06f5336bf4709a8a1f: https://github.com/armbian/build/commit/897674aa74bce0326ed7fe06f5336bf4709a8a1f
> X-Git-Archeology: Date: Tue, 03 May 2022 08:27:32 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Bump and freeze kernel at last known working versions (#3736)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 597d2dac11f00d9070a4e49d6bad1b2244e36cb3: https://github.com/armbian/build/commit/597d2dac11f00d9070a4e49d6bad1b2244e36cb3
> X-Git-Archeology: Date: Sat, 28 May 2022 07:56:22 +0200
> X-Git-Archeology: From: Jianfeng Liu <liujianfeng1994@gmail.com>
> X-Git-Archeology: Subject: update rockchip64-edge to 5.18 (#3814)
> X-Git-Archeology:
> X-Git-Archeology: - Revision e7bd9b8f13af9ee054f44a422b2aca19746b9244: https://github.com/armbian/build/commit/e7bd9b8f13af9ee054f44a422b2aca19746b9244
> X-Git-Archeology: Date: Sat, 28 May 2022 08:56:19 +0200
> X-Git-Archeology: From: Tony <tonymckahan@gmail.com>
> X-Git-Archeology: Subject: Add Spidev workarounds and clean patches (WIP) (#3812)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 8c6641e7b79f0d50acdc306d140e586a4e923cf0: https://github.com/armbian/build/commit/8c6641e7b79f0d50acdc306d140e586a4e923cf0
> X-Git-Archeology: Date: Wed, 03 Aug 2022 22:22:55 +0200
> X-Git-Archeology: From: Jianfeng Liu <liujianfeng1994@gmail.com>
> X-Git-Archeology: Subject: update rockchip64 edge to 5.19 (#4039)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 6765f734cc4a22aeaa9f99a3ad28c8c322de26f6: https://github.com/armbian/build/commit/6765f734cc4a22aeaa9f99a3ad28c8c322de26f6
> X-Git-Archeology: Date: Tue, 25 Oct 2022 11:26:51 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Bump rockchip64 edge to 6.0.y (#4337)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 834fab09d0ca6fd6aa353b294011b8ca9dc00c1c: https://github.com/armbian/build/commit/834fab09d0ca6fd6aa353b294011b8ca9dc00c1c
> X-Git-Archeology: Date: Wed, 16 Nov 2022 18:39:47 +0100
> X-Git-Archeology: From: Ricardo Pardini <ricardo@pardini.net>
> X-Git-Archeology: Subject: `armbian,spi-dev` hacks also for rockchip64-5.18, .19, and 6.0.y (#4450)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 92f1a22d76b987afa7ba555d5b509adc51d689e7: https://github.com/armbian/build/commit/92f1a22d76b987afa7ba555d5b509adc51d689e7
> X-Git-Archeology: Date: Fri, 16 Dec 2022 13:38:13 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Re-add rockchip64 6.0 patches (#4575)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 85bab47bba73e0ef0e4ea5fde60e0aab56f82906: https://github.com/armbian/build/commit/85bab47bba73e0ef0e4ea5fde60e0aab56f82906
> X-Git-Archeology: Date: Sat, 06 May 2023 12:55:10 +0200
> X-Git-Archeology: From: amazingfate <liujianfeng1994@gmail.com>
> X-Git-Archeology: Subject: bump rockchip64 edge to v6.3
> X-Git-Archeology:
> X-Git-Archeology: - Revision 906ca66430329ab774f5b9d0f62eef1ce5e398fe: https://github.com/armbian/build/commit/906ca66430329ab774f5b9d0f62eef1ce5e398fe
> X-Git-Archeology: Date: Tue, 16 May 2023 08:55:33 +0200
> X-Git-Archeology: From: Ricardo Pardini <ricardo@pardini.net>
> X-Git-Archeology: Subject: `rockchip64`/`edge`/`6.3`: rebase/rewrite patches against `v6.3.1`; do archeology for mbox-less patches; materialize overwrites
> X-Git-Archeology:
> X-Git-Archeology: - Revision 1cdab8b1cfbf98c853c7bbf760d5aff280baf794: https://github.com/armbian/build/commit/1cdab8b1cfbf98c853c7bbf760d5aff280baf794
> X-Git-Archeology: Date: Wed, 24 May 2023 19:21:31 +0200
> X-Git-Archeology: From: Ricardo Pardini <ricardo@pardini.net>
> X-Git-Archeology: Subject: `rockchip64`/`edge` 6.3.y: rebase against `v6.3.3`, do archeology for missing mbox'es
> X-Git-Archeology:
> X-Git-Archeology: - Revision 716d3ae221824e87b6a2abb8dcf9f6e6aa3c63c9: https://github.com/armbian/build/commit/716d3ae221824e87b6a2abb8dcf9f6e6aa3c63c9
> X-Git-Archeology: Date: Tue, 13 Jun 2023 12:33:59 +0200
> X-Git-Archeology: From: Ricardo Pardini <ricardo@pardini.net>
> X-Git-Archeology: Subject: `rockchip64` `edge` 6.3: drop overlay patches in favor of bare overlays in specific folder
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0646a15647489f8c188cf5e15dce7d2bc0456120: https://github.com/armbian/build/commit/0646a15647489f8c188cf5e15dce7d2bc0456120
> X-Git-Archeology: Date: Tue, 13 Jun 2023 12:33:59 +0200
> X-Git-Archeology: From: Ricardo Pardini <ricardo@pardini.net>
> X-Git-Archeology: Subject: `rockchip64` `edge` 6.3: rebase v6.3.6 + drop DT Makefile patches
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/Makefile | 2 +-
arch/arm64/boot/dts/rockchip/overlay/Makefile | 22 ++
arch/arm64/boot/dts/rockchip/overlay/README.rockchip-overlays | 106 ++++++++++
arch/arm64/boot/dts/rockchip/overlay/rockchip-fixup.scr-cmd | 62 ++++++
arch/arm64/boot/dts/rockchip/overlay/rockchip-i2c7.dts | 11 +
arch/arm64/boot/dts/rockchip/overlay/rockchip-i2c8.dts | 11 +
arch/arm64/boot/dts/rockchip/overlay/rockchip-pcie-gen2.dts | 12 ++
arch/arm64/boot/dts/rockchip/overlay/rockchip-spi-jedec-nor.dts | 72 +++++++
arch/arm64/boot/dts/rockchip/overlay/rockchip-spi-spidev.dts | 72 +++++++
arch/arm64/boot/dts/rockchip/overlay/rockchip-uart4.dts | 20 ++
arch/arm64/boot/dts/rockchip/overlay/rockchip-w1-gpio.dts | 20 ++
scripts/Makefile.lib | 3 +
12 files changed, 412 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index 6a33eff..60fc91a 100644
index 014b8c2701b7..f899bbbe4575 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -115,5 +118,5 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-evb-v11-linux.dtb
@@ -120,5 +120,5 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-evb-v11-linux.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-npu-evb-v10.dtb
always := $(dtb-y)
@ -10,7 +215,8 @@ index 6a33eff..60fc91a 100644
+subdir-y := $(dts-dirs) overlay
clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/rockchip/overlay/Makefile b/arch/arm64/boot/dts/rockchip/overlay/Makefile
index e69de29..576e190 100644
new file mode 100644
index 000000000000..c5f52da3ab08
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlay/Makefile
@@ -0,0 +1,22 @@
@ -37,7 +243,8 @@ index e69de29..576e190 100644
+
+
diff --git a/arch/arm64/boot/dts/rockchip/overlay/README.rockchip-overlays b/arch/arm64/boot/dts/rockchip/overlay/README.rockchip-overlays
index e69de29..9512445 100644
new file mode 100644
index 000000000000..3da852a20d27
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlay/README.rockchip-overlays
@@ -0,0 +1,106 @@
@ -149,7 +356,7 @@ index e69de29..9512445 100644
+
diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-fixup.scr-cmd b/arch/arm64/boot/dts/rockchip/overlay/rockchip-fixup.scr-cmd
new file mode 100644
index 0000000..d4c39e2
index 000000000000..8e3d468f4d4b
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-fixup.scr-cmd
@@ -0,0 +1,62 @@
@ -217,7 +424,7 @@ index 0000000..d4c39e2
+
diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-i2c7.dts b/arch/arm64/boot/dts/rockchip/overlay/rockchip-i2c7.dts
new file mode 100644
index 0000000..54bc844
index 000000000000..f8c601550588
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-i2c7.dts
@@ -0,0 +1,11 @@
@ -234,7 +441,7 @@ index 0000000..54bc844
+};
diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-i2c8.dts b/arch/arm64/boot/dts/rockchip/overlay/rockchip-i2c8.dts
new file mode 100644
index 0000000..54bc844
index 000000000000..54bc8449eafd
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-i2c8.dts
@@ -0,0 +1,11 @@
@ -251,7 +458,7 @@ index 0000000..54bc844
+};
diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-pcie-gen2.dts b/arch/arm64/boot/dts/rockchip/overlay/rockchip-pcie-gen2.dts
new file mode 100644
index 0000000..54bc844
index 000000000000..e8a51dca8f67
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-pcie-gen2.dts
@@ -0,0 +1,12 @@
@ -269,7 +476,7 @@ index 0000000..54bc844
+};
diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-spi-jedec-nor.dts b/arch/arm64/boot/dts/rockchip/overlay/rockchip-spi-jedec-nor.dts
new file mode 100644
index 0000000..3a2be38
index 000000000000..c4b1f36f9b09
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-spi-jedec-nor.dts
@@ -0,0 +1,72 @@
@ -347,7 +554,7 @@ index 0000000..3a2be38
+};
diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-spi-spidev.dts b/arch/arm64/boot/dts/rockchip/overlay/rockchip-spi-spidev.dts
new file mode 100644
index 0000000..fe8fb14
index 000000000000..18e1423637cd
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-spi-spidev.dts
@@ -0,0 +1,72 @@
@ -425,7 +632,7 @@ index 0000000..fe8fb14
+};
diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-uart4.dts b/arch/arm64/boot/dts/rockchip/overlay/rockchip-uart4.dts
new file mode 100644
index 0000000..fe8fb14
index 000000000000..305304ebcbf1
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-uart4.dts
@@ -0,0 +1,20 @@
@ -451,7 +658,7 @@ index 0000000..fe8fb14
+};
diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-w1-gpio.dts b/arch/arm64/boot/dts/rockchip/overlay/rockchip-w1-gpio.dts
new file mode 100644
index 0000000..bfbc16a
index 000000000000..bfbc16adcc9d
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-w1-gpio.dts
@@ -0,0 +1,20 @@
@ -476,12 +683,12 @@ index 0000000..bfbc16a
+ };
+};
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 26e6af4..65b9435 100644
index 8d72db5cdc5d..c775c207c770 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -65,6 +65,9 @@ real-objs-m := $(foreach m, $(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y)
extra-y += $(dtb-y)
extra-$(CONFIG_OF_ALL_DTBS) += $(dtb-)
@@ -69,6 +69,9 @@ obj-dirs := $(dir $(multi-objs) $(obj-y))
real-objs-y := $(foreach m, $(filter-out $(subdir-obj-y), $(obj-y)), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))),$($(m:.o=-objs)) $($(m:.o=-y)),$(m))) $(extra-y)
real-objs-m := $(foreach m, $(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))),$($(m:.o=-objs)) $($(m:.o=-y)),$(m)))
+# Overlay targets
+extra-y += $(dtbo-y) $(scr-y) $(dtbotxt-y)
@ -489,3 +696,6 @@ index 26e6af4..65b9435 100644
# Add subdir path
extra-y := $(addprefix $(obj)/,$(extra-y))
--
Armbian

32
patch/kernel/archive/rockchip64-4.4/general_r8152-3_support_firmware_0x6010.patch
View File

@ -1,8 +1,33 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Thomas McKahan <tonymckahan@gmail.com>
Date: Sun, 17 Feb 2019 16:02:14 -0500
Subject: [ARCHEOLOGY] [ Rockchip64 ] patch r8152 driver to recognize 0x6010
devices
> X-Git-Archeology: - Revision 70f931c4b3bc57c43845f3e3f910da343ed61162: https://github.com/armbian/build/commit/70f931c4b3bc57c43845f3e3f910da343ed61162
> X-Git-Archeology: Date: Sun, 17 Feb 2019 16:02:14 -0500
> X-Git-Archeology: From: Thomas McKahan <tonymckahan@gmail.com>
> X-Git-Archeology: Subject: [ Rockchip64 ] patch r8152 driver to recognize 0x6010 devices
> X-Git-Archeology:
> X-Git-Archeology: - Revision 150ac0c2afa147d9e3b036c8ecd8238fe5648cf3: https://github.com/armbian/build/commit/150ac0c2afa147d9e3b036c8ecd8238fe5648cf3
> X-Git-Archeology: Date: Tue, 19 Nov 2019 23:25:39 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Remove K<4, change branches, new features (#1586)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
drivers/net/usb/r8152.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 2d836893..d1fcd48b 100644
index 10dd307593e8..db8b0510809b 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -4157,6 +4157,7 @@ static void r8152b_get_version(struct r8152 *tp)
@@ -4160,6 +4160,7 @@ static void r8152b_get_version(struct r8152 *tp)
tp->mii.supports_gmii = 1;
break;
case 0x5c30:
@ -10,3 +35,6 @@ index 2d836893..d1fcd48b 100644
tp->version = RTL_VER_06;
tp->mii.supports_gmii = 1;
break;
--
Armbian

89
patch/kernel/archive/rockchip64-4.4/media-usb-dvb-dib0700.patch
View File

@ -1,6 +1,36 @@
--- a/drivers/media/usb/dvb-usb/dib0700_devices.c 2019-10-09 03:04:06.615412788 +0200
+++ b/drivers/media/usb/dvb-usb/dib0700_devices.c 2019-10-09 03:05:04.005761125 +0200
@@ -519,7 +519,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wrong-Code <47647430+Wrong-Code@users.noreply.github.com>
Date: Sun, 13 Oct 2019 12:41:28 +0200
Subject: [ARCHEOLOGY] Restored the inclusion of the DVB-USB dib0700 driver for
linux-rockchip64-default (#1593)
> X-Git-Archeology: > recovered message: > * UPSTREAM: media: rc: rename RC_TYPE_* to RC_PROTO_* and RC_BIT_* to RC_PROTO_BIT_*
> X-Git-Archeology: > recovered message: > Realigned the source code to the RC_TYPE* / RC_BIT_* refactoring
> X-Git-Archeology: > recovered message: > * Restored the inclusion of the DVB-USB dib0700 driver
> X-Git-Archeology: - Revision 7d0ad244ab0cb153b438cc62bcf981ecd4b105ad: https://github.com/armbian/build/commit/7d0ad244ab0cb153b438cc62bcf981ecd4b105ad
> X-Git-Archeology: Date: Sun, 13 Oct 2019 12:41:28 +0200
> X-Git-Archeology: From: Wrong-Code <47647430+Wrong-Code@users.noreply.github.com>
> X-Git-Archeology: Subject: Restored the inclusion of the DVB-USB dib0700 driver for linux-rockchip64-default (#1593)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 150ac0c2afa147d9e3b036c8ecd8238fe5648cf3: https://github.com/armbian/build/commit/150ac0c2afa147d9e3b036c8ecd8238fe5648cf3
> X-Git-Archeology: Date: Tue, 19 Nov 2019 23:25:39 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Remove K<4, change branches, new features (#1586)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
drivers/media/usb/dvb-usb/dib0700_devices.c | 146 +++++-----
1 file changed, 73 insertions(+), 73 deletions(-)
diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c
index e1316c7b7c2e..980bfcdebed9 100644
--- a/drivers/media/usb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/usb/dvb-usb/dib0700_devices.c
@@ -519,7 +519,7 @@ static u8 rc_request[] = { REQUEST_POLL_RC, 0 };
static int dib0700_rc_query_old_firmware(struct dvb_usb_device *d)
{
u8 key[4];
@ -9,7 +39,7 @@
u32 scancode;
u8 toggle;
int i;
@@ -548,7 +548,7 @@
@@ -548,7 +548,7 @@ static int dib0700_rc_query_old_firmware(struct dvb_usb_device *d)
dib0700_rc_setup(d, NULL); /* reset ir sensor data to prevent false events */
switch (d->props.rc.core.protocol) {
@ -18,7 +48,7 @@
/* NEC protocol sends repeat code as 0 0 0 FF */
if ((key[3-2] == 0x00) && (key[3-3] == 0x00) &&
(key[3] == 0xff)) {
@@ -556,14 +556,14 @@
@@ -556,14 +556,14 @@ static int dib0700_rc_query_old_firmware(struct dvb_usb_device *d)
return 0;
}
@ -35,7 +65,7 @@
scancode = RC_SCANCODE_RC5(key[3-2], key[3-3]);
toggle = key[3-1];
break;
@@ -3887,9 +3887,9 @@
@@ -3895,9 +3895,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_interval = DEFAULT_RC_INTERVAL,
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.rc_query = dib0700_rc_query_old_firmware,
@ -48,7 +78,7 @@
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -3927,9 +3927,9 @@
@@ -3935,9 +3935,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_interval = DEFAULT_RC_INTERVAL,
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.rc_query = dib0700_rc_query_old_firmware,
@ -61,7 +91,7 @@
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -3992,9 +3992,9 @@
@@ -4000,9 +4000,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_interval = DEFAULT_RC_INTERVAL,
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.rc_query = dib0700_rc_query_old_firmware,
@ -74,7 +104,7 @@
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4037,9 +4037,9 @@
@@ -4045,9 +4045,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
@ -87,7 +117,7 @@
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4118,9 +4118,9 @@
@@ -4126,9 +4126,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
@ -100,7 +130,7 @@
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4163,9 +4163,9 @@
@@ -4171,9 +4171,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
@ -113,7 +143,7 @@
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4220,9 +4220,9 @@
@@ -4228,9 +4228,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
@ -126,7 +156,7 @@
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4286,9 +4286,9 @@
@@ -4294,9 +4294,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
@ -139,7 +169,7 @@
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4335,9 +4335,9 @@
@@ -4343,9 +4343,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_NEC_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
@ -152,7 +182,7 @@
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4404,9 +4404,9 @@
@@ -4412,9 +4412,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
@ -165,7 +195,7 @@
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4440,9 +4440,9 @@
@@ -4448,9 +4448,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
@ -178,7 +208,7 @@
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4516,9 +4516,9 @@
@@ -4524,9 +4524,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
@ -191,7 +221,7 @@
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4560,9 +4560,9 @@
@@ -4568,9 +4568,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_NEC_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
@ -204,7 +234,7 @@
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4609,9 +4609,9 @@
@@ -4617,9 +4617,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
@ -217,7 +247,7 @@
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4646,9 +4646,9 @@
@@ -4654,9 +4654,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
@ -230,7 +260,7 @@
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4683,9 +4683,9 @@
@@ -4691,9 +4691,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
@ -243,7 +273,7 @@
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4720,9 +4720,9 @@
@@ -4728,9 +4728,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
@ -256,7 +286,7 @@
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4757,9 +4757,9 @@
@@ -4765,9 +4765,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
@ -269,7 +299,7 @@
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4794,9 +4794,9 @@
@@ -4802,9 +4802,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
@ -282,7 +312,7 @@
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4845,9 +4845,9 @@
@@ -4853,9 +4853,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
@ -295,7 +325,7 @@
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4880,9 +4880,9 @@
@@ -4888,9 +4888,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
@ -308,7 +338,7 @@
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4917,9 +4917,9 @@
@@ -4925,9 +4925,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
@ -321,7 +351,7 @@
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4955,9 +4955,9 @@
@@ -4963,9 +4963,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
@ -334,3 +364,6 @@
.change_protocol = dib0700_change_protocol,
},
},
--
Armbian

327
patch/kernel/archive/rockchip64-4.4/patch-4.4.202-203.patch
View File

@ -1,3 +1,221 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Fri, 3 Jan 2020 11:37:00 +0100
Subject: [ARCHEOLOGY] Move rockchip64 legacy to most recent kernel. Tested
with standard https://github.com/armbian/autotests stress test on RockPro64
and Rock64.
> X-Git-Archeology: - Revision 42ecf1582f83241e18ce329193c5eac66fd244de: https://github.com/armbian/build/commit/42ecf1582f83241e18ce329193c5eac66fd244de
> X-Git-Archeology: Date: Fri, 03 Jan 2020 11:37:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Move rockchip64 legacy to most recent kernel. Tested with standard https://github.com/armbian/autotests stress test on RockPro64 and Rock64.
> X-Git-Archeology:
> X-Git-Archeology: - Revision 5597ecfe073a70e11a3d832ca210471217706a0f: https://github.com/armbian/build/commit/5597ecfe073a70e11a3d832ca210471217706a0f
> X-Git-Archeology: Date: Fri, 03 Jan 2020 11:42:56 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move rockchip64 legacy to most recent kernel. Tested with standard https://github.com/armbian/autotests stress test on RockPro64 and Rock64. (#1714)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 17bb3b5075613e344faedc4093eee5ea145f1b2e: https://github.com/armbian/build/commit/17bb3b5075613e344faedc4093eee5ea145f1b2e
> X-Git-Archeology: Date: Sat, 04 Jan 2020 21:07:25 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Update RK3399 legacy to latest upstream kernel version (#1718)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
Documentation/misc-devices/mei/mei-amt-version.c | 2 +-
Makefile | 2 +-
arch/arm/boot/compressed/libfdt_env.h | 2 +
arch/arm/boot/dts/am335x-evm.dts | 12 +-
arch/arm/boot/dts/at91sam9g45.dtsi | 2 +-
arch/arm/boot/dts/exynos5250-snow-rev5.dts | 11 +
arch/arm/boot/dts/omap3-gta04.dtsi | 21 +-
arch/arm/boot/dts/pxa27x.dtsi | 2 +-
arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts | 2 +-
arch/arm/boot/dts/ste-dbx5x0.dtsi | 6 +-
arch/arm/boot/dts/ste-href-family-pinctrl.dtsi | 8 +-
arch/arm/boot/dts/ste-hrefprev60.dtsi | 2 +-
arch/arm/boot/dts/ste-snowball.dts | 2 +-
arch/arm/boot/dts/ste-u300.dts | 2 +-
arch/arm/boot/dts/tegra30-apalis.dtsi | 6 +-
arch/arm/boot/dts/tegra30.dtsi | 6 +-
arch/arm/kernel/entry-common.S | 9 +-
arch/arm/mach-imx/pm-imx6.c | 25 +
arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi | 4 +-
arch/arm64/lib/clear_user.S | 2 +
arch/arm64/lib/copy_from_user.S | 2 +
arch/arm64/lib/copy_in_user.S | 2 +
arch/arm64/lib/copy_to_user.S | 2 +
arch/mips/bcm47xx/workarounds.c | 8 +-
arch/mips/include/asm/kexec.h | 6 +-
arch/mips/txx9/generic/setup.c | 5 +-
arch/powerpc/boot/libfdt_env.h | 2 +
arch/powerpc/kernel/iommu.c | 2 +-
arch/powerpc/kernel/rtas.c | 2 +
arch/powerpc/kernel/vdso32/datapage.S | 1 +
arch/powerpc/kernel/vdso32/gettimeofday.S | 1 +
arch/powerpc/kernel/vdso64/datapage.S | 1 +
arch/powerpc/kernel/vdso64/gettimeofday.S | 1 +
arch/powerpc/kvm/book3s.c | 3 +
arch/powerpc/mm/slb.c | 2 +-
arch/powerpc/platforms/pseries/dtl.c | 4 +-
arch/x86/Kconfig | 3 +-
arch/x86/include/asm/atomic.h | 8 +-
arch/x86/include/asm/atomic64_64.h | 8 +-
arch/x86/include/asm/barrier.h | 4 +-
arch/x86/include/asm/insn.h | 18 +
arch/x86/include/asm/kexec.h | 2 +-
arch/x86/kernel/cpu/cyrix.c | 2 +-
arch/x86/kernel/kprobes/core.c | 4 +
arch/x86/kernel/uprobes.c | 6 +-
drivers/acpi/osl.c | 1 +
drivers/acpi/pci_root.c | 5 +-
drivers/acpi/sbshc.c | 2 +
drivers/ata/libata-scsi.c | 21 +
drivers/ata/pata_ep93xx.c | 8 +-
drivers/crypto/mxs-dcp.c | 80 +-
drivers/dma/dma-jz4780.c | 2 +-
drivers/dma/ioat/init.c | 7 +-
drivers/dma/timb_dma.c | 2 +-
drivers/gpio/gpio-syscon.c | 2 +-
drivers/hwmon/pwm-fan.c | 8 +-
drivers/iio/dac/mcp4922.c | 11 +-
drivers/infiniband/hw/mthca/mthca_main.c | 3 +-
drivers/input/ff-memless.c | 9 +
drivers/input/touchscreen/st1232.c | 1 +
drivers/md/bcache/super.c | 1 +
drivers/media/pci/ivtv/ivtv-yuv.c | 2 +-
drivers/media/pci/meye/meye.c | 2 +-
drivers/media/platform/davinci/isif.c | 3 +-
drivers/media/platform/davinci/vpbe_display.c | 2 +-
drivers/media/usb/cx231xx/cx231xx-video.c | 2 +-
drivers/misc/genwqe/card_utils.c | 13 +-
drivers/misc/kgdbts.c | 16 +-
drivers/mmc/host/sdhci-of-at91.c | 2 +-
drivers/mtd/maps/physmap_of.c | 27 +-
drivers/mtd/nand/sh_flctl.c | 4 +-
drivers/net/can/slcan.c | 1 +
drivers/net/ethernet/amd/am79c961a.c | 2 +-
drivers/net/ethernet/amd/atarilance.c | 6 +-
drivers/net/ethernet/amd/declance.c | 2 +-
drivers/net/ethernet/amd/sun3lance.c | 6 +-
drivers/net/ethernet/amd/sunlance.c | 2 +-
drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 4 +-
drivers/net/ethernet/broadcom/bcm63xx_enet.c | 5 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 10 +
drivers/net/ethernet/broadcom/sb1250-mac.c | 4 +-
drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c | 4 +-
drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h | 2 +-
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 2 +-
drivers/net/ethernet/intel/i40e/i40e_main.c | 8 +
drivers/net/ethernet/intel/i40e/i40e_ptp.c | 3 +-
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 10 +
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 10 +-
drivers/net/ethernet/micrel/ks8695net.c | 2 +-
drivers/net/ethernet/micrel/ks8851_mll.c | 4 +-
drivers/net/ethernet/smsc/smc911x.c | 3 +-
drivers/net/ethernet/smsc/smc91x.c | 3 +-
drivers/net/ethernet/smsc/smsc911x.c | 3 +-
drivers/net/ethernet/toshiba/ps3_gelic_net.c | 4 +-
drivers/net/ethernet/toshiba/ps3_gelic_net.h | 2 +-
drivers/net/ethernet/toshiba/spider_net.c | 4 +-
drivers/net/ethernet/toshiba/tc35815.c | 6 +-
drivers/net/ethernet/xilinx/ll_temac_main.c | 3 +-
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 3 +-
drivers/net/ethernet/xilinx/xilinx_emaclite.c | 9 +-
drivers/net/slip/slip.c | 1 +
drivers/net/usb/ax88172a.c | 2 +-
drivers/net/usb/cdc_ncm.c | 2 +-
drivers/net/usb/lan78xx.c | 5 +
drivers/net/wireless/ath/ath10k/core.h | 1 +
drivers/net/wireless/ath/ath10k/mac.c | 2 +-
drivers/net/wireless/ath/ath10k/wmi.c | 22 +-
drivers/net/wireless/ath/ath10k/wmi.h | 8 +-
drivers/net/wireless/ath/ath9k/common-spectral.c | 2 +-
drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 17 +-
drivers/net/wireless/brcm80211/brcmfmac/p2p.h | 2 +
drivers/net/wireless/realtek/rtl818x/rtl8187/leds.c | 2 +-
drivers/nvmem/core.c | 2 +-
drivers/of/base.c | 2 +-
drivers/pinctrl/pinctrl-at91-pio4.c | 8 +-
drivers/pinctrl/pinctrl-at91.c | 28 +-
drivers/power/ab8500_fg.c | 31 +-
drivers/power/max8998_charger.c | 2 +-
drivers/power/twl4030_charger.c | 30 +-
drivers/s390/net/qeth_l2_main.c | 3 +
drivers/s390/net/qeth_l3_main.c | 3 +
drivers/scsi/libsas/sas_expander.c | 13 +-
drivers/scsi/pm8001/pm8001_hwi.c | 6 +
drivers/scsi/pm8001/pm8001_sas.c | 9 +-
drivers/scsi/pm8001/pm8001_sas.h | 1 +
drivers/scsi/pm8001/pm80xx_hwi.c | 80 +-
drivers/scsi/pm8001/pm80xx_hwi.h | 3 +
drivers/scsi/sym53c8xx_2/sym_hipd.c | 15 +-
drivers/spi/spi-rockchip.c | 3 +
drivers/spi/spidev.c | 8 +-
drivers/tty/serial/mxs-auart.c | 3 +-
drivers/usb/chipidea/otg.c | 9 +-
drivers/usb/gadget/function/uvc_configfs.c | 7 +
drivers/usb/gadget/function/uvc_video.c | 32 +-
drivers/usb/gadget/udc/fotg210-udc.c | 2 +-
drivers/usb/serial/cypress_m8.c | 2 +-
drivers/vfio/pci/vfio_pci_config.c | 4 +-
drivers/video/backlight/lm3639_bl.c | 6 +-
drivers/video/fbdev/Kconfig | 10 -
drivers/video/fbdev/Makefile | 1 -
drivers/video/fbdev/core/fbmon.c | 95 -
drivers/video/fbdev/core/modedb.c | 57 -
drivers/video/fbdev/sbuslib.c | 28 +-
drivers/video/fbdev/sh_mobile_hdmi.c | 1489 ----------
fs/ecryptfs/inode.c | 19 +-
fs/fuse/control.c | 4 +-
fs/gfs2/rgrp.c | 2 +-
fs/gfs2/super.c | 2 +-
fs/kernfs/symlink.c | 5 +-
fs/nfs/delegation.c | 6 +-
fs/proc/vmcore.c | 10 +
include/linux/blkdev.h | 16 +-
include/linux/cpufeature.h | 2 +-
include/linux/edac.h | 3 +-
include/linux/fb.h | 3 -
include/linux/intel-iommu.h | 6 +-
include/linux/libfdt_env.h | 1 +
include/linux/platform_data/dma-ep93xx.h | 2 +-
include/linux/sunrpc/sched.h | 2 -
include/net/llc.h | 1 +
include/video/sh_mobile_hdmi.h | 49 -
kernel/events/uprobes.c | 4 +-
kernel/kprobes.c | 8 +-
kernel/printk/printk.c | 18 +-
kernel/signal.c | 4 +
mm/hugetlb_cgroup.c | 2 +-
mm/memcontrol.c | 2 +-
mm/shmem.c | 2 +-
net/bluetooth/l2cap_core.c | 10 +
net/llc/llc_core.c | 4 +-
net/mac80211/rc80211_minstrel_ht.c | 2 +-
net/openvswitch/vport-internal_dev.c | 5 +-
net/sunrpc/sched.c | 109 +-
net/wireless/nl80211.c | 2 +-
security/apparmor/apparmorfs.c | 2 +
security/apparmor/audit.c | 3 +-
security/apparmor/file.c | 3 +-
security/apparmor/include/policy.h | 2 +
security/apparmor/lsm.c | 22 +-
security/apparmor/policy.c | 18 +-
sound/core/oss/pcm_plugin.c | 4 +-
sound/core/seq/seq_system.c | 18 +-
sound/pci/hda/patch_sigmatel.c | 20 +
sound/pci/intel8x0m.c | 20 +-
sound/soc/codecs/sgtl5000.c | 2 +-
sound/soc/soc-pcm.c | 2 +-
sound/usb/endpoint.c | 3 +
sound/usb/mixer.c | 4 +-
188 files changed, 941 insertions(+), 2135 deletions(-)
diff --git a/Documentation/misc-devices/mei/mei-amt-version.c b/Documentation/misc-devices/mei/mei-amt-version.c
index 57d0d871dcf7..33e67bd1dc34 100644
--- a/Documentation/misc-devices/mei/mei-amt-version.c
@ -12,7 +230,7 @@ index 57d0d871dcf7..33e67bd1dc34 100644
uint32_t status;
struct amt_host_if_resp_header *msg_hdr;
diff --git a/Makefile b/Makefile
index e7fecd28672e..3163f289cb52 100644
index 1583e6108225..578496fe52f2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
@ -351,10 +569,10 @@ index 313e260529a3..e8f5a55c4b95 100644
nvidia,xcvr-lsrslew = <2>;
nvidia,xcvr-hsslew = <32>;
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index e969b18d9ff9..d31f0300d2c9 100644
index e3e0c4627214..b9967792ac44 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -261,16 +261,15 @@ __sys_trace:
@@ -271,16 +271,15 @@ __sys_trace:
cmp scno, #-1 @ skip the syscall?
bne 2b
add sp, sp, #S_OFF @ restore stack
@ -441,10 +659,10 @@ index 2874d92881fd..a3030c868be5 100644
compatible = "arm,pl022", "arm,primecell";
#gpio-cells = <2>;
diff --git a/arch/arm64/lib/clear_user.S b/arch/arm64/lib/clear_user.S
index a9723c71c52b..8d330c30a6f9 100644
index 07c7ad97ee28..0f5cc2a25a9b 100644
--- a/arch/arm64/lib/clear_user.S
+++ b/arch/arm64/lib/clear_user.S
@@ -62,5 +62,7 @@ ENDPROC(__clear_user)
@@ -57,5 +57,7 @@ ENDPROC(__clear_user)
.section .fixup,"ax"
.align 2
9: mov x0, x2 // return the original size
@ -453,10 +671,10 @@ index a9723c71c52b..8d330c30a6f9 100644
ret
.previous
diff --git a/arch/arm64/lib/copy_from_user.S b/arch/arm64/lib/copy_from_user.S
index 4699cd74f87e..b8c95ef13229 100644
index 683adc358be7..e10f4cf6a73b 100644
--- a/arch/arm64/lib/copy_from_user.S
+++ b/arch/arm64/lib/copy_from_user.S
@@ -85,5 +85,7 @@ ENDPROC(__copy_from_user)
@@ -80,5 +80,7 @@ ENDPROC(__arch_copy_from_user)
strb wzr, [dst], #1 // zero remaining buffer space
cmp dst, end
b.lo 9999b
@ -465,10 +683,10 @@ index 4699cd74f87e..b8c95ef13229 100644
ret
.previous
diff --git a/arch/arm64/lib/copy_in_user.S b/arch/arm64/lib/copy_in_user.S
index 81c8fc93c100..233703c84bcd 100644
index e8bfaf19f778..76eafe9e2618 100644
--- a/arch/arm64/lib/copy_in_user.S
+++ b/arch/arm64/lib/copy_in_user.S
@@ -81,5 +81,7 @@ ENDPROC(__copy_in_user)
@@ -76,5 +76,7 @@ ENDPROC(__copy_in_user)
.section .fixup,"ax"
.align 2
9998: sub x0, end, dst // bytes not copied
@ -477,10 +695,10 @@ index 81c8fc93c100..233703c84bcd 100644
ret
.previous
diff --git a/arch/arm64/lib/copy_to_user.S b/arch/arm64/lib/copy_to_user.S
index 7512bbbc07ac..62b179408b23 100644
index f6cfcc0441de..b4c9266d7030 100644
--- a/arch/arm64/lib/copy_to_user.S
+++ b/arch/arm64/lib/copy_to_user.S
@@ -79,5 +79,7 @@ ENDPROC(__copy_to_user)
@@ -74,5 +74,7 @@ ENDPROC(__arch_copy_to_user)
.section .fixup,"ax"
.align 2
9998: sub x0, end, dst // bytes not copied
@ -701,10 +919,10 @@ index 39049e4884fb..7a4d172c9376 100644
#endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 53b429811aef..1bee1c6a9891 100644
index 551ff6a49213..e34c7aada36b 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2526,8 +2526,7 @@ config OLPC
@@ -2549,8 +2549,7 @@ config OLPC
config OLPC_XO1_PM
bool "OLPC XO-1 Power Management"
@ -862,10 +1080,10 @@ index 6e4e4191abb5..151625a83d9e 100644
setCx86(CX86_CCR3, ccr3);
local_irq_restore(flags);
diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
index a9fc2292d9ce..7c48aa03fe77 100644
index ddf968b21d6c..01fda02e1df6 100644
--- a/arch/x86/kernel/kprobes/core.c
+++ b/arch/x86/kernel/kprobes/core.c
@@ -372,6 +372,10 @@ int __copy_instruction(u8 *dest, u8 *src)
@@ -373,6 +373,10 @@ int __copy_instruction(u8 *dest, u8 *src)
return 0;
memcpy(dest, insn.kaddr, length);
@ -1301,7 +1519,7 @@ index 559cd4073698..cf741187c9bb 100644
return &td_desc->txd;
}
diff --git a/drivers/gpio/gpio-syscon.c b/drivers/gpio/gpio-syscon.c
index 7b25fdf64802..f579938552cc 100644
index 333d5af4abd1..b59ec07e0cb8 100644
--- a/drivers/gpio/gpio-syscon.c
+++ b/drivers/gpio/gpio-syscon.c
@@ -127,7 +127,7 @@ static int syscon_gpio_dir_out(struct gpio_chip *chip, unsigned offset, int val)
@ -1314,10 +1532,10 @@ index 7b25fdf64802..f579938552cc 100644
return 0;
}
diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c
index 3e23003f78b0..993c61e95d30 100644
index f9af3935b427..2ccb433c9b72 100644
--- a/drivers/hwmon/pwm-fan.c
+++ b/drivers/hwmon/pwm-fan.c
@@ -227,8 +227,12 @@ static int pwm_fan_probe(struct platform_device *pdev)
@@ -231,8 +231,12 @@ static int pwm_fan_probe(struct platform_device *pdev)
ctx->pwm = devm_of_pwm_get(&pdev->dev, pdev->dev.of_node, NULL);
if (IS_ERR(ctx->pwm)) {
@ -2448,10 +2666,10 @@ index c2d5b495c179..c089540116fa 100644
led->led_dev.name = led->name;
led->led_dev.default_trigger = default_trigger;
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 931cc33e46f0..5d6d1bb4f110 100644
index bed97970a2fd..b6fd3fd1c388 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -457,7 +457,7 @@ static struct nvmem_device *nvmem_find(const char *name)
@@ -599,7 +599,7 @@ static struct nvmem_device *nvmem_find(const char *name)
d = bus_find_device(&nvmem_bus_type, NULL, (void *)name, nvmem_match);
if (!d)
@ -2461,10 +2679,10 @@ index 931cc33e46f0..5d6d1bb4f110 100644
return to_nvmem_device(d);
}
diff --git a/drivers/of/base.c b/drivers/of/base.c
index c6e019208d17..27783223ca5c 100644
index c17721b8ba30..905c0cf2cc16 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -2125,7 +2125,7 @@ struct device_node *of_find_next_cache_node(const struct device_node *np)
@@ -1731,7 +1731,7 @@ struct device_node *of_find_next_cache_node(const struct device_node *np)
/* OF on pmac has nodes instead of properties named "l2-cache"
* beneath CPU nodes.
*/
@ -2474,7 +2692,7 @@ index c6e019208d17..27783223ca5c 100644
if (!strcmp(child->type, "cache"))
return child;
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index 9aa82a4e9e25..b4420a0bf7d6 100644
index 8b9673607890..ff41da25af2b 100644
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -477,7 +477,6 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
@ -2514,7 +2732,7 @@ index 9aa82a4e9e25..b4420a0bf7d6 100644
reserved_maps, num_maps, group,
configs, num_configs,
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index 0d2fc0cff35e..52bbd34f7d0d 100644
index ff0a19985b4f..7a98e871bd8a 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -1556,16 +1556,6 @@ void at91_pinctrl_gpio_resume(void)
@ -3010,12 +3228,12 @@ index c6425e3df5a0..f1c771437752 100644
goto out;
/*
diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index 035767c02072..f42ae9efb255 100644
index 6f4189f3f315..428164c226d4 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -444,6 +444,9 @@ static void rockchip_spi_prepare_dma(struct rockchip_spi *rs)
struct dma_slave_config rxconf, txconf;
struct dma_async_tx_descriptor *rxdesc, *txdesc;
@@ -442,6 +442,9 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs)
memset(&rxconf, 0, sizeof(struct dma_slave_config));
memset(&txconf, 0, sizeof(struct dma_slave_config));
+ memset(&rxconf, 0, sizeof(rxconf));
+ memset(&txconf, 0, sizeof(txconf));
@ -3024,10 +3242,10 @@ index 035767c02072..f42ae9efb255 100644
rs->state &= ~RXBUSY;
rs->state &= ~TXBUSY;
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index d0e7dfc647cf..c5f1045561ac 100644
index b388c3227755..f41813a5086e 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -713,11 +713,9 @@ static int spidev_probe(struct spi_device *spi)
@@ -714,11 +714,9 @@ static int spidev_probe(struct spi_device *spi)
* compatible string, it is a Linux implementation thing
* rather than a description of the hardware.
*/
@ -3083,7 +3301,7 @@ index f36a1ac3bfbd..b8650210be0f 100644
enable_irq(ci->irq);
diff --git a/drivers/usb/gadget/function/uvc_configfs.c b/drivers/usb/gadget/function/uvc_configfs.c
index 01656f1c6d65..a49ff1f5c0f9 100644
index 26c6ba150193..13ae135b9107 100644
--- a/drivers/usb/gadget/function/uvc_configfs.c
+++ b/drivers/usb/gadget/function/uvc_configfs.c
@@ -564,6 +564,7 @@ static int uvcg_control_class_allow_link(struct config_item *src,
@ -3119,7 +3337,7 @@ index 01656f1c6d65..a49ff1f5c0f9 100644
out:
mutex_unlock(&opts->lock);
mutex_unlock(su_mutex);
@@ -2087,6 +2092,7 @@ static int uvcg_streaming_class_allow_link(struct config_item *src,
@@ -2091,6 +2096,7 @@ static int uvcg_streaming_class_allow_link(struct config_item *src,
unlock:
mutex_unlock(&opts->lock);
out:
@ -3127,7 +3345,7 @@ index 01656f1c6d65..a49ff1f5c0f9 100644
mutex_unlock(su_mutex);
return ret;
}
@@ -2131,6 +2137,7 @@ static int uvcg_streaming_class_drop_link(struct config_item *src,
@@ -2135,6 +2141,7 @@ static int uvcg_streaming_class_drop_link(struct config_item *src,
unlock:
mutex_unlock(&opts->lock);
out:
@ -5199,11 +5417,11 @@ index 4e61388ec03d..08143139b65a 100644
* Copy to either kernel or user space
*/
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 1383e1c03ff2..e4b945925e40 100644
index 490d06de44b5..abe6bd269d1b 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -199,6 +199,11 @@ struct request {
struct request *next_rq;
@@ -202,6 +202,11 @@ struct request {
int lat_hist_enabled;
};
+static inline bool blk_rq_is_passthrough(struct request *rq)
@ -5214,7 +5432,7 @@ index 1383e1c03ff2..e4b945925e40 100644
static inline unsigned short req_get_ioprio(struct request *req)
{
return req->ioprio;
@@ -582,9 +587,10 @@ static inline void queue_flag_clear(unsigned int flag, struct request_queue *q)
@@ -585,9 +590,10 @@ static inline void queue_flag_clear(unsigned int flag, struct request_queue *q)
((rq)->cmd_flags & (REQ_FAILFAST_DEV|REQ_FAILFAST_TRANSPORT| \
REQ_FAILFAST_DRIVER))
@ -5228,7 +5446,7 @@ index 1383e1c03ff2..e4b945925e40 100644
#define blk_rq_cpu_valid(rq) ((rq)->cpu != -1)
#define blk_bidi_rq(rq) ((rq)->next_rq != NULL)
@@ -645,7 +651,7 @@ static inline void blk_clear_rl_full(struct request_list *rl, bool sync)
@@ -648,7 +654,7 @@ static inline void blk_clear_rl_full(struct request_list *rl, bool sync)
static inline bool rq_mergeable(struct request *rq)
{
@ -5237,7 +5455,7 @@ index 1383e1c03ff2..e4b945925e40 100644
return false;
if (rq->cmd_flags & REQ_NOMERGE_FLAGS)
@@ -890,7 +896,7 @@ static inline unsigned int blk_rq_get_max_sectors(struct request *rq)
@@ -893,7 +899,7 @@ static inline unsigned int blk_rq_get_max_sectors(struct request *rq)
{
struct request_queue *q = rq->q;
@ -5280,10 +5498,10 @@ index 4fe67b853de0..9bb4f3311e13 100644
#endif
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 3d003805aac3..b48a14e5424e 100644
index 33564b062803..deaf384f79e2 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -716,8 +716,6 @@ extern int fb_parse_edid(unsigned char *edid, struct fb_var_screeninfo *var);
@@ -719,8 +719,6 @@ extern int fb_parse_edid(unsigned char *edid, struct fb_var_screeninfo *var);
extern const unsigned char *fb_firmware_edid(struct device *device);
extern void fb_edid_to_monspecs(unsigned char *edid,
struct fb_monspecs *specs);
@ -5292,7 +5510,7 @@ index 3d003805aac3..b48a14e5424e 100644
extern void fb_destroy_modedb(struct fb_videomode *modedb);
extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb);
extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter);
@@ -791,7 +789,6 @@ struct dmt_videomode {
@@ -794,7 +792,6 @@ struct dmt_videomode {
extern const char *fb_mode_option;
extern const struct fb_videomode vesa_modes[];
@ -5437,10 +5655,10 @@ index 63d20efa254a..000000000000
-
-#endif
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index aad43c88a668..8cad3cd92e23 100644
index 26a4cba37128..2a9154b727da 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -1836,7 +1836,7 @@ static void handle_trampoline(struct pt_regs *regs)
@@ -1835,7 +1835,7 @@ static void handle_trampoline(struct pt_regs *regs)
sigill:
uprobe_warn(current, "handle uretprobe, sending SIGILL.");
@ -5449,7 +5667,7 @@ index aad43c88a668..8cad3cd92e23 100644
}
@@ -1952,7 +1952,7 @@ static void handle_singlestep(struct uprobe_task *utask, struct pt_regs *regs)
@@ -1951,7 +1951,7 @@ static void handle_singlestep(struct uprobe_task *utask, struct pt_regs *regs)
if (unlikely(err)) {
uprobe_warn(current, "execute the probed insn, sending SIGILL.");
@ -5479,10 +5697,10 @@ index fdde50d39a46..f59f49bc2a5d 100644
}
}
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 5a1b2a914b4e..699c18c9d763 100644
index cb9068d39941..35f4bf92dff5 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -279,6 +279,7 @@ static u32 clear_idx;
@@ -293,6 +293,7 @@ static u32 clear_idx;
#define LOG_ALIGN __alignof__(struct printk_log)
#endif
#define __LOG_BUF_LEN (1 << CONFIG_LOG_BUF_SHIFT)
@ -5490,7 +5708,7 @@ index 5a1b2a914b4e..699c18c9d763 100644
static char __log_buf[__LOG_BUF_LEN] __aligned(LOG_ALIGN);
static char *log_buf = __log_buf;
static u32 log_buf_len = __LOG_BUF_LEN;
@@ -870,18 +871,23 @@ void log_buf_kexec_setup(void)
@@ -913,18 +914,23 @@ void log_buf_kexec_setup(void)
static unsigned long __initdata new_log_buf_len;
/* we practice scaling the ring buffer by powers of 2 */
@ -5517,7 +5735,7 @@ index 5a1b2a914b4e..699c18c9d763 100644
if (!str)
return -EINVAL;
@@ -951,7 +957,7 @@ void __init setup_log_buf(int early)
@@ -994,7 +1000,7 @@ void __init setup_log_buf(int early)
}
if (unlikely(!new_log_buf)) {
@ -5526,7 +5744,7 @@ index 5a1b2a914b4e..699c18c9d763 100644
new_log_buf_len);
return;
}
@@ -964,8 +970,8 @@ void __init setup_log_buf(int early)
@@ -1007,8 +1013,8 @@ void __init setup_log_buf(int early)
memcpy(log_buf, __log_buf, __LOG_BUF_LEN);
raw_spin_unlock_irqrestore(&logbuf_lock, flags);
@ -5538,7 +5756,7 @@ index 5a1b2a914b4e..699c18c9d763 100644
}
diff --git a/kernel/signal.c b/kernel/signal.c
index 072fd152ab01..3095b2309876 100644
index e1edc993e1d6..9759e9b783d8 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -71,6 +71,10 @@ static int sig_task_ignored(struct task_struct *t, int sig, bool force)
@ -5579,7 +5797,7 @@ index a84eb0f8c5db..c27031b4683a 100644
return memcg;
}
diff --git a/mm/shmem.c b/mm/shmem.c
index 62668379623b..e40239bf6dfe 100644
index ba63273ebda7..c00b36661d08 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1862,7 +1862,7 @@ static void shmem_tag_pins(struct address_space *mapping)
@ -5844,7 +6062,7 @@ index 1cb35c753dcd..3eed71a2ff2b 100644
return task;
}
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 4de66dbd5bb6..fd0bf278067e 100644
index c6a80791eae1..9368a660f73a 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -2879,7 +2879,7 @@ static void get_key_callback(void *c, struct key_params *params)
@ -6273,3 +6491,6 @@ index e24572fd6e30..1b81f18010d2 100644
cval->initialized = 1;
}
--
Armbian

222
patch/kernel/archive/rockchip64-4.4/patch-4.4.203-204.patch
View File

@ -1,3 +1,168 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Fri, 3 Jan 2020 11:37:00 +0100
Subject: [ARCHEOLOGY] Move rockchip64 legacy to most recent kernel. Tested
with standard https://github.com/armbian/autotests stress test on RockPro64
and Rock64.
> X-Git-Archeology: - Revision 42ecf1582f83241e18ce329193c5eac66fd244de: https://github.com/armbian/build/commit/42ecf1582f83241e18ce329193c5eac66fd244de
> X-Git-Archeology: Date: Fri, 03 Jan 2020 11:37:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Move rockchip64 legacy to most recent kernel. Tested with standard https://github.com/armbian/autotests stress test on RockPro64 and Rock64.
> X-Git-Archeology:
> X-Git-Archeology: - Revision 5597ecfe073a70e11a3d832ca210471217706a0f: https://github.com/armbian/build/commit/5597ecfe073a70e11a3d832ca210471217706a0f
> X-Git-Archeology: Date: Fri, 03 Jan 2020 11:42:56 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move rockchip64 legacy to most recent kernel. Tested with standard https://github.com/armbian/autotests stress test on RockPro64 and Rock64. (#1714)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 17bb3b5075613e344faedc4093eee5ea145f1b2e: https://github.com/armbian/build/commit/17bb3b5075613e344faedc4093eee5ea145f1b2e
> X-Git-Archeology: Date: Sat, 04 Jan 2020 21:07:25 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Update RK3399 legacy to latest upstream kernel version (#1718)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
Documentation/hw-vuln/mds.rst | 7 +-
Documentation/hw-vuln/tsx_async_abort.rst | 5 +-
Documentation/kernel-parameters.txt | 11 +
Makefile | 2 +-
arch/arc/kernel/perf_event.c | 4 +-
arch/arm64/kernel/traps.c | 1 -
arch/powerpc/include/asm/asm-prototypes.h | 3 +
arch/powerpc/include/asm/security_features.h | 3 +
arch/powerpc/kernel/eeh_pe.c | 2 +-
arch/powerpc/kernel/entry_64.S | 6 +
arch/powerpc/kernel/security.c | 74 ++++-
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 20 ++
arch/powerpc/platforms/ps3/os-area.c | 2 +-
arch/s390/kernel/perf_cpum_sf.c | 6 +-
arch/sparc/include/asm/cmpxchg_64.h | 7 +-
arch/sparc/include/asm/parport.h | 2 +
arch/um/drivers/line.c | 2 +-
arch/x86/include/asm/ptrace.h | 42 ++-
arch/x86/kernel/cpu/bugs.c | 30 +-
arch/x86/kvm/vmx.c | 4 +-
arch/x86/tools/gen-insn-attr-x86.awk | 4 +-
drivers/atm/zatm.c | 42 +--
drivers/block/amiflop.c | 84 +++---
drivers/bluetooth/hci_bcsp.c | 3 +
drivers/char/virtio_console.c | 140 ++++-----
drivers/clk/mmp/clk-of-mmp2.c | 4 +-
drivers/cpufreq/cpufreq.c | 9 +
drivers/firmware/google/gsmi.c | 5 +-
drivers/isdn/mISDN/tei.c | 7 +-
drivers/macintosh/windfarm_smu_sat.c | 25 +-
drivers/md/dm.c | 4 +-
drivers/media/platform/vivid/vivid-kthread-cap.c | 8 +-
drivers/media/platform/vivid/vivid-kthread-out.c | 8 +-
drivers/media/platform/vivid/vivid-sdr-cap.c | 8 +-
drivers/media/platform/vivid/vivid-vid-cap.c | 3 -
drivers/media/platform/vivid/vivid-vid-out.c | 3 -
drivers/media/rc/imon.c | 3 +-
drivers/media/usb/b2c2/flexcop-usb.c | 3 +
drivers/media/usb/dvb-usb/cxusb.c | 3 +-
drivers/mfd/max8997.c | 8 +-
drivers/mfd/mc13xxx-core.c | 3 +-
drivers/misc/mic/scif/scif_fence.c | 2 +-
drivers/mmc/host/mtk-sd.c | 2 +-
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +-
drivers/net/ethernet/intel/igb/igb_ptp.c | 8 +-
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 1 +
drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c | 2 +-
drivers/net/ethernet/sfc/ptp.c | 3 +-
drivers/net/ntb_netdev.c | 2 +-
drivers/net/wireless/airo.c | 2 +-
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +-
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | 30 +-
drivers/net/wireless/brcm80211/brcmsmac/main.h | 1 +
drivers/net/wireless/mwifiex/cfg80211.c | 13 +-
drivers/net/wireless/mwifiex/ioctl.h | 1 +
drivers/net/wireless/mwifiex/sta_ioctl.c | 11 +-
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 1 +
drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.c | 2 +-
drivers/net/wireless/ti/wlcore/vendor_cmd.c | 2 +-
drivers/ntb/hw/intel/ntb_hw_intel.c | 2 +-
drivers/pci/host/pci-keystone.c | 3 +
drivers/pinctrl/pinctrl-zynq.c | 9 +-
drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 21 +-
drivers/platform/x86/Kconfig | 1 +
drivers/platform/x86/asus-nb-wmi.c | 148 +++++++++-
drivers/platform/x86/asus-wmi.c | 59 +++-
drivers/platform/x86/asus-wmi.h | 9 +
drivers/rtc/rtc-s35390a.c | 2 +-
drivers/scsi/dc395x.c | 12 +-
drivers/scsi/ips.c | 1 +
drivers/scsi/isci/host.c | 8 +-
drivers/scsi/isci/host.h | 2 +-
drivers/scsi/isci/request.c | 4 +-
drivers/scsi/isci/task.c | 4 +-
drivers/scsi/iscsi_tcp.c | 3 +-
drivers/scsi/lpfc/lpfc_els.c | 2 +
drivers/scsi/lpfc/lpfc_hbadisc.c | 20 ++
drivers/scsi/lpfc/lpfc_init.c | 2 +-
drivers/scsi/lpfc/lpfc_sli.c | 11 +-
drivers/scsi/lpfc/lpfc_sli4.h | 1 +
drivers/scsi/megaraid/megaraid_sas_base.c | 4 +-
drivers/scsi/mpt3sas/mpt3sas_config.c | 4 -
drivers/scsi/mpt3sas/mpt3sas_scsih.c | 36 ++-
drivers/spi/spi-omap2-mcspi.c | 26 +-
drivers/spi/spi-sh-msiof.c | 4 +-
drivers/staging/comedi/drivers/usbduxfast.c | 21 +-
drivers/staging/rdma/hfi1/pcie.c | 3 +-
drivers/thermal/rcar_thermal.c | 4 +-
drivers/tty/synclink_gt.c | 16 +-
drivers/usb/misc/appledisplay.c | 15 +-
drivers/usb/serial/cp210x.c | 1 +
drivers/usb/serial/mos7720.c | 4 -
drivers/usb/serial/mos7840.c | 16 +-
drivers/usb/serial/option.c | 7 +
fs/btrfs/ctree.c | 4 +
fs/ceph/inode.c | 1 -
fs/dlm/member.c | 5 +-
fs/dlm/user.c | 2 +-
fs/gfs2/rgrp.c | 13 +-
fs/hfs/brec.c | 1 +
fs/hfs/btree.c | 41 ++-
fs/hfs/btree.h | 1 +
fs/hfs/catalog.c | 16 +
fs/hfs/extent.c | 10 +-
fs/hfsplus/attributes.c | 10 +
fs/hfsplus/brec.c | 1 +
fs/hfsplus/btree.c | 44 ++-
fs/hfsplus/catalog.c | 24 ++
fs/hfsplus/extents.c | 8 +-
fs/hfsplus/hfsplus_fs.h | 2 +
fs/ocfs2/buffer_head_io.c | 77 +++--
fs/ocfs2/dlm/dlmdebug.c | 2 +-
fs/ocfs2/dlmglue.c | 2 +-
fs/ocfs2/move_extents.c | 17 ++
fs/ocfs2/stackglue.c | 6 -
fs/ocfs2/stackglue.h | 3 -
fs/ocfs2/xattr.c | 56 ++--
include/linux/bitmap.h | 9 +-
include/linux/mfd/max8997.h | 1 -
include/linux/mfd/mc13xxx.h | 1 +
kernel/auditsc.c | 2 +-
kernel/printk/printk.c | 2 +-
kernel/sched/fair.c | 13 +-
mm/ksm.c | 14 +-
mm/page-writeback.c | 33 +--
net/core/dev.c | 2 +-
net/core/rtnetlink.c | 16 +
net/core/sock.c | 6 +-
net/sched/act_pedit.c | 5 +-
net/sunrpc/auth_gss/gss_krb5_seal.c | 1 +
net/unix/af_unix.c | 2 +
sound/firewire/isight.c | 10 +-
sound/i2c/cs8427.c | 2 +-
tools/perf/util/intel-pt-decoder/gen-insn-attr-x86.awk | 4 +-
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_syntax.tc | 3 +
135 files changed, 1164 insertions(+), 490 deletions(-)
diff --git a/Documentation/hw-vuln/mds.rst b/Documentation/hw-vuln/mds.rst
index 3f92728be021..7b8a1e9c5240 100644
--- a/Documentation/hw-vuln/mds.rst
@ -33,10 +198,10 @@ index 38beda735f39..0adfe63612ce 100644
The kernel command line also allows to control the TSX feature using the
parameter "tsx=" on CPUs which support TSX control. MSR_IA32_TSX_CTRL is used
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 70f05fc3873c..da9acfb23383 100644
index 28624733074c..284c97c76a19 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2054,6 +2054,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
@@ -2095,6 +2095,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
full - Enable MDS mitigation on vulnerable CPUs
off - Unconditionally disable MDS mitigation
@ -49,7 +214,7 @@ index 70f05fc3873c..da9acfb23383 100644
Not specifying this option is equivalent to
mds=full.
@@ -4105,6 +4111,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
@@ -4183,6 +4189,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
off - Unconditionally disable TAA mitigation
@ -62,7 +227,7 @@ index 70f05fc3873c..da9acfb23383 100644
tsx_async_abort=full. On CPUs which are MDS affected
and deploy MDS mitigation, TAA mitigation is not
diff --git a/Makefile b/Makefile
index 3163f289cb52..c2a57420c570 100644
index 578496fe52f2..1843aa8b69e9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
@ -89,10 +254,10 @@ index 8b134cfe5e1f..71fcbccc8f98 100644
/* See if it has been mapped to a perf event_id */
for (i = 0; i < ARRAY_SIZE(arc_pmu_ev_hw_map); i++) {
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index 6b4579e07aa2..02710f99c137 100644
index 8a6baff7b86f..888b40626768 100644
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -448,7 +448,6 @@ asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr)
@@ -526,7 +526,6 @@ asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr)
pr_crit("Bad mode in %s handler detected, code 0x%08x -- %s\n",
handler[reason], esr, esr_get_class_string(esr));
@ -445,10 +610,10 @@ index 62087028a9ce..d2ad45c10113 100644
line->tail = line->buffer;
}
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
index 0d8e0831b1a0..3daec418c822 100644
index 1f954392ab60..1294e0d9874d 100644
--- a/arch/x86/include/asm/ptrace.h
+++ b/arch/x86/include/asm/ptrace.h
@@ -205,24 +205,52 @@ static inline int regs_within_kernel_stack(struct pt_regs *regs,
@@ -201,24 +201,52 @@ static inline int regs_within_kernel_stack(struct pt_regs *regs,
(kernel_stack_pointer(regs) & ~(THREAD_SIZE - 1)));
}
@ -1206,10 +1371,10 @@ index f261b1d292c7..8b45cb2caed1 100644
{MMP2_CLK_DISP0_SPHY, "disp0_sphy_clk", "disp0_sphy_div", CLK_SET_RATE_PARENT, APMU_DISP0, 0x1024, 0x1024, 0x0, 0, &disp0_lock},
{MMP2_CLK_DISP1, "disp1_clk", "disp1_div", CLK_SET_RATE_PARENT, APMU_DISP1, 0x1b, 0x1b, 0x0, 0, &disp1_lock},
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 0836d2939c7a..2239d42bdadd 100644
index 38d6243d5203..c7994818c36a 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -821,6 +821,9 @@ static ssize_t show(struct kobject *kobj, struct attribute *attr, char *buf)
@@ -917,6 +917,9 @@ static ssize_t show(struct kobject *kobj, struct attribute *attr, char *buf)
struct freq_attr *fattr = to_attr(attr);
ssize_t ret;
@ -1219,7 +1384,7 @@ index 0836d2939c7a..2239d42bdadd 100644
down_read(&policy->rwsem);
if (fattr->show)
@@ -840,6 +843,9 @@ static ssize_t store(struct kobject *kobj, struct attribute *attr,
@@ -936,6 +939,9 @@ static ssize_t store(struct kobject *kobj, struct attribute *attr,
struct freq_attr *fattr = to_attr(attr);
ssize_t ret = -EINVAL;
@ -1229,7 +1394,7 @@ index 0836d2939c7a..2239d42bdadd 100644
get_online_cpus();
if (!cpu_online(policy->cpu))
@@ -1627,6 +1633,9 @@ void cpufreq_resume(void)
@@ -1724,6 +1730,9 @@ void cpufreq_resume(void)
if (!cpufreq_driver)
return;
@ -1469,10 +1634,10 @@ index b77acb6a7013..ffe5531dfc81 100644
dprintk(dev, 1, "%s\n", __func__);
if (dev->start_streaming_error) {
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index 7a16e9ea041c..0a8d529e12cc 100644
index b6dff860fb5d..bd9158c71cc8 100644
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -1644,8 +1644,7 @@ static void imon_incoming_packet(struct imon_context *ictx,
@@ -1636,8 +1636,7 @@ static void imon_incoming_packet(struct imon_context *ictx,
spin_unlock_irqrestore(&ictx->kc_lock, flags);
/* send touchscreen events through input subsystem if touchpad data */
@ -1938,7 +2103,7 @@ index fb682e8af74d..bdb808ba90d2 100644
};
diff --git a/drivers/pinctrl/pinctrl-zynq.c b/drivers/pinctrl/pinctrl-zynq.c
index d57b5eca7b98..ad12205dd796 100644
index 8d3a37ad911c..e05404d58844 100644
--- a/drivers/pinctrl/pinctrl-zynq.c
+++ b/drivers/pinctrl/pinctrl-zynq.c
@@ -967,15 +967,12 @@ enum zynq_io_standards {
@ -1961,7 +2126,7 @@ index d57b5eca7b98..ad12205dd796 100644
static const struct pinconf_generic_params zynq_dt_params[] = {
{"io-standard", PIN_CONFIG_IOSTANDARD, zynq_iostd_lvcmos18},
diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
index 4ea810cafaac..913b2604d345 100644
index 3a5053093bfb..c3984df20eda 100644
--- a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
+++ b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
@@ -793,10 +793,23 @@ static int pmic_gpio_probe(struct platform_device *pdev)
@ -3972,7 +4137,7 @@ index 638222e43e48..93011c61aafd 100644
#define MC13XXX_ADC0_ADINC2 (1 << 17)
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 0fe8b337291a..87c43c92fb7d 100644
index 2b9a4739381d..e0a4d971dd64 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1093,7 +1093,7 @@ static void audit_log_execve_info(struct audit_context *context,
@ -3985,10 +4150,10 @@ index 0fe8b337291a..87c43c92fb7d 100644
* can't fit a reasonable amount of data into the
* existing audit buffer, flush it and start with
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 699c18c9d763..e53a976ca28e 100644
index 35f4bf92dff5..96187bf0744f 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -937,7 +937,7 @@ void __init setup_log_buf(int early)
@@ -980,7 +980,7 @@ void __init setup_log_buf(int early)
{
unsigned long flags;
char *new_log_buf;
@ -3998,10 +4163,10 @@ index 699c18c9d763..e53a976ca28e 100644
if (log_buf != __log_buf)
return;
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index cd2fb8384fbe..d012681fb1ab 100644
index 4a46f792c4fc..5132278cfa0b 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -7334,13 +7334,22 @@ out_all_pinned:
@@ -9300,13 +9300,22 @@ out_all_pinned:
sd->nr_balance_failed = 0;
out_one_pinned:
@ -4052,10 +4217,10 @@ index 0b496edc704b..f51613052aee 100644
* The stable node did not yet appear stale to get_ksm_page(),
* since that allows for an unmapped ksm page to be recognized
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 0bc7fa21db85..d2211e42b779 100644
index cfd1109d9cd4..789a5d462634 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -2144,6 +2144,13 @@ EXPORT_SYMBOL(tag_pages_for_writeback);
@@ -2154,6 +2154,13 @@ EXPORT_SYMBOL(tag_pages_for_writeback);
* not miss some pages (e.g., because some other process has cleared TOWRITE
* tag we set). The rule we follow is that TOWRITE tag can be cleared only
* by the process clearing the DIRTY tag (and submitting the page for IO).
@ -4069,7 +4234,7 @@ index 0bc7fa21db85..d2211e42b779 100644
*/
int write_cache_pages(struct address_space *mapping,
struct writeback_control *wbc, writepage_t writepage,
@@ -2158,7 +2165,6 @@ int write_cache_pages(struct address_space *mapping,
@@ -2168,7 +2175,6 @@ int write_cache_pages(struct address_space *mapping,
pgoff_t index;
pgoff_t end; /* Inclusive */
pgoff_t done_index;
@ -4077,7 +4242,7 @@ index 0bc7fa21db85..d2211e42b779 100644
int range_whole = 0;
int tag;
@@ -2166,23 +2172,17 @@ int write_cache_pages(struct address_space *mapping,
@@ -2176,23 +2182,17 @@ int write_cache_pages(struct address_space *mapping,
if (wbc->range_cyclic) {
writeback_index = mapping->writeback_index; /* prev offset */
index = writeback_index;
@ -4101,7 +4266,7 @@ index 0bc7fa21db85..d2211e42b779 100644
if (wbc->sync_mode == WB_SYNC_ALL || wbc->tagged_writepages)
tag_pages_for_writeback(mapping, index, end);
done_index = index;
@@ -2290,17 +2290,14 @@ continue_unlock:
@@ -2284,17 +2284,14 @@ continue_unlock:
pagevec_release(&pvec);
cond_resched();
}
@ -4217,7 +4382,7 @@ index d52b633164c9..a9da58204afa 100644
if (ops->ndo_set_vf_trust)
err = ops->ndo_set_vf_trust(dev, ivt->vf, ivt->setting);
diff --git a/net/core/sock.c b/net/core/sock.c
index 8aa4a5f89572..92d5f6232ec7 100644
index 8f2f5d497dc7..72f54ca95ccd 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -951,10 +951,12 @@ set_rcvbuf:
@ -4362,3 +4527,6 @@ index 231bcd2c4eb5..1e7ac6f3362f 100644
: "Indirect memory access"
test_goodarg "+0(${GOODREG})" "-0(${GOODREG})" "+10(\$stack)" \
--
Armbian

39
patch/kernel/archive/rockchip64-4.4/patch-4.4.204-205.patch
View File

@ -1,5 +1,37 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Fri, 3 Jan 2020 11:37:00 +0100
Subject: [ARCHEOLOGY] Move rockchip64 legacy to most recent kernel. Tested
with standard https://github.com/armbian/autotests stress test on RockPro64
and Rock64.
> X-Git-Archeology: - Revision 42ecf1582f83241e18ce329193c5eac66fd244de: https://github.com/armbian/build/commit/42ecf1582f83241e18ce329193c5eac66fd244de
> X-Git-Archeology: Date: Fri, 03 Jan 2020 11:37:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Move rockchip64 legacy to most recent kernel. Tested with standard https://github.com/armbian/autotests stress test on RockPro64 and Rock64.
> X-Git-Archeology:
> X-Git-Archeology: - Revision 5597ecfe073a70e11a3d832ca210471217706a0f: https://github.com/armbian/build/commit/5597ecfe073a70e11a3d832ca210471217706a0f
> X-Git-Archeology: Date: Fri, 03 Jan 2020 11:42:56 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move rockchip64 legacy to most recent kernel. Tested with standard https://github.com/armbian/autotests stress test on RockPro64 and Rock64. (#1714)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 17bb3b5075613e344faedc4093eee5ea145f1b2e: https://github.com/armbian/build/commit/17bb3b5075613e344faedc4093eee5ea145f1b2e
> X-Git-Archeology: Date: Sat, 04 Jan 2020 21:07:25 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Update RK3399 legacy to latest upstream kernel version (#1718)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
Makefile | 2 +-
net/core/sock.c | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index c2a57420c570..9f97365b4bc6 100644
index 1843aa8b69e9..526311d417a7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
@ -11,7 +43,7 @@ index c2a57420c570..9f97365b4bc6 100644
NAME = Blurry Fish Butt
diff --git a/net/core/sock.c b/net/core/sock.c
index 92d5f6232ec7..8aa4a5f89572 100644
index 72f54ca95ccd..8f2f5d497dc7 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -951,12 +951,10 @@ set_rcvbuf:
@ -29,3 +61,6 @@ index 92d5f6232ec7..8aa4a5f89572 100644
break;
case SO_RXQ_OVFL:
--
Armbian

154
patch/kernel/archive/rockchip64-4.4/patch-4.4.205-206.patch
View File

@ -1,3 +1,126 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Fri, 3 Jan 2020 11:37:00 +0100
Subject: [ARCHEOLOGY] Move rockchip64 legacy to most recent kernel. Tested
with standard https://github.com/armbian/autotests stress test on RockPro64
and Rock64.
> X-Git-Archeology: - Revision 42ecf1582f83241e18ce329193c5eac66fd244de: https://github.com/armbian/build/commit/42ecf1582f83241e18ce329193c5eac66fd244de
> X-Git-Archeology: Date: Fri, 03 Jan 2020 11:37:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Move rockchip64 legacy to most recent kernel. Tested with standard https://github.com/armbian/autotests stress test on RockPro64 and Rock64.
> X-Git-Archeology:
> X-Git-Archeology: - Revision 5597ecfe073a70e11a3d832ca210471217706a0f: https://github.com/armbian/build/commit/5597ecfe073a70e11a3d832ca210471217706a0f
> X-Git-Archeology: Date: Fri, 03 Jan 2020 11:42:56 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move rockchip64 legacy to most recent kernel. Tested with standard https://github.com/armbian/autotests stress test on RockPro64 and Rock64. (#1714)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 17bb3b5075613e344faedc4093eee5ea145f1b2e: https://github.com/armbian/build/commit/17bb3b5075613e344faedc4093eee5ea145f1b2e
> X-Git-Archeology: Date: Sat, 04 Jan 2020 21:07:25 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Update RK3399 legacy to latest upstream kernel version (#1718)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
Documentation/hid/uhid.txt | 2 +-
Makefile | 2 +-
arch/arm/Kconfig.debug | 28 ++---
arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 8 +-
arch/arm/mach-ks8695/board-acs5k.c | 2 +-
arch/arm64/kernel/smp.c | 1 +
arch/microblaze/Makefile | 12 ++-
arch/microblaze/boot/Makefile | 4 -
arch/openrisc/kernel/entry.S | 2 +-
arch/openrisc/kernel/head.S | 2 +-
arch/powerpc/boot/dts/bamboo.dts | 4 +-
arch/powerpc/kernel/prom.c | 6 +-
arch/powerpc/mm/fault.c | 17 ++--
arch/powerpc/mm/ppc_mmu_32.c | 4 +-
arch/powerpc/platforms/pseries/dlpar.c | 4 +
arch/powerpc/xmon/xmon.c | 2 +-
arch/s390/kvm/kvm-s390.c | 17 +++-
arch/um/Kconfig.debug | 1 +
crypto/crypto_user.c | 37 +++----
drivers/acpi/acpi_lpss.c | 7 +-
drivers/acpi/apei/ghes.c | 30 +++---
drivers/block/drbd/drbd_main.c | 1 -
drivers/block/drbd/drbd_nl.c | 6 +-
drivers/block/drbd/drbd_receiver.c | 19 ++++
drivers/block/drbd/drbd_state.h | 2 +-
drivers/char/hw_random/stm32-rng.c | 8 ++
drivers/clk/samsung/clk-exynos5420.c | 6 ++
drivers/hid/hid-core.c | 51 ++++++++--
drivers/infiniband/hw/qib/qib_sdma.c | 4 +-
drivers/infiniband/ulp/srp/ib_srp.c | 1 +
drivers/input/serio/gscps2.c | 4 +-
drivers/input/serio/hp_sdc.c | 4 +-
drivers/media/v4l2-core/v4l2-ctrls.c | 1 +
drivers/misc/mei/bus.c | 9 +-
drivers/mtd/mtdcore.h | 2 +-
drivers/mtd/mtdpart.c | 35 ++++++-
drivers/mtd/ubi/build.c | 2 +-
drivers/mtd/ubi/kapi.c | 2 +-
drivers/net/can/c_can/c_can.c | 26 +++++
drivers/net/can/usb/peak_usb/pcan_usb.c | 15 ++-
drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 4 +-
drivers/net/ethernet/cadence/macb.c | 12 +--
drivers/net/ethernet/sfc/ef10.c | 29 ++++--
drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 4 +-
drivers/net/macvlan.c | 3 +-
drivers/net/slip/slip.c | 1 +
drivers/net/wireless/ath/ath6kl/cfg80211.c | 4 +-
drivers/net/wireless/mwifiex/debugfs.c | 14 ++-
drivers/net/wireless/mwifiex/scan.c | 18 ++--
drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 3 +-
drivers/pinctrl/sh-pfc/pfc-sh7264.c | 9 +-
drivers/pinctrl/sh-pfc/pfc-sh7734.c | 16 +--
drivers/platform/x86/hp-wmi.c | 6 +-
drivers/power/avs/smartreflex.c | 3 +-
drivers/pwm/core.c | 1 +
drivers/pwm/pwm-samsung.c | 1 -
drivers/regulator/palmas-regulator.c | 5 +-
drivers/regulator/tps65910-regulator.c | 4 +-
drivers/scsi/csiostor/csio_init.c | 2 +-
drivers/scsi/libsas/sas_expander.c | 29 +++++-
drivers/scsi/lpfc/lpfc_scsi.c | 18 ++++
drivers/scsi/qla2xxx/tcm_qla2xxx.c | 48 ++-------
drivers/scsi/qla2xxx/tcm_qla2xxx.h | 3 -
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 5 +-
drivers/tty/serial/max310x.c | 7 +-
drivers/usb/serial/ftdi_sio.c | 3 +
drivers/usb/serial/ftdi_sio_ids.h | 7 ++
drivers/xen/xen-pciback/pci_stub.c | 3 +-
fs/btrfs/delayed-ref.c | 3 -
fs/gfs2/bmap.c | 2 +
fs/ocfs2/journal.c | 6 +-
fs/xfs/xfs_ioctl32.c | 6 ++
fs/xfs/xfs_rtalloc.c | 4 +-
include/linux/gpio/consumer.h | 2 +-
include/linux/netdevice.h | 2 +-
include/linux/reset-controller.h | 2 +-
include/net/sock.h | 2 +-
lib/genalloc.c | 5 +-
net/core/neighbour.c | 13 ++-
net/core/net_namespace.c | 3 +-
net/core/sock.c | 2 +-
net/decnet/dn_dev.c | 2 +-
net/openvswitch/datapath.c | 17 +++-
net/sched/sch_mq.c | 2 +-
net/sched/sch_mqprio.c | 3 +-
net/sched/sch_multiq.c | 2 +-
net/sched/sch_prio.c | 2 +-
net/tipc/link.c | 2 +-
net/tipc/netlink_compat.c | 8 +-
net/vmw_vsock/af_vsock.c | 7 +-
scripts/gdb/linux/symbols.py | 3 +-
sound/core/compress_offload.c | 2 +-
sound/soc/kirkwood/kirkwood-i2s.c | 8 +-
93 files changed, 492 insertions(+), 270 deletions(-)
diff --git a/Documentation/hid/uhid.txt b/Documentation/hid/uhid.txt
index c8656dd029a9..958fff945304 100644
--- a/Documentation/hid/uhid.txt
@ -12,7 +135,7 @@ index c8656dd029a9..958fff945304 100644
UHID_GET_REPORT:
diff --git a/Makefile b/Makefile
index 9f97365b4bc6..eb4f5b889a1c 100644
index 526311d417a7..cb06535c9ad6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
@ -24,7 +147,7 @@ index 9f97365b4bc6..eb4f5b889a1c 100644
NAME = Blurry Fish Butt
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index ddbb361267d8..9c3042da4440 100644
index f08e4fd600a3..681ecd570e52 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -1260,21 +1260,21 @@ config DEBUG_OMAP2PLUS_UART
@ -96,17 +219,17 @@ index 9f9c0441a917..e372609c48dd 100644
/* The gpio interface */
platform_device_register(&acs5k_i2c_device);
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index 03c0946b79d2..7e90f429f7e5 100644
index e2d4d5bc2b7e..253a97a8fe49 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -115,6 +115,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle)
@@ -138,6 +138,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle)
}
} else {
pr_err("CPU%u: failed to boot: %d\n", cpu, ret);
+ return ret;
}
secondary_data.stack = NULL;
#ifdef CONFIG_THREAD_INFO_IN_TASK
diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
index 740f2b82a182..491676a6cde5 100644
--- a/arch/microblaze/Makefile
@ -651,7 +774,7 @@ index bde71b07f15e..c94de13ce362 100644
SRC_TOP1,
SRC_TOP2,
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 8c61a35c160d..c60bb6f8eceb 100644
index 0128ffa295e1..4c9a8b899140 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -196,6 +196,18 @@ static unsigned hid_lookup_collection(struct hid_parser *parser, unsigned type)
@ -803,10 +926,10 @@ index 852858e5d8d0..92f541db98a0 100644
hp_sdc_status_in8();
hp_sdc_data_in8();
diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index 3140ffbb1e67..9932b276f11a 100644
index 15ee9fe28eb9..b5e6d18fd42d 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -991,6 +991,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
@@ -1017,6 +1017,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
case V4L2_CID_FLASH_STROBE_STOP:
case V4L2_CID_AUTO_FOCUS_START:
case V4L2_CID_AUTO_FOCUS_STOP:
@ -1447,10 +1570,10 @@ index db9973bb53f1..ecc59798fd0a 100644
pm_runtime_disable(&pdev->dev);
list_del(&sr_info->node);
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index 6911f9662300..5e582099ebaa 100644
index a19246455c13..cc12032ee60d 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -781,6 +781,7 @@ void pwm_put(struct pwm_device *pwm)
@@ -858,6 +858,7 @@ void pwm_put(struct pwm_device *pwm)
if (pwm->chip->ops->free)
pwm->chip->ops->free(pwm->chip, pwm);
@ -1731,7 +1854,7 @@ index 8f989a95a019..fa7a89357d64 100644
static int _rtl92e_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c
index a66fb7afecc7..e13e95733fa3 100644
index 318d22529d48..d968ddd066db 100644
--- a/drivers/tty/serial/max310x.c
+++ b/drivers/tty/serial/max310x.c
@@ -763,12 +763,9 @@ static void max310x_start_tx(struct uart_port *port)
@ -1933,10 +2056,10 @@ index ce6b962ffed4..842f70fcfc48 100644
* @reset: for self-deasserting resets, does all necessary
* things to reset the device
diff --git a/include/net/sock.h b/include/net/sock.h
index 5ed4786a2058..de4434284a34 100644
index ffeea2fde415..fb1462b427d3 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1282,7 +1282,7 @@ static inline void sk_sockets_allocated_inc(struct sock *sk)
@@ -1284,7 +1284,7 @@ static inline void sk_sockets_allocated_inc(struct sock *sk)
percpu_counter_inc(prot->sockets_allocated);
}
@ -2034,7 +2157,7 @@ index 087ce1598b74..01bfe28b20a1 100644
rtnl_register(PF_UNSPEC, RTM_NEWNSID, rtnl_net_newid, NULL, NULL);
rtnl_register(PF_UNSPEC, RTM_GETNSID, rtnl_net_getid, rtnl_net_dumpid,
diff --git a/net/core/sock.c b/net/core/sock.c
index 8aa4a5f89572..0f4c15fcd87d 100644
index 8f2f5d497dc7..b6c83a0bfd3c 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2122,7 +2122,7 @@ int __sk_mem_schedule(struct sock *sk, int size, int kind)
@ -2289,3 +2412,6 @@ index 3a36d60e1785..0a5d9fb6fc84 100644
/* Some sensible defaults - this reflects the powerup values */
priv->ctl_play = KIRKWOOD_PLAYCTL_SIZE_24;
priv->ctl_rec = KIRKWOOD_RECCTL_SIZE_24;
--
Armbian

356
patch/kernel/archive/rockchip64-4.4/patch-4.4.206-207.patch
View File

@ -1,3 +1,204 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Fri, 3 Jan 2020 11:37:00 +0100
Subject: [ARCHEOLOGY] Move rockchip64 legacy to most recent kernel. Tested
with standard https://github.com/armbian/autotests stress test on RockPro64
and Rock64.
> X-Git-Archeology: - Revision 42ecf1582f83241e18ce329193c5eac66fd244de: https://github.com/armbian/build/commit/42ecf1582f83241e18ce329193c5eac66fd244de
> X-Git-Archeology: Date: Fri, 03 Jan 2020 11:37:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Move rockchip64 legacy to most recent kernel. Tested with standard https://github.com/armbian/autotests stress test on RockPro64 and Rock64.
> X-Git-Archeology:
> X-Git-Archeology: - Revision 5597ecfe073a70e11a3d832ca210471217706a0f: https://github.com/armbian/build/commit/5597ecfe073a70e11a3d832ca210471217706a0f
> X-Git-Archeology: Date: Fri, 03 Jan 2020 11:42:56 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move rockchip64 legacy to most recent kernel. Tested with standard https://github.com/armbian/autotests stress test on RockPro64 and Rock64. (#1714)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 17bb3b5075613e344faedc4093eee5ea145f1b2e: https://github.com/armbian/build/commit/17bb3b5075613e344faedc4093eee5ea145f1b2e
> X-Git-Archeology: Date: Sat, 04 Jan 2020 21:07:25 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Update RK3399 legacy to latest upstream kernel version (#1718)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
Documentation/devicetree/bindings/rtc/abracon,abx80x.txt | 2 +-
Makefile | 13 +-
arch/arm/boot/dts/exynos3250.dtsi | 2 +-
arch/arm/boot/dts/mmp2.dtsi | 2 +-
arch/arm/boot/dts/omap3-tao3530.dtsi | 2 +-
arch/arm/boot/dts/pxa27x.dtsi | 2 +-
arch/arm/boot/dts/pxa2xx.dtsi | 7 -
arch/arm/boot/dts/pxa3xx.dtsi | 2 +-
arch/arm/boot/dts/s3c6410-mini6410.dts | 4 +
arch/arm/boot/dts/s3c6410-smdk6410.dts | 4 +
arch/arm/boot/dts/sun6i-a31.dtsi | 2 +-
arch/arm/boot/dts/sun7i-a20.dtsi | 2 +-
arch/arm/include/asm/uaccess.h | 18 ++
arch/arm/lib/getuser.S | 11 ++
arch/arm/lib/putuser.S | 20 +-
arch/arm/mach-omap1/id.c | 6 +-
arch/arm/mach-omap2/id.c | 4 +-
arch/arm/mach-tegra/reset-handler.S | 6 +-
arch/mips/Kconfig | 1 +
arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c | 2 +-
arch/mips/cavium-octeon/octeon-platform.c | 2 +-
arch/mips/include/asm/octeon/cvmx-pko.h | 2 +-
arch/powerpc/include/asm/sfp-machine.h | 92 +++-------
arch/powerpc/include/asm/vdso_datapage.h | 2 +
arch/powerpc/kernel/asm-offsets.c | 2 +-
arch/powerpc/kernel/time.c | 1 +
arch/powerpc/kernel/vdso32/gettimeofday.S | 7 +-
arch/powerpc/kernel/vdso64/cacheflush.S | 4 +-
arch/powerpc/kernel/vdso64/gettimeofday.S | 7 +-
arch/x86/kernel/apic/apic.c | 25 ++-
arch/x86/kernel/cpu/mcheck/mce.c | 5 +-
arch/x86/kvm/cpuid.c | 5 +-
arch/x86/kvm/x86.c | 14 +-
arch/x86/pci/fixup.c | 11 ++
arch/xtensa/mm/tlb.c | 4 +-
block/blk-mq-sysfs.c | 15 +-
crypto/crypto_user.c | 4 +-
drivers/acpi/bus.c | 2 +-
drivers/acpi/device_pm.c | 12 +-
drivers/acpi/osl.c | 28 +--
drivers/block/rsxx/core.c | 2 +
drivers/cpuidle/driver.c | 15 +-
drivers/crypto/amcc/crypto4xx_core.c | 6 +-
drivers/dma/coh901318.c | 5 -
drivers/extcon/extcon-max8997.c | 10 +-
drivers/gpu/drm/i810/i810_dma.c | 4 +-
drivers/gpu/drm/radeon/r100.c | 4 +-
drivers/gpu/drm/radeon/r200.c | 4 +-
drivers/i2c/busses/i2c-imx.c | 3 +-
drivers/iio/humidity/hdc100x.c | 2 +-
drivers/iio/imu/adis16480.c | 1 +
drivers/infiniband/hw/mlx4/sysfs.c | 12 +-
drivers/infiniband/hw/qib/qib_sysfs.c | 6 +
drivers/input/touchscreen/cyttsp4_core.c | 7 -
drivers/input/touchscreen/goodix.c | 9 +
drivers/isdn/gigaset/usb-gigaset.c | 23 ++-
drivers/md/persistent-data/dm-btree-remove.c | 8 +-
drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 3 +-
drivers/media/radio/radio-wl1273.c | 3 +-
drivers/misc/altera-stapl/altera.c | 3 +-
drivers/mtd/devices/spear_smi.c | 38 +++-
drivers/net/can/slcan.c | 1 +
drivers/net/ethernet/cirrus/ep93xx_eth.c | 5 +-
drivers/net/ethernet/intel/e100.c | 4 +-
drivers/net/ethernet/stmicro/stmmac/common.h | 2 +-
drivers/net/ethernet/stmicro/stmmac/descs_com.h | 14 +-
drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 10 +-
drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 10 +-
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 16 +-
drivers/net/ethernet/ti/cpsw.c | 2 +-
drivers/net/wireless/ath/ar5523/ar5523.c | 3 +-
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 15 ++
drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 9 +-
drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 1 +
drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 25 ++-
drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h | 2 +
drivers/nfc/nxp-nci/i2c.c | 6 +-
drivers/pci/msi.c | 2 +-
drivers/pci/quirks.c | 2 +-
drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 23 ++-
drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 6 +-
drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 3 +
drivers/pinctrl/samsung/pinctrl-samsung.c | 10 +-
drivers/rtc/rtc-max8997.c | 2 +-
drivers/s390/scsi/zfcp_dbf.c | 8 +-
drivers/s390/scsi/zfcp_erp.c | 3 -
drivers/scsi/lpfc/lpfc.h | 3 +-
drivers/scsi/lpfc/lpfc_attr.c | 12 +-
drivers/scsi/lpfc/lpfc_init.c | 3 +
drivers/scsi/qla2xxx/qla_attr.c | 3 +-
drivers/scsi/qla2xxx/qla_bsg.c | 15 +-
drivers/scsi/qla2xxx/qla_target.c | 7 +-
drivers/spi/spi-atmel.c | 6 +-
drivers/staging/iio/addac/adt7316-i2c.c | 2 +
drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +-
drivers/staging/rtl8712/usb_intf.c | 2 +-
drivers/thermal/thermal_core.c | 4 +-
drivers/tty/serial/ifx6x60.c | 3 +
drivers/tty/serial/imx.c | 2 +-
drivers/tty/serial/msm_serial.c | 6 +-
drivers/tty/serial/serial_core.c | 2 +-
drivers/tty/vt/keyboard.c | 2 +-
drivers/usb/atm/ueagle-atm.c | 18 +-
drivers/usb/core/hub.c | 5 +-
drivers/usb/core/urb.c | 1 +
drivers/usb/gadget/configfs.c | 1 +
drivers/usb/gadget/function/u_serial.c | 2 +
drivers/usb/host/xhci-hub.c | 16 +-
drivers/usb/host/xhci-mem.c | 4 +
drivers/usb/host/xhci-pci.c | 13 ++
drivers/usb/misc/adutux.c | 2 +-
drivers/usb/misc/idmouse.c | 2 +-
drivers/usb/mon/mon_bin.c | 32 ++--
drivers/usb/serial/io_edgeport.c | 10 +-
drivers/vfio/pci/vfio_pci_intrs.c | 2 +-
drivers/video/hdmi.c | 8 +-
drivers/virtio/virtio_balloon.c | 11 ++
fs/autofs4/expire.c | 5 +-
fs/btrfs/file.c | 2 +-
fs/btrfs/free-space-cache.c | 6 +
fs/btrfs/volumes.h | 1 -
fs/cifs/file.c | 14 +-
fs/cifs/smb2misc.c | 7 +-
fs/dlm/lockspace.c | 1 +
fs/dlm/memory.c | 9 +-
fs/dlm/user.c | 3 +-
fs/fuse/dir.c | 27 ++-
fs/fuse/fuse_i.h | 2 +
fs/nfsd/nfs4recover.c | 17 +-
fs/nfsd/vfs.c | 17 +-
fs/ocfs2/quota_global.c | 2 +-
fs/proc/array.c | 18 +-
fs/quota/dquot.c | 11 +-
include/linux/acpi.h | 2 +-
include/linux/atalk.h | 2 +-
include/linux/dma-mapping.h | 3 +-
include/linux/jbd2.h | 4 +-
include/linux/netdevice.h | 5 +
include/linux/quotaops.h | 10 +
include/linux/regulator/consumer.h | 2 +-
include/linux/serial_core.h | 37 +++-
include/linux/thread_info.h | 4 +
include/linux/time.h | 12 ++
include/math-emu/soft-fp.h | 2 +-
include/net/ip.h | 5 +
include/net/tcp.h | 18 +-
kernel/cgroup_pids.c | 11 +-
kernel/module.c | 2 +
kernel/sched/fair.c | 36 ++--
kernel/workqueue.c | 38 +++-
lib/raid6/unroll.awk | 2 +-
mm/shmem.c | 2 +-
net/appletalk/aarp.c | 15 +-
net/appletalk/ddp.c | 21 ++-
net/bridge/br_device.c | 6 +
net/core/dev.c | 3 +-
net/ipv4/devinet.c | 5 -
net/ipv4/ip_output.c | 14 +-
net/ipv4/tcp_output.c | 5 +-
net/ipv4/tcp_timer.c | 2 +-
net/sunrpc/cache.c | 6 -
net/tipc/core.c | 29 +--
net/x25/af_x25.c | 18 +-
scripts/mod/modpost.c | 12 ++
sound/core/oss/linear.c | 2 +
sound/core/oss/mulaw.c | 2 +
sound/core/oss/route.c | 2 +
sound/core/pcm_lib.c | 8 +-
sound/pci/hda/hda_bind.c | 4 +
sound/pci/hda/hda_intel.c | 3 +
sound/soc/soc-jack.c | 3 +-
171 files changed, 934 insertions(+), 474 deletions(-)
diff --git a/Documentation/devicetree/bindings/rtc/abracon,abx80x.txt b/Documentation/devicetree/bindings/rtc/abracon,abx80x.txt
index be789685a1c2..18b892d010d8 100644
--- a/Documentation/devicetree/bindings/rtc/abracon,abx80x.txt
@ -9,7 +210,7 @@ index be789685a1c2..18b892d010d8 100644
- resistor, the other values are in ohm.
+ resistor, the other values are in kOhm.
diff --git a/Makefile b/Makefile
index eb4f5b889a1c..4857306a8e4c 100644
index cb06535c9ad6..2ebb6d747b92 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
@ -20,7 +221,7 @@ index eb4f5b889a1c..4857306a8e4c 100644
EXTRAVERSION =
NAME = Blurry Fish Butt
@@ -1424,9 +1424,6 @@ else # KBUILD_EXTMOD
@@ -1473,9 +1473,6 @@ else # KBUILD_EXTMOD
# We are always building modules
KBUILD_MODULES := 1
@ -30,7 +231,7 @@ index eb4f5b889a1c..4857306a8e4c 100644
PHONY += $(objtree)/Module.symvers
$(objtree)/Module.symvers:
@@ -1438,7 +1435,7 @@ $(objtree)/Module.symvers:
@@ -1487,7 +1484,7 @@ $(objtree)/Module.symvers:
module-dirs := $(addprefix _module_,$(KBUILD_EXTMOD))
PHONY += $(module-dirs) modules
@ -39,7 +240,7 @@ index eb4f5b889a1c..4857306a8e4c 100644
$(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
modules: $(module-dirs)
@@ -1478,7 +1475,8 @@ help:
@@ -1527,7 +1524,8 @@ help:
# Dummies...
PHONY += prepare scripts
@ -49,7 +250,7 @@ index eb4f5b889a1c..4857306a8e4c 100644
scripts: ;
endif # KBUILD_EXTMOD
@@ -1602,17 +1600,14 @@ endif
@@ -1652,17 +1650,14 @@ endif
# Modules
/: prepare scripts FORCE
@ -207,10 +408,10 @@ index e02eb720c4fc..a7b4dbda1a87 100644
<GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
};
diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
index 9ae610bf5234..61479ebb9869 100644
index 387a810257f7..54e439c45601 100644
--- a/arch/arm/include/asm/uaccess.h
+++ b/arch/arm/include/asm/uaccess.h
@@ -387,6 +387,13 @@ do { \
@@ -404,6 +404,13 @@ do { \
#define __get_user_asm_byte(x, addr, err) \
__get_user_asm(x, addr, err, ldrb)
@ -224,7 +425,7 @@ index 9ae610bf5234..61479ebb9869 100644
#ifndef __ARMEB__
#define __get_user_asm_half(x, __gu_addr, err) \
({ \
@@ -405,6 +412,8 @@ do { \
@@ -422,6 +429,8 @@ do { \
})
#endif
@ -233,7 +434,7 @@ index 9ae610bf5234..61479ebb9869 100644
#define __get_user_asm_word(x, addr, err) \
__get_user_asm(x, addr, err, ldr)
#endif
@@ -480,6 +489,13 @@ do { \
@@ -477,6 +486,13 @@ do { \
#define __put_user_asm_byte(x, __pu_addr, err) \
__put_user_asm(x, __pu_addr, err, strb)
@ -247,7 +448,7 @@ index 9ae610bf5234..61479ebb9869 100644
#ifndef __ARMEB__
#define __put_user_asm_half(x, __pu_addr, err) \
({ \
@@ -496,6 +512,8 @@ do { \
@@ -493,6 +509,8 @@ do { \
})
#endif
@ -398,10 +599,10 @@ index e3070fdab80b..3fe4ae654047 100644
mov32 r9, 0xc09
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 422624ca0132..596cbda9cb3d 100644
index c6ae78b81e54..29b4bde7899c 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -773,6 +773,7 @@ config SIBYTE_LITTLESUR
@@ -826,6 +826,7 @@ config SIBYTE_LITTLESUR
select SYS_SUPPORTS_BIG_ENDIAN
select SYS_SUPPORTS_HIGHMEM
select SYS_SUPPORTS_LITTLE_ENDIAN
@ -1666,10 +1867,10 @@ index 48c3456445b2..07e0c03cfb10 100644
if (disable_rx_ic)
p->des01.rx.disable_ic = 1;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index f4d6512f066c..28a6b7764044 100644
index 38f18bfcb25f..dee90a3fd620 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -964,11 +964,11 @@ static void stmmac_clear_descriptors(struct stmmac_priv *priv)
@@ -962,11 +962,11 @@ static void stmmac_clear_descriptors(struct stmmac_priv *priv)
if (priv->extend_desc)
priv->hw->desc->init_rx_desc(&priv->dma_erx[i].basic,
priv->use_riwt, priv->mode,
@ -1683,7 +1884,7 @@ index f4d6512f066c..28a6b7764044 100644
for (i = 0; i < txsize; i++)
if (priv->extend_desc)
priv->hw->desc->init_tx_desc(&priv->dma_etx[i].basic,
@@ -2176,8 +2176,7 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv)
@@ -2179,8 +2179,7 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv)
static int stmmac_rx(struct stmmac_priv *priv, int limit)
{
unsigned int rxsize = priv->dma_rx_size;
@ -1693,7 +1894,7 @@ index f4d6512f066c..28a6b7764044 100644
unsigned int count = 0;
int coe = priv->hw->rx_csum;
@@ -2189,9 +2188,11 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
@@ -2192,9 +2191,11 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
stmmac_display_ring((void *)priv->dma_rx, rxsize, 0);
}
while (count < limit) {
@ -1706,7 +1907,7 @@ index f4d6512f066c..28a6b7764044 100644
if (priv->extend_desc)
p = (struct dma_desc *)(priv->dma_erx + entry);
else
@@ -2239,7 +2240,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
@@ -2242,7 +2243,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
/* check if frame_len fits the preallocated memory */
if (frame_len > priv->dma_buf_sz) {
priv->dev->stats.rx_length_errors++;
@ -1715,7 +1916,7 @@ index f4d6512f066c..28a6b7764044 100644
}
/* ACS is set; GMAC core strips PAD/FCS for IEEE 802.3
@@ -2260,7 +2261,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
@@ -2263,7 +2264,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
pr_err("%s: Inconsistent Rx descriptor chain\n",
priv->dev->name);
priv->dev->stats.rx_dropped++;
@ -1724,7 +1925,7 @@ index f4d6512f066c..28a6b7764044 100644
}
prefetch(skb->data - NET_IP_ALIGN);
priv->rx_skbuff[entry] = NULL;
@@ -2291,7 +2292,6 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
@@ -2294,7 +2295,6 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
priv->dev->stats.rx_packets++;
priv->dev->stats.rx_bytes += frame_len;
}
@ -1944,7 +2145,7 @@ index 36c6f3702167..83ad32b07cc3 100644
#define INTEL_UPDCR_REG_MASK 0x3f
diff --git a/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c b/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c
index b1e8a2d905ff..a0904e426c73 100644
index d08ced5bc690..e1949c1f0109 100644
--- a/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c
+++ b/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c
@@ -755,12 +755,23 @@ static int pm8xxx_gpio_probe(struct platform_device *pdev)
@ -2037,7 +2238,7 @@ index 43407ab248f5..0cd9f3a7bb11 100644
bank = d->pin_banks;
for (i = 0; i < d->nr_banks; ++i, ++bank) {
diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c
index 3f622ccd8eab..2f5252d4663b 100644
index bb4db2050f19..6db3842103e6 100644
--- a/drivers/pinctrl/samsung/pinctrl-samsung.c
+++ b/drivers/pinctrl/samsung/pinctrl-samsung.c
@@ -286,6 +286,7 @@ static int samsung_dt_node_to_map(struct pinctrl_dev *pctldev,
@ -2327,7 +2528,7 @@ index c71333fbe823..a6167cab0099 100644
pdvobjpriv->nr_endpoint = piface_desc->bNumEndpoints;
if (pusbd->speed == USB_SPEED_HIGH) {
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 929092fc25ef..a6df07786362 100644
index dd72e347d171..10754edc9058 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -402,7 +402,7 @@ static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,
@ -2339,7 +2540,7 @@ index 929092fc25ef..a6df07786362 100644
}
static void monitor_thermal_zone(struct thermal_zone_device *tz)
@@ -2002,7 +2002,7 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz)
@@ -2061,7 +2061,7 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz)
mutex_unlock(&thermal_list_lock);
@ -2400,10 +2601,10 @@ index eaeb098b5d6a..03cac2183579 100644
/* Disable DM modes */
if (msm_port->is_uartdm)
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index def5199ca004..54122db81de4 100644
index 87625fac702c..aab71ad77a17 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -1015,7 +1015,7 @@ static int uart_break_ctl(struct tty_struct *tty, int break_state)
@@ -1018,7 +1018,7 @@ static int uart_break_ctl(struct tty_struct *tty, int break_state)
mutex_lock(&port->mutex);
@ -2492,10 +2693,10 @@ index a2ae88dbda78..57f3c4bcd598 100644
goto error_rm_grp;
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 11881c5a1fb0..7805f3e535ec 100644
index 2e3d0e7cb1c6..4fcbf5f3b835 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -5554,7 +5554,7 @@ re_enumerate_no_bos:
@@ -5573,7 +5573,7 @@ re_enumerate_no_bos:
/**
* usb_reset_device - warn interface drivers and perform a USB port reset
@ -2504,7 +2705,7 @@ index 11881c5a1fb0..7805f3e535ec 100644
*
* Warns all drivers bound to registered interfaces (using their pre_reset
* method), performs the port reset, and then lets the drivers know that
@@ -5582,8 +5582,7 @@ int usb_reset_device(struct usb_device *udev)
@@ -5601,8 +5601,7 @@ int usb_reset_device(struct usb_device *udev)
struct usb_host_config *config = udev->actconfig;
struct usb_hub *hub = usb_hub_to_struct_hub(udev->parent);
@ -2527,10 +2728,10 @@ index e43ef7d2d00e..d6fcead91b32 100644
}
}
diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
index f91a43140694..d193e95f5889 100644
index ef05801a84db..d27f31baa677 100644
--- a/drivers/usb/gadget/configfs.c
+++ b/drivers/usb/gadget/configfs.c
@@ -1542,6 +1542,7 @@ static struct config_group *gadgets_make(
@@ -1792,6 +1792,7 @@ static struct config_group *gadgets_make(
gi->composite.resume = NULL;
gi->composite.max_speed = USB_SPEED_SUPER;
@ -2554,10 +2755,10 @@ index d73618475664..31e08bb3cb41 100644
goto err;
}
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index 421825b44202..40c95ed6afbf 100644
index 56ac5135f901..60238f3770ae 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -704,7 +704,7 @@ static u32 xhci_get_port_status(struct usb_hcd *hcd,
@@ -707,7 +707,7 @@ static u32 xhci_get_port_status(struct usb_hcd *hcd,
struct xhci_bus_state *bus_state,
__le32 __iomem **port_array,
u16 wIndex, u32 raw_port_status,
@ -2566,7 +2767,7 @@ index 421825b44202..40c95ed6afbf 100644
__releases(&xhci->lock)
__acquires(&xhci->lock)
{
@@ -736,6 +736,14 @@ static u32 xhci_get_port_status(struct usb_hcd *hcd,
@@ -739,6 +739,14 @@ static u32 xhci_get_port_status(struct usb_hcd *hcd,
status |= USB_PORT_STAT_C_BH_RESET << 16;
if ((raw_port_status & PORT_CEC))
status |= USB_PORT_STAT_C_CONFIG_ERROR << 16;
@ -2581,7 +2782,7 @@ index 421825b44202..40c95ed6afbf 100644
}
if (hcd->speed < HCD_USB3) {
@@ -786,12 +794,12 @@ static u32 xhci_get_port_status(struct usb_hcd *hcd,
@@ -789,12 +797,12 @@ static u32 xhci_get_port_status(struct usb_hcd *hcd,
xhci_set_link_state(xhci, port_array, wIndex,
XDEV_U0);
@ -2596,7 +2797,7 @@ index 421825b44202..40c95ed6afbf 100644
if (time_left) {
slot_id = xhci_find_slot_id_by_port(hcd,
@@ -937,7 +945,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
@@ -940,7 +948,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
break;
}
status = xhci_get_port_status(hcd, bus_state, port_array,
@ -2606,10 +2807,10 @@ index 421825b44202..40c95ed6afbf 100644
goto error;
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 0ec809a35a3f..f274e7e4e659 100644
index c93db95b2739..85f2d1df262e 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -1928,10 +1928,14 @@ no_bw:
@@ -1938,10 +1938,14 @@ no_bw:
kfree(xhci->port_array);
kfree(xhci->rh_bw);
kfree(xhci->ext_caps);
@ -2792,10 +2993,10 @@ index 5c8f767b6368..f7d48661aa94 100644
eventfd_ctx_put(vdev->ctx[vector].trigger);
vdev->ctx[vector].trigger = NULL;
diff --git a/drivers/video/hdmi.c b/drivers/video/hdmi.c
index b73520aaf697..2e325fea4446 100644
index d28346df68f5..707c9b7385c8 100644
--- a/drivers/video/hdmi.c
+++ b/drivers/video/hdmi.c
@@ -1032,12 +1032,12 @@ static int hdmi_avi_infoframe_unpack(struct hdmi_avi_infoframe *frame,
@@ -1174,12 +1174,12 @@ static int hdmi_avi_infoframe_unpack(struct hdmi_avi_infoframe *frame,
if (ptr[0] & 0x10)
frame->active_aspect = ptr[1] & 0xf;
if (ptr[0] & 0x8) {
@ -3035,7 +3236,7 @@ index dd2b7416e40a..761d74a84f92 100644
&lockspace);
if (error)
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 7d7081619f6e..485a5531c68c 100644
index 18c5f3c58d65..3bc6e1990e64 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -240,7 +240,8 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags)
@ -3048,7 +3249,7 @@ index 7d7081619f6e..485a5531c68c 100644
goto invalid;
fuse_change_attributes(inode, &outarg.attr,
@@ -282,6 +283,12 @@ int fuse_valid_type(int m)
@@ -327,6 +328,12 @@ int fuse_valid_type(int m)
S_ISBLK(m) || S_ISFIFO(m) || S_ISSOCK(m);
}
@ -3061,7 +3262,7 @@ index 7d7081619f6e..485a5531c68c 100644
int fuse_lookup_name(struct super_block *sb, u64 nodeid, struct qstr *name,
struct fuse_entry_out *outarg, struct inode **inode)
{
@@ -313,7 +320,7 @@ int fuse_lookup_name(struct super_block *sb, u64 nodeid, struct qstr *name,
@@ -358,7 +365,7 @@ int fuse_lookup_name(struct super_block *sb, u64 nodeid, struct qstr *name,
err = -EIO;
if (!outarg->nodeid)
goto out_put_forget;
@ -3070,7 +3271,7 @@ index 7d7081619f6e..485a5531c68c 100644
goto out_put_forget;
*inode = fuse_iget(sb, outarg->nodeid, outarg->generation,
@@ -433,7 +440,8 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry,
@@ -478,7 +485,8 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry,
goto out_free_ff;
err = -EIO;
@ -3080,7 +3281,7 @@ index 7d7081619f6e..485a5531c68c 100644
goto out_free_ff;
ff->fh = outopen.fh;
@@ -539,7 +547,7 @@ static int create_new_entry(struct fuse_conn *fc, struct fuse_args *args,
@@ -584,7 +592,7 @@ static int create_new_entry(struct fuse_conn *fc, struct fuse_args *args,
goto out_put_forget_req;
err = -EIO;
@ -3089,7 +3290,7 @@ index 7d7081619f6e..485a5531c68c 100644
goto out_put_forget_req;
if ((outarg.attr.mode ^ mode) & S_IFMT)
@@ -812,7 +820,8 @@ static int fuse_link(struct dentry *entry, struct inode *newdir,
@@ -857,7 +865,8 @@ static int fuse_link(struct dentry *entry, struct inode *newdir,
spin_lock(&fc->lock);
fi->attr_version = ++fc->attr_version;
@ -3099,7 +3300,7 @@ index 7d7081619f6e..485a5531c68c 100644
spin_unlock(&fc->lock);
fuse_invalidate_attr(inode);
fuse_update_ctime(inode);
@@ -892,7 +901,8 @@ static int fuse_do_getattr(struct inode *inode, struct kstat *stat,
@@ -937,7 +946,8 @@ static int fuse_do_getattr(struct inode *inode, struct kstat *stat,
args.out.args[0].value = &outarg;
err = fuse_simple_request(fc, &args);
if (!err) {
@ -3109,7 +3310,7 @@ index 7d7081619f6e..485a5531c68c 100644
make_bad_inode(inode);
err = -EIO;
} else {
@@ -1197,7 +1207,7 @@ static int fuse_direntplus_link(struct file *file,
@@ -1242,7 +1252,7 @@ static int fuse_direntplus_link(struct file *file,
if (invalid_nodeid(o->nodeid))
return -EIO;
@ -3118,7 +3319,7 @@ index 7d7081619f6e..485a5531c68c 100644
return -EIO;
fc = get_fuse_conn(dir);
@@ -1669,7 +1679,8 @@ int fuse_do_setattr(struct inode *inode, struct iattr *attr,
@@ -1714,7 +1724,8 @@ int fuse_do_setattr(struct inode *inode, struct iattr *attr,
goto error;
}
@ -3129,10 +3330,10 @@ index 7d7081619f6e..485a5531c68c 100644
err = -EIO;
goto error;
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index c6eb35a95fcc..88440072fa4f 100644
index d40fad13cf43..ada567291a85 100644
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -887,6 +887,8 @@ void fuse_ctl_remove_conn(struct fuse_conn *fc);
@@ -890,6 +890,8 @@ void fuse_ctl_remove_conn(struct fuse_conn *fc);
*/
int fuse_valid_type(int m);
@ -3316,10 +3517,10 @@ index 1cb1d02c5937..7430cb0e21a7 100644
/* Dirty and inactive can be only bad dquot... */
if (!test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) {
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 6a30f1e03aa9..0bd0a9ad5455 100644
index 09c94fab7f8c..8ce70aaf487a 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -75,7 +75,7 @@ static inline bool has_acpi_companion(struct device *dev)
@@ -78,7 +78,7 @@ static inline bool has_acpi_companion(struct device *dev)
static inline void acpi_preset_companion(struct device *dev,
struct acpi_device *parent, u64 addr)
{
@ -3415,10 +3616,10 @@ index 1f350238445c..a946c4c1a77e 100644
int dquot_scan_active(struct super_block *sb,
int (*fn)(struct dquot *dquot, unsigned long priv),
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 9e0e76992be0..bf62713af290 100644
index 48603506f8de..b3cb98a1ed9b 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -485,7 +485,7 @@ static inline unsigned int regulator_get_mode(struct regulator *regulator)
@@ -488,7 +488,7 @@ static inline unsigned int regulator_get_mode(struct regulator *regulator)
static inline int regulator_set_load(struct regulator *regulator, int load_uA)
{
@ -3428,10 +3629,10 @@ index 9e0e76992be0..bf62713af290 100644
static inline int regulator_allow_bypass(struct regulator *regulator,
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 297d4fa1cfe5..b5b527efeea0 100644
index 0afc11f8f300..5685a2ca38d2 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -159,6 +159,7 @@ struct uart_port {
@@ -160,6 +160,7 @@ struct uart_port {
struct console *cons; /* struct console, if any */
#if defined(CONFIG_SERIAL_CORE_CONSOLE) || defined(SUPPORT_SYSRQ)
unsigned long sysrq; /* sysrq timeout */
@ -3439,7 +3640,7 @@ index 297d4fa1cfe5..b5b527efeea0 100644
#endif
/* flags must be updated while holding port mutex */
@@ -440,8 +441,42 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch)
@@ -441,8 +442,42 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch)
}
return 0;
}
@ -3484,20 +3685,20 @@ index 297d4fa1cfe5..b5b527efeea0 100644
/*
diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
index 646891f3bc1e..897e835379d8 100644
index 25f861ecb195..27c9fa216be7 100644
--- a/include/linux/thread_info.h
+++ b/include/linux/thread_info.h
@@ -13,6 +13,10 @@
struct timespec;
struct compat_timespec;
@@ -28,6 +28,10 @@
#define THREADINFO_GFP (GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO)
+#ifdef CONFIG_THREAD_INFO_IN_TASK
+#define current_thread_info() ((struct thread_info *)current)
+#endif
+
/*
* System call restart block.
*/
* flag set/clear/test wrappers
* - pass TIF_xxxx constants to these functions
diff --git a/include/linux/time.h b/include/linux/time.h
index 297f09f23896..62cc50700004 100644
--- a/include/linux/time.h
@ -3533,10 +3734,10 @@ index 3f284bc03180..5650c1628383 100644
#define _FP_ROUND_PINF(wc, X) \
do { \
diff --git a/include/net/ip.h b/include/net/ip.h
index e2320f9e4d3e..6067b7a10ccd 100644
index 2a1b897f1e79..f3663df28c81 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -596,4 +596,9 @@ extern int sysctl_icmp_msgs_burst;
@@ -597,4 +597,9 @@ extern int sysctl_icmp_msgs_burst;
int ip_misc_proc_init(void);
#endif
@ -3547,10 +3748,10 @@ index e2320f9e4d3e..6067b7a10ccd 100644
+
#endif /* _IP_H */
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 4447195a0cd4..3bdd6ef95717 100644
index e9b705a4f66e..d4a26c60ab5a 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -502,19 +502,27 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb);
@@ -503,19 +503,27 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb);
*/
static inline void tcp_synq_overflow(const struct sock *sk)
{
@ -3641,10 +3842,10 @@ index b50d5a167fda..ea8cb03dbf72 100644
if (limit >= PIDS_MAX)
seq_printf(sf, "%s\n", PIDS_MAX_STR);
diff --git a/kernel/module.c b/kernel/module.c
index b940b2825b7b..2f695b6e1a3e 100644
index 5079d1fa9545..ce94580f1075 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1014,6 +1014,8 @@ SYSCALL_DEFINE2(delete_module, const char __user *, name_user,
@@ -990,6 +990,8 @@ SYSCALL_DEFINE2(delete_module, const char __user *, name_user,
strlcpy(last_unloaded_module, mod->name, sizeof(last_unloaded_module));
free_module(mod);
@ -3654,10 +3855,10 @@ index b940b2825b7b..2f695b6e1a3e 100644
out:
mutex_unlock(&module_mutex);
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index d012681fb1ab..b42d2b8b283e 100644
index 5132278cfa0b..7e9d0b9a0f43 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -4055,20 +4055,28 @@ static enum hrtimer_restart sched_cfs_period_timer(struct hrtimer *timer)
@@ -4517,20 +4517,28 @@ static enum hrtimer_restart sched_cfs_period_timer(struct hrtimer *timer)
if (++count > 3) {
u64 new, old = ktime_to_ns(cfs_b->period);
@ -3787,7 +3988,7 @@ index c6aa03631df8..0809805a7e23 100644
print tmp
}
diff --git a/mm/shmem.c b/mm/shmem.c
index e40239bf6dfe..07abbdfb1d22 100644
index c00b36661d08..4cce6ff6e9d3 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2092,7 +2092,7 @@ static long shmem_fallocate(struct file *file, int mode, loff_t offset,
@ -3889,10 +4090,10 @@ index e23bf739492c..ace94170f55e 100644
out_proto:
proto_unregister(&ddp_proto);
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 2c8095a5d824..3d462fee9ed7 100644
index 0346c215ff6a..8d013fed5298 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -199,6 +199,12 @@ static int br_set_mac_address(struct net_device *dev, void *p)
@@ -200,6 +200,12 @@ static int br_set_mac_address(struct net_device *dev, void *p)
if (!is_valid_ether_addr(addr->sa_data))
return -EADDRNOTAVAIL;
@ -3936,7 +4137,7 @@ index 4472329f5f47..dbbe6f051a92 100644
struct in_device *in_dev)
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 6d5a0a7ebe10..d940c9e0eb02 100644
index c2380bb1fdab..3526024f1825 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1145,13 +1145,17 @@ static int ip_setup_cork(struct sock *sk, struct inet_cork *cork,
@ -3963,7 +4164,7 @@ index 6d5a0a7ebe10..d940c9e0eb02 100644
cork->ttl = ipc->ttl;
cork->tos = ipc->tos;
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 76ffce0c18ae..913c7fb51b18 100644
index e65c211d3f4b..74ea82de9dc5 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -710,8 +710,9 @@ static unsigned int tcp_established_options(struct sock *sk, struct sk_buff *skb
@ -4269,3 +4470,6 @@ index fbaa1bb41102..00d7902ad427 100644
dapm = &jack->card->dapm;
--
Armbian

215
patch/kernel/archive/rockchip64-4.4/patch-4.4.207-208.patch
View File

@ -1,5 +1,161 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Sat, 4 Jan 2020 18:35:35 +0100
Subject: [ARCHEOLOGY] Rockhip-legacy: add upstream patch
> X-Git-Archeology: - Revision 9b5fd3713fb6d62b589ac2289af7e36d4e7042e7: https://github.com/armbian/build/commit/9b5fd3713fb6d62b589ac2289af7e36d4e7042e7
> X-Git-Archeology: Date: Sat, 04 Jan 2020 18:35:35 +0100
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Rockhip-legacy: add upstream patch
> X-Git-Archeology:
> X-Git-Archeology: - Revision 17bb3b5075613e344faedc4093eee5ea145f1b2e: https://github.com/armbian/build/commit/17bb3b5075613e344faedc4093eee5ea145f1b2e
> X-Git-Archeology: Date: Sat, 04 Jan 2020 21:07:25 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Update RK3399 legacy to latest upstream kernel version (#1718)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
Makefile | 2 +-
arch/arm/boot/compressed/libfdt_env.h | 4 +-
arch/arm64/kernel/psci.c | 15 +-
arch/powerpc/boot/libfdt_env.h | 2 +
arch/powerpc/kernel/irq.c | 4 +-
arch/powerpc/kernel/security.c | 21 +--
arch/powerpc/kernel/time.c | 2 +-
arch/powerpc/platforms/pseries/cmm.c | 5 +
arch/s390/kernel/perf_cpum_sf.c | 17 +-
arch/sh/include/cpu-sh4/cpu/sh7734.h | 2 +-
arch/x86/include/asm/crash.h | 2 +
arch/x86/include/asm/fixmap.h | 2 +-
arch/x86/kernel/apic/io_apic.c | 9 +-
arch/x86/mm/pgtable.c | 4 +-
drivers/ata/libata-core.c | 3 +
drivers/cdrom/cdrom.c | 12 +-
drivers/char/hw_random/omap3-rom-rng.c | 3 +-
drivers/clk/pxa/clk-pxa27x.c | 1 +
drivers/clk/qcom/clk-rcg2.c | 2 +
drivers/clk/qcom/common.c | 3 +
drivers/clocksource/asm9260_timer.c | 4 +
drivers/cpufreq/cpufreq.c | 7 +
drivers/crypto/sunxi-ss/sun4i-ss-hash.c | 12 +-
drivers/crypto/vmx/Makefile | 6 +-
drivers/edac/ghes_edac.c | 10 +-
drivers/extcon/extcon-sm5502.c | 4 +
drivers/extcon/extcon-sm5502.h | 2 +
drivers/gpio/gpio-mpc8xxx.c | 3 +-
drivers/gpu/drm/gma500/oaktrail_crtc.c | 2 +
drivers/hid/hid-core.c | 4 +
drivers/iio/adc/max1027.c | 8 +
drivers/iio/light/bh1750.c | 4 +-
drivers/infiniband/ulp/iser/iscsi_iser.c | 1 +
drivers/input/touchscreen/atmel_mxt_ts.c | 4 +
drivers/iommu/tegra-smmu.c | 11 +-
drivers/irqchip/irq-bcm7038-l1.c | 4 +
drivers/irqchip/irq-ingenic.c | 15 +-
drivers/md/bcache/btree.c | 2 +
drivers/media/i2c/ov2659.c | 18 ++-
drivers/media/i2c/soc_camera/ov6650.c | 9 +-
drivers/media/platform/am437x/am437x-vpfe.c | 4 +
drivers/media/platform/ti-vpe/vpe.c | 16 +-
drivers/media/radio/si470x/radio-si470x-i2c.c | 2 +
drivers/media/usb/b2c2/flexcop-usb.c | 8 +-
drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 9 +-
drivers/mmc/host/sdhci-of-esdhc.c | 4 +-
drivers/mmc/host/sdhci.c | 6 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 16 +-
drivers/net/ethernet/hisilicon/hip04_eth.c | 2 +-
drivers/net/ethernet/qlogic/qla3xxx.c | 8 +-
drivers/net/ethernet/ti/davinci_cpdma.c | 12 +-
drivers/net/fjes/fjes_main.c | 3 +
drivers/net/hamradio/6pack.c | 4 +-
drivers/net/hamradio/mkiss.c | 4 +-
drivers/net/phy/phy_device.c | 4 +-
drivers/net/usb/lan78xx.c | 1 +
drivers/net/wireless/ath/ath10k/txrx.c | 2 +
drivers/net/wireless/iwlwifi/dvm/led.c | 3 +
drivers/net/wireless/iwlwifi/mvm/led.c | 3 +
drivers/net/wireless/mwifiex/pcie.c | 5 +-
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 2 +
drivers/net/wireless/realtek/rtlwifi/usb.c | 5 +-
drivers/parport/share.c | 21 +++
drivers/pinctrl/sh-pfc/pfc-sh7734.c | 4 +-
drivers/platform/x86/hp-wmi.c | 2 +-
drivers/regulator/max8907-regulator.c | 15 +-
drivers/scsi/csiostor/csio_lnode.c | 15 +-
drivers/scsi/lpfc/lpfc_els.c | 2 +-
drivers/scsi/lpfc/lpfc_nportdisc.c | 4 +-
drivers/scsi/lpfc/lpfc_sli.c | 15 +-
drivers/scsi/mpt3sas/mpt3sas_ctl.c | 3 +-
drivers/scsi/pm8001/pm80xx_hwi.c | 2 +
drivers/scsi/scsi_trace.c | 11 +-
drivers/scsi/ufs/ufshcd.c | 2 +-
drivers/spi/spi-img-spfi.c | 2 +
drivers/spi/spi-pxa2xx.c | 6 +
drivers/spi/spi-tegra20-slink.c | 5 +-
drivers/spi/spidev.c | 3 +
drivers/staging/comedi/drivers/gsc_hpdi.c | 10 ++
drivers/staging/fbtft/fbtft-core.c | 2 +-
drivers/staging/rtl8188eu/core/rtw_xmit.c | 4 +-
drivers/target/iscsi/iscsi_target.c | 10 +-
drivers/target/iscsi/iscsi_target_auth.c | 2 +-
drivers/usb/host/ehci-q.c | 13 +-
drivers/usb/host/xhci-pci.c | 2 +-
drivers/usb/renesas_usbhs/common.h | 3 +-
drivers/usb/renesas_usbhs/mod_gadget.c | 12 +-
drivers/usb/usbip/vhci_rx.c | 13 +-
fs/btrfs/ctree.c | 2 +-
fs/btrfs/disk-io.c | 2 +-
fs/btrfs/extent_io.c | 6 +-
fs/btrfs/inode.c | 1 -
fs/btrfs/ioctl.c | 10 +-
fs/btrfs/relocation.c | 1 +
fs/btrfs/tests/qgroup-tests.c | 4 +-
fs/btrfs/uuid-tree.c | 2 +
fs/ext4/dir.c | 5 +
fs/ext4/namei.c | 11 +-
fs/jbd2/commit.c | 4 +-
fs/ocfs2/acl.c | 4 +-
fs/quota/dquot.c | 29 ++--
fs/readdir.c | 40 +++++
include/drm/drm_dp_mst_helper.h | 2 +-
include/linux/hrtimer.h | 14 +-
include/linux/libfdt_env.h | 3 +
include/linux/mod_devicetable.h | 4 +-
include/linux/quota.h | 2 +-
include/net/dst.h | 2 +-
include/scsi/iscsi_proto.h | 1 +
kernel/sysctl.c | 2 +-
kernel/time/hrtimer.c | 11 +-
lib/dma-debug.c | 1 +
net/bluetooth/hci_core.c | 9 +-
net/bridge/br_netfilter_hooks.c | 3 +
net/bridge/netfilter/ebtables.c | 33 ++--
net/ipv4/icmp.c | 11 +-
net/ipv4/tcp_output.c | 8 +
net/nfc/nci/uart.c | 2 +-
net/packet/af_packet.c | 3 +-
net/sctp/protocol.c | 4 +
samples/pktgen/functions.sh | 17 +-
scripts/kallsyms.c | 2 +
sound/core/pcm_native.c | 4 +
sound/pci/hda/hda_controller.c | 2 +-
sound/pci/hda/patch_ca0132.c | 7 +-
sound/soc/codecs/rt5677.c | 1 +
tools/lib/traceevent/parse-filter.c | 9 +-
tools/perf/builtin-report.c | 7 +
tools/perf/util/dwarf-aux.c | 80 ++++++++--
tools/perf/util/dwarf-aux.h | 3 +
tools/perf/util/perf_regs.h | 2 +-
tools/perf/util/probe-finder.c | 43 ++++-
tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c | 1 -
133 files changed, 725 insertions(+), 240 deletions(-)
diff --git a/Makefile b/Makefile
index 4857306a8e4c..84d74ea25d70 100644
index 2ebb6d747b92..357e59b10913 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
@ -30,10 +186,10 @@ index 005bf4ff1b4c..f3ddd4f599e3 100644
typedef __be16 fdt16_t;
typedef __be32 fdt32_t;
diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c
index f67f35b6edb1..e6ad81556575 100644
index 665ae9b29e9a..f8f1b74cbce6 100644
--- a/arch/arm64/kernel/psci.c
+++ b/arch/arm64/kernel/psci.c
@@ -151,7 +151,8 @@ static void cpu_psci_cpu_die(unsigned int cpu)
@@ -85,7 +85,8 @@ static void cpu_psci_cpu_die(unsigned int cpu)
static int cpu_psci_cpu_kill(unsigned int cpu)
{
@ -43,7 +199,7 @@ index f67f35b6edb1..e6ad81556575 100644
if (!psci_ops.affinity_info)
return 0;
@@ -161,16 +162,18 @@ static int cpu_psci_cpu_kill(unsigned int cpu)
@@ -95,16 +96,18 @@ static int cpu_psci_cpu_kill(unsigned int cpu)
* while it is dying. So, try again a few times.
*/
@ -433,10 +589,10 @@ index 217438d39eb3..38a28240f84f 100644
ret = clk_prepare_enable(clk);
if (ret)
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 2239d42bdadd..49aa58e617db 100644
index c7994818c36a..7c5ab6dfe552 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -2426,6 +2426,13 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
@@ -2528,6 +2528,13 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
if (cpufreq_disabled())
return -ENODEV;
@ -607,7 +763,7 @@ index 1048f0c7c6ce..31e0899035f9 100644
for (clock.m = limit->m.min; clock.m <= limit->m.max; clock.m++) {
for (clock.p1 = limit->p1.min; clock.p1 <= limit->p1.max;
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index c60bb6f8eceb..7cd945575463 100644
index 4c9a8b899140..bb7489621182 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -761,6 +761,10 @@ static void hid_scan_feature_usage(struct hid_parser *parser, u32 usage)
@ -806,7 +962,7 @@ index 05aa3ac1381b..5c93582c71cc 100644
i = 0;
diff --git a/drivers/media/i2c/ov2659.c b/drivers/media/i2c/ov2659.c
index fadec1d70582..6eefb8bbb5b5 100644
index 0d6837d2481a..c4661963e231 100644
--- a/drivers/media/i2c/ov2659.c
+++ b/drivers/media/i2c/ov2659.c
@@ -419,10 +419,14 @@ static struct sensor_register ov2659_720p[] = {
@ -881,10 +1037,10 @@ index 4e19f5e5d8cf..bb55ddfbf733 100644
if (!ret) {
mf->colorspace = priv->colorspace;
diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/platform/am437x/am437x-vpfe.c
index 572bc043b62d..36add3c463f7 100644
index 9b93c5c7d130..79925496f2c5 100644
--- a/drivers/media/platform/am437x/am437x-vpfe.c
+++ b/drivers/media/platform/am437x/am437x-vpfe.c
@@ -1847,6 +1847,10 @@ static int vpfe_s_std(struct file *file, void *priv, v4l2_std_id std_id)
@@ -1848,6 +1848,10 @@ static int vpfe_s_std(struct file *file, void *priv, v4l2_std_id std_id)
if (!(sdinfo->inputs[0].capabilities & V4L2_IN_CAP_STD))
return -ENODATA;
@ -1032,7 +1188,7 @@ index 356b294c93c9..e78e7a874856 100644
if (of_device_is_compatible(np, "fsl,p5040-esdhc") ||
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 1d6dfde1104d..2bae0214528b 100644
index 071bd4bbc67b..fa7f91695d2e 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1452,9 +1452,7 @@ void sdhci_set_uhs_signaling(struct sdhci_host *host, unsigned timing)
@ -1657,10 +1813,10 @@ index 08bb47b53bc3..551fd0329bca 100644
return ret;
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 504d36796152..fcf5141bf950 100644
index aa5a1deef07e..a36064664f3f 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -1809,10 +1809,10 @@ static int ufshcd_query_descriptor(struct ufs_hba *hba,
@@ -1821,10 +1821,10 @@ static int ufshcd_query_descriptor(struct ufs_hba *hba,
goto out_unlock;
}
@ -1734,7 +1890,7 @@ index af2880d0c112..cf2a329fd895 100644
if (tspi->tx_dma_chan)
tegra_slink_deinit_dma_param(tspi, false);
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index c5f1045561ac..3709088d4d24 100644
index f41813a5086e..eb43d60162a3 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -662,6 +662,9 @@ static int spidev_release(struct inode *inode, struct file *filp)
@ -2017,10 +2173,10 @@ index 78722aaffecd..d50fc503f73b 100644
static int cleaner_kthread(void *arg)
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index a18f558b4477..6f5563ca70c1 100644
index 315f21191643..7a5e2631a2f1 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -4948,12 +4948,14 @@ struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info,
@@ -4937,12 +4937,14 @@ struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info,
return eb;
eb = alloc_dummy_extent_buffer(fs_info, start);
if (!eb)
@ -2379,7 +2535,7 @@ index f356f9716474..674472ac067a 100644
struct drm_dp_sideband_msg_req_body {
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 2ead22dd74a0..07fd2f4f9a06 100644
index c98c6539e2c2..a875dcf0044a 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -424,12 +424,18 @@ extern u64 hrtimer_get_next_event(void);
@ -2474,10 +2630,10 @@ index c1260d80ef30..1a2ae0862e23 100644
/* Max. number of Key=Value pairs in a text message */
#define MAX_KEY_VALUE_PAIRS 8192
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 24c7fe8608d0..c2dddd335d06 100644
index d3099406991e..1b84669dd9d5 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1357,7 +1357,7 @@ static struct ctl_table vm_table[] = {
@@ -1417,7 +1417,7 @@ static struct ctl_table vm_table[] = {
.procname = "drop_caches",
.data = &sysctl_drop_caches,
.maxlen = sizeof(int),
@ -2487,10 +2643,10 @@ index 24c7fe8608d0..c2dddd335d06 100644
.extra1 = &one,
.extra2 = &four,
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 8c4e27cbfe7f..1f7ad2666108 100644
index 8d2e7074860b..1879ba35d8f5 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -887,7 +887,8 @@ static int enqueue_hrtimer(struct hrtimer *timer,
@@ -888,7 +888,8 @@ static int enqueue_hrtimer(struct hrtimer *timer,
base->cpu_base->active_bases |= 1 << base->index;
@ -2500,7 +2656,7 @@ index 8c4e27cbfe7f..1f7ad2666108 100644
return timerqueue_add(&base->active, &timer->node);
}
@@ -909,7 +910,8 @@ static void __remove_hrtimer(struct hrtimer *timer,
@@ -910,7 +911,8 @@ static void __remove_hrtimer(struct hrtimer *timer,
struct hrtimer_cpu_base *cpu_base = base->cpu_base;
u8 state = timer->state;
@ -2510,7 +2666,7 @@ index 8c4e27cbfe7f..1f7ad2666108 100644
if (!(state & HRTIMER_STATE_ENQUEUED))
return;
@@ -936,8 +938,9 @@ static void __remove_hrtimer(struct hrtimer *timer,
@@ -937,8 +939,9 @@ static void __remove_hrtimer(struct hrtimer *timer,
static inline int
remove_hrtimer(struct hrtimer *timer, struct hrtimer_clock_base *base, bool restart)
{
@ -2663,7 +2819,7 @@ index d9471e3ef216..fd1af7cb960d 100644
}
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index d0ec8a997210..031945bead36 100644
index a51f0dd6a49e..1e0850674fdf 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -256,10 +256,11 @@ bool icmp_global_allow(void)
@ -2699,7 +2855,7 @@ index d0ec8a997210..031945bead36 100644
return rc;
}
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 913c7fb51b18..6c8966dcf612 100644
index 74ea82de9dc5..6086718958d9 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2148,6 +2148,14 @@ static bool tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle,
@ -2844,10 +3000,10 @@ index d117c68d1607..b92b704e7ace 100644
}
table_cnt = pos;
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 252392abd1b9..b9bfbf394959 100644
index 09b74f73952f..cd375f864fbd 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -587,6 +587,10 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream,
@@ -596,6 +596,10 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream,
while (runtime->boundary * 2 <= LONG_MAX - runtime->buffer_size)
runtime->boundary *= 2;
@ -2908,7 +3064,7 @@ index c0742ee11519..c05119a3e13b 100644
static void hp_callback(struct hda_codec *codec, struct hda_jack_callback *cb)
diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c
index 69d987a9935c..90f8173123f6 100644
index 2828591a4b03..dd2f9f450718 100644
--- a/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
@@ -295,6 +295,7 @@ static bool rt5677_volatile_register(struct device *dev, unsigned int reg)
@ -3290,3 +3446,6 @@ index ebeaba6571a3..475e18e04318 100644
.id = PC9,
.range = RANGE_PACKAGE,
.get_count_percent = hsw_ext_get_count_percent,
--
Armbian

131
patch/kernel/archive/rockchip64-4.4/patch-4.4.208-209.patch
View File

@ -1,5 +1,101 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Sun, 12 Jan 2020 20:58:06 +0100
Subject: [ARCHEOLOGY] Rockchip legacy upstream patches
> X-Git-Archeology: - Revision 379033f729649d6003840967ba605ac18b8edfc3: https://github.com/armbian/build/commit/379033f729649d6003840967ba605ac18b8edfc3
> X-Git-Archeology: Date: Sun, 12 Jan 2020 20:58:06 +0100
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Rockchip legacy upstream patches
> X-Git-Archeology:
> X-Git-Archeology: - Revision 673ceab09f56f7f9c7931926882de0bf8627ce6a: https://github.com/armbian/build/commit/673ceab09f56f7f9c7931926882de0bf8627ce6a
> X-Git-Archeology: Date: Sun, 12 Jan 2020 20:59:45 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Rockchip legacy upstream patches (#1738)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 1e0e901ea0ebb3522b8f33e55f78731da45b6b7d: https://github.com/armbian/build/commit/1e0e901ea0ebb3522b8f33e55f78731da45b6b7d
> X-Git-Archeology: Date: Thu, 16 Jan 2020 13:26:38 +0100
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Add upstream patches, need proper testing.
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
Makefile | 2 +-
arch/arm/boot/dts/am437x-gp-evm.dts | 2 +-
arch/arm/boot/dts/am43x-epos-evm.dts | 2 +-
arch/arm/mach-vexpress/spc.c | 12 +-
arch/mips/include/asm/thread_info.h | 20 ++-
arch/parisc/include/asm/cmpxchg.h | 10 +-
arch/powerpc/mm/mem.c | 8 +
arch/powerpc/platforms/pseries/hvconsole.c | 2 +-
arch/s390/kernel/perf_cpum_sf.c | 22 ++-
arch/s390/kernel/smp.c | 80 +++++++---
arch/tile/lib/atomic_asm_32.S | 3 +-
arch/x86/include/asm/atomic.h | 13 --
block/compat_ioctl.c | 9 ++
drivers/bluetooth/btusb.c | 3 +-
drivers/devfreq/devfreq.c | 6 +-
drivers/firewire/net.c | 6 +-
drivers/gpio/gpiolib.c | 8 +
drivers/gpu/drm/drm_dp_mst_topology.c | 6 +-
drivers/infiniband/core/cma.c | 1 +
drivers/md/raid1.c | 2 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 2 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 12 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 1 +
drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 12 ++
drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 2 +-
drivers/net/macvlan.c | 2 +-
drivers/net/usb/lan78xx.c | 11 +-
drivers/net/vxlan.c | 2 +-
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 23 ++-
drivers/regulator/rn5t618-regulator.c | 1 +
drivers/scsi/libsas/sas_discover.c | 11 +-
drivers/scsi/lpfc/lpfc_bsg.c | 15 +-
drivers/scsi/qla2xxx/qla_isr.c | 4 -
drivers/scsi/qla4xxx/ql4_os.c | 1 -
drivers/tty/hvc/hvc_vio.c | 16 +-
drivers/tty/serial/msm_serial.c | 13 +-
drivers/usb/core/config.c | 70 ++++++--
drivers/usb/gadget/function/f_ecm.c | 6 +-
drivers/usb/gadget/function/f_rndis.c | 1 +
drivers/usb/serial/option.c | 2 +
drivers/xen/balloon.c | 3 +-
fs/locks.c | 2 +-
fs/pstore/ram.c | 11 ++
fs/xfs/xfs_log.c | 2 +
include/linux/dmaengine.h | 5 +-
include/linux/if_ether.h | 8 +
include/net/neighbour.h | 2 +-
include/uapi/linux/netfilter/xt_sctp.h | 6 +-
kernel/locking/spinlock_debug.c | 32 ++--
kernel/taskstats.c | 30 ++--
kernel/trace/ftrace.c | 6 +-
net/8021q/vlan.h | 1 +
net/8021q/vlan_dev.c | 3 +-
net/8021q/vlan_netlink.c | 19 ++-
net/bluetooth/l2cap_core.c | 4 +-
net/core/neighbour.c | 4 +-
net/ethernet/eth.c | 7 +-
net/ipv4/tcp_input.c | 5 +-
net/llc/llc_station.c | 4 +-
net/netfilter/nf_conntrack_netlink.c | 3 +
net/rfkill/core.c | 7 +-
net/sched/sch_fq.c | 2 +-
net/sctp/sm_sideeffect.c | 28 ++--
scripts/kconfig/expr.c | 7 +
sound/isa/cs423x/cs4236.c | 3 +-
sound/pci/ice1712/ice1724.c | 9 +-
sound/soc/codecs/wm8962.c | 4 +-
tools/perf/builtin-report.c | 7 -
68 files changed, 459 insertions(+), 189 deletions(-)
diff --git a/Makefile b/Makefile
index 84d74ea25d70..762f77777e62 100644
index 357e59b10913..09323c61a743 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
@ -394,10 +490,10 @@ index fcc12c879659..7039a58a6a4e 100644
return err;
}
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index 4f6fc1cfd7da..f01f7434df8e 100644
index 0a94125d8c50..bddd4f7fc974 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -396,11 +396,6 @@ static int devfreq_notifier_call(struct notifier_block *nb, unsigned long type,
@@ -436,11 +436,6 @@ static int devfreq_notifier_call(struct notifier_block *nb, unsigned long type,
static void _remove_devfreq(struct devfreq *devfreq)
{
mutex_lock(&devfreq_list_lock);
@ -409,7 +505,7 @@ index 4f6fc1cfd7da..f01f7434df8e 100644
list_del(&devfreq->node);
mutex_unlock(&devfreq_list_lock);
@@ -472,6 +467,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
@@ -512,6 +507,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
devfreq->dev.parent = dev;
devfreq->dev.class = devfreq_class;
devfreq->dev.release = devfreq_dev_release;
@ -435,7 +531,7 @@ index b9d2f76a0cf7..117d16a455fd 100644
return 0;
}
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index fe89fd56eabf..db0801c7bb8e 100644
index 72048189b4e7..c741c0025c0e 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -163,6 +163,14 @@ int gpiod_get_direction(struct gpio_desc *desc)
@ -1000,10 +1096,10 @@ index 7ad60ee41914..4ce19b860289 100644
usb_ep_disable(ecm->notify);
ecm->notify->desc = NULL;
diff --git a/drivers/usb/gadget/function/f_rndis.c b/drivers/usb/gadget/function/f_rndis.c
index e587767e374c..e281af92e084 100644
index 3a28d8ac3b3d..2d924aa43227 100644
--- a/drivers/usb/gadget/function/f_rndis.c
+++ b/drivers/usb/gadget/function/f_rndis.c
@@ -619,6 +619,7 @@ static void rndis_disable(struct usb_function *f)
@@ -646,6 +646,7 @@ static void rndis_disable(struct usb_function *f)
gether_disconnect(&rndis->port);
usb_ep_disable(rndis->notify);
@ -1052,10 +1148,10 @@ index b515e65f1376..2c8e1e429cf7 100644
MINOR(inode->i_sb->s_dev), inode->i_ino);
} else {
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 59d93acc29c7..fa0e89edb62d 100644
index c9e4bc47c79d..283b04218997 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -319,6 +319,17 @@ static int notrace ramoops_pstore_write_buf(enum pstore_type_id type,
@@ -321,6 +321,17 @@ static int notrace ramoops_pstore_write_buf(enum pstore_type_id type,
prz = cxt->przs[cxt->dump_write_cnt];
@ -1087,10 +1183,10 @@ index 73b725f965eb..065aa4752607 100644
spinlock_destroy(&log->l_icloglock);
xfs_buf_free(log->l_xbuf);
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index a16d1851cfb1..f1bd19c69fec 100644
index 3050f88daf9e..66ff65db8ac0 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -1207,8 +1207,11 @@ static inline int dma_get_slave_caps(struct dma_chan *chan,
@@ -1303,8 +1303,11 @@ static inline int dma_get_slave_caps(struct dma_chan *chan,
static inline int dmaengine_desc_set_reuse(struct dma_async_tx_descriptor *tx)
{
struct dma_slave_caps caps;
@ -1449,10 +1545,10 @@ index 52dcd414c2af..3f51b4e590b1 100644
}
EXPORT_SYMBOL(eth_header_cache);
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index b0677b265b48..1abf88aec19d 100644
index ccde5d0e3c89..4fe4b2430a84 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -1685,8 +1685,11 @@ tcp_sacktag_write_queue(struct sock *sk, const struct sk_buff *ack_skb,
@@ -1686,8 +1686,11 @@ tcp_sacktag_write_queue(struct sock *sk, const struct sk_buff *ack_skb,
}
/* Ignore very old stuff early */
@ -1502,10 +1598,10 @@ index 3a24c01cb909..f324a1124418 100644
static struct pernet_operations ctnetlink_net_ops = {
diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index cf5b69ab1829..ad927a6ca2a1 100644
index 71e1f0def5a5..8662a976f666 100644
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -941,10 +941,13 @@ static void rfkill_sync_work(struct work_struct *work)
@@ -936,10 +936,13 @@ static void rfkill_sync_work(struct work_struct *work)
int __must_check rfkill_register(struct rfkill *rfkill)
{
static unsigned long rfkill_no;
@ -1674,7 +1770,7 @@ index 0b22c00642bb..6a1de2cd27bf 100644
ice->gpio.i2s_mclk_changed(ice);
if (ice->gpio.set_pro_rate)
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index a7e79784fc16..4a3ce9b85253 100644
index 6a49b36d12f9..7f12e8ab1b4a 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -2792,7 +2792,7 @@ static int fll_factors(struct _fll_div *fll_div, unsigned int Fref,
@ -1713,3 +1809,6 @@ index 0f7ebac1846b..f256fac1e722 100644
return 0;
}
--
Armbian

71
patch/kernel/archive/rockchip64-4.4/patch-4.4.209-210.patch
View File

@ -1,5 +1,57 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Thu, 16 Jan 2020 13:26:38 +0100
Subject: [ARCHEOLOGY] Add upstream patches, need proper testing.
> X-Git-Archeology: - Revision 1e0e901ea0ebb3522b8f33e55f78731da45b6b7d: https://github.com/armbian/build/commit/1e0e901ea0ebb3522b8f33e55f78731da45b6b7d
> X-Git-Archeology: Date: Thu, 16 Jan 2020 13:26:38 +0100
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Add upstream patches, need proper testing.
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
Makefile | 2 +-
drivers/gpu/drm/drm_dp_mst_topology.c | 2 +-
drivers/gpu/drm/i915/intel_lrc.c | 14 ++++
drivers/hid/hid-core.c | 6 ++
drivers/hid/hid-input.c | 16 +++--
drivers/hid/uhid.c | 3 +-
drivers/input/input.c | 26 ++++---
drivers/net/can/mscan/mscan.c | 21 +++---
drivers/net/can/usb/gs_usb.c | 4 +-
drivers/net/wireless/mwifiex/pcie.c | 4 +-
drivers/net/wireless/mwifiex/sta_ioctl.c | 11 ++-
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 1 +
drivers/scsi/bfa/bfad_attr.c | 4 +-
drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 +
drivers/staging/vt6656/device.h | 1 +
drivers/staging/vt6656/main_usb.c | 1 +
drivers/staging/vt6656/wcmd.c | 1 +
drivers/tty/serial/serial_core.c | 1 +
drivers/usb/chipidea/host.c | 4 +-
drivers/usb/core/config.c | 12 ++--
drivers/usb/musb/musb_core.c | 3 +
drivers/usb/musb/musbhsdma.c | 2 +-
drivers/usb/serial/option.c | 8 +++
drivers/usb/serial/usb-wwan.h | 1 +
drivers/usb/serial/usb_wwan.c | 4 ++
fs/char_dev.c | 2 +-
include/linux/can/dev.h | 34 ++++++++++
include/linux/kobject.h | 2 +
kernel/trace/trace_sched_wakeup.c | 4 +-
kernel/trace/trace_stack.c | 5 ++
lib/kobject.c | 5 +-
net/ipv4/netfilter/arp_tables.c | 27 +++++---
net/netfilter/ipset/ip_set_core.c | 3 +-
sound/usb/quirks.c | 1 +
34 files changed, 182 insertions(+), 54 deletions(-)
diff --git a/Makefile b/Makefile
index 762f77777e62..c09b55163c2c 100644
index 09323c61a743..5bebd4aab804 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
@ -56,7 +108,7 @@ index 7058f75c7b42..58b6d85c440a 100644
while (index % CACHELINE_DWORDS)
wa_ctx_emit(batch, index, MI_NOOP);
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 7cd945575463..16ff8d3c7cfe 100644
index bb7489621182..5c1f1c915efb 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -269,6 +269,12 @@ static int hid_add_field(struct hid_parser *parser, unsigned report_type, unsign
@ -109,7 +161,7 @@ index ee3c66c02043..3331bf8ad85e 100644
void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct hid_usage *usage, __s32 value)
diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
index f6863adc15ad..ea0c860ee842 100644
index 4ee61e0ebd7e..5b738ca01a2f 100644
--- a/drivers/hid/uhid.c
+++ b/drivers/hid/uhid.c
@@ -26,6 +26,7 @@
@ -120,7 +172,7 @@ index f6863adc15ad..ea0c860ee842 100644
#define UHID_NAME "uhid"
#define UHID_BUFSIZE 32
@@ -774,7 +775,7 @@ static unsigned int uhid_char_poll(struct file *file, poll_table *wait)
@@ -787,7 +788,7 @@ static unsigned int uhid_char_poll(struct file *file, poll_table *wait)
if (uhid->head != uhid->tail)
return POLLIN | POLLRDNORM;
@ -367,10 +419,10 @@ index 3cbf4791bac1..de541b85f8a5 100644
return;
}
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 54122db81de4..013fb874c64e 100644
index aab71ad77a17..b05c830956c1 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -2702,6 +2702,7 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport)
@@ -2676,6 +2676,7 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport)
if (uport->cons && uport->dev)
of_console_check(uport->dev->of_node, uport->cons->name, uport->line);
@ -527,7 +579,7 @@ index be9cb61b4d19..485bad73b6ed 100644
}
diff --git a/fs/char_dev.c b/fs/char_dev.c
index d0655ca89481..f1f3bb812799 100644
index 73b4625f5dd2..9154a2d7b195 100644
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -332,7 +332,7 @@ static struct kobject *cdev_get(struct cdev *p)
@ -797,7 +849,7 @@ index caa26184f7e3..0583e2491770 100644
/* Userspace can't trigger element to be re-added */
if (ret == -EAGAIN)
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 9c5368e7ee23..5e50386c8ebb 100644
index a810dd94ec98..5fb0b02135a7 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -1142,6 +1142,7 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip)
@ -808,3 +860,6 @@ index 9c5368e7ee23..5e50386c8ebb 100644
#ifdef CONFIG_HID_RKVR
case USB_ID(0x071B, 0x3205): /* RockChip NanoC VR */
#endif
--
Armbian

161
patch/kernel/archive/rockchip64-4.4/patch-4.4.210-211.patch
View File

@ -1,3 +1,99 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Sun, 26 Jan 2020 14:01:11 +0100
Subject: [ARCHEOLOGY] Upstream patches for a few legacy kernels
> X-Git-Archeology: - Revision 45ebe91437a27f8d534abeaa9bf2b87f69b1f5f8: https://github.com/armbian/build/commit/45ebe91437a27f8d534abeaa9bf2b87f69b1f5f8
> X-Git-Archeology: Date: Sun, 26 Jan 2020 14:01:11 +0100
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Upstream patches for a few legacy kernels
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
Documentation/ABI/testing/sysfs-bus-mei | 2 +-
Makefile | 2 +-
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 8 +-
arch/hexagon/kernel/stacktrace.c | 4 +-
arch/x86/boot/compressed/head_64.S | 5 +
block/blk-settings.c | 2 +-
drivers/block/xen-blkfront.c | 4 +-
drivers/clk/samsung/clk-exynos5420.c | 2 +
drivers/gpio/gpiolib.c | 5 +-
drivers/hid/hidraw.c | 7 +-
drivers/hid/uhid.c | 5 +-
drivers/iio/imu/adis16480.c | 6 +-
drivers/infiniband/ulp/srpt/ib_srpt.c | 24 ++
drivers/iommu/iommu.c | 1 +
drivers/md/dm-snap-persistent.c | 2 +-
drivers/md/raid0.c | 2 +-
drivers/media/platform/exynos4-is/fimc-isp-video.c | 2 +-
drivers/media/usb/zr364xx/zr364xx.c | 3 +-
drivers/message/fusion/mptctl.c | 213 +++-------
drivers/misc/enclosure.c | 3 +-
drivers/net/ethernet/stmicro/stmmac/common.h | 4 +-
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +-
drivers/net/macvlan.c | 5 +-
drivers/net/usb/lan78xx.c | 1 +
drivers/net/usb/r8152.c | 3 +
drivers/net/wimax/i2400m/op-rfkill.c | 1 +
drivers/net/wireless/cw1200/fwio.c | 6 +-
drivers/net/wireless/p54/p54usb.c | 43 +-
drivers/net/wireless/realtek/rtlwifi/regd.c | 2 +-
drivers/net/wireless/rsi/rsi_91x_mac80211.c | 1 +
drivers/platform/x86/asus-wmi.c | 8 +-
drivers/rtc/rtc-msm6242.c | 3 +-
drivers/rtc/rtc-mt6397.c | 47 +-
drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +-
drivers/scsi/esas2r/esas2r_flash.c | 1 +
drivers/scsi/fnic/vnic_dev.c | 30 +-
drivers/scsi/qla4xxx/ql4_mbx.c | 3 -
drivers/scsi/scsi_trace.c | 114 ++---
drivers/scsi/sd.c | 4 +-
drivers/spi/spi-atmel.c | 10 +-
drivers/target/target_core_fabric_lib.c | 2 +-
drivers/tty/serial/imx.c | 2 +-
drivers/tty/serial/pch_uart.c | 5 +-
drivers/usb/core/hub.c | 1 +
drivers/usb/serial/ch341.c | 6 +-
drivers/usb/serial/io_edgeport.c | 33 +-
drivers/usb/serial/keyspan.c | 4 +
drivers/usb/serial/opticon.c | 2 +-
drivers/usb/serial/quatech2.c | 6 +
drivers/usb/serial/usb-serial-simple.c | 2 +
drivers/usb/serial/usb-serial.c | 3 +
drivers/xen/balloon.c | 16 +-
firmware/Makefile | 2 +-
fs/cifs/smb2file.c | 2 +-
fs/ext4/inode.c | 15 +
fs/ext4/super.c | 60 ++-
fs/ocfs2/journal.c | 8 +
fs/proc/meminfo.c | 31 +-
include/linux/blkdev.h | 8 +-
include/linux/mm.h | 1 +
include/linux/regulator/ab8500.h | 2 -
include/net/cfg80211.h | 11 +
mm/page-writeback.c | 4 +-
mm/page_alloc.c | 43 ++
net/batman-adv/distributed-arp-table.c | 4 +-
net/dccp/feat.c | 7 +-
net/hsr/hsr_device.c | 2 +
net/ipv4/tcp_input.c | 7 +-
net/mac80211/cfg.c | 55 +--
net/mac80211/sta_info.c | 4 +
net/netfilter/ipset/ip_set_bitmap_gen.h | 2 +-
net/socket.c | 1 +
net/wireless/rdev-ops.h | 4 +
net/wireless/util.c | 45 ++
sound/core/seq/seq_timer.c | 14 +-
sound/usb/line6/pcm.c | 19 +-
tools/perf/util/probe-finder.c | 32 +-
tools/testing/selftests/rseq/settings | 1 +
78 files changed, 528 insertions(+), 532 deletions(-)
diff --git a/Documentation/ABI/testing/sysfs-bus-mei b/Documentation/ABI/testing/sysfs-bus-mei
index 6bd45346ac7e..3f8701e8fa24 100644
--- a/Documentation/ABI/testing/sysfs-bus-mei
@ -12,7 +108,7 @@ index 6bd45346ac7e..3f8701e8fa24 100644
What: /sys/bus/mei/devices/.../name
Date: May 2015
diff --git a/Makefile b/Makefile
index c09b55163c2c..9f03733dac69 100644
index 5bebd4aab804..87fcb337f5fd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
@ -122,10 +218,10 @@ index c94de13ce362..21bfedf40478 100644
DPLL_CON0,
EPLL_CON0,
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index db0801c7bb8e..503405d32d24 100644
index c741c0025c0e..ca8f14c90f6d 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1949,8 +1949,9 @@ static struct gpio_desc *gpiod_find(struct device *dev, const char *con_id,
@@ -2032,8 +2032,9 @@ static struct gpio_desc *gpiod_find(struct device *dev, const char *con_id,
if (chip->ngpio <= p->chip_hwnum) {
dev_err(dev,
@ -160,10 +256,10 @@ index 627a24d3ea7c..ef9e196b54a5 100644
static int hidraw_open(struct inode *inode, struct file *file)
diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
index ea0c860ee842..a7ba4db8cff7 100644
index 5b738ca01a2f..672f26481f2d 100644
--- a/drivers/hid/uhid.c
+++ b/drivers/hid/uhid.c
@@ -769,13 +769,14 @@ unlock:
@@ -782,13 +782,14 @@ unlock:
static unsigned int uhid_char_poll(struct file *file, poll_table *wait)
{
struct uhid_device *uhid = file->private_data;
@ -871,10 +967,10 @@ index 803df6a32ba9..a942d2d84ed2 100644
#define BUF_SIZE_4KiB 4096
#define BUF_SIZE_2KiB 2048
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 28a6b7764044..6f695239e658 100644
index dee90a3fd620..490543ab6adb 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -935,7 +935,9 @@ static int stmmac_set_bfsize(int mtu, int bufsize)
@@ -933,7 +933,9 @@ static int stmmac_set_bfsize(int mtu, int bufsize)
{
int ret = bufsize;
@ -924,10 +1020,10 @@ index 0d138bc60b18..4174b24963b9 100644
dev->ep_blkin = (intf->cur_altsetting)->endpoint + 0;
dev->ep_blkout = (intf->cur_altsetting)->endpoint + 1;
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 10dd307593e8..db8b489b0513 100644
index db8b0510809b..5f97024238cc 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -4243,6 +4243,9 @@ static int rtl8152_probe(struct usb_interface *intf,
@@ -4244,6 +4244,9 @@ static int rtl8152_probe(struct usb_interface *intf,
return -ENODEV;
}
@ -1638,7 +1734,7 @@ index ea4ffc2ebb2f..d23f09e151f8 100644
for (i = 0; i < nent; i++, sg++) {
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 7805f3e535ec..75a07b73a82b 100644
index 4fcbf5f3b835..f83dac4e480a 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1146,6 +1146,7 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
@ -1941,10 +2037,10 @@ index 41f1a5dd33a5..4dcce3f034f4 100644
nr_ioctl_req.Reserved = 0;
rc = SMB2_ioctl(xid, oparms->tcon, fid->persistent_fid,
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 3557c5717c8d..271d8d9d0598 100644
index 7c9366a4fc25..be34fa325830 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -5189,10 +5189,25 @@ static int ext4_expand_extra_isize(struct inode *inode,
@@ -5236,10 +5236,25 @@ static int ext4_expand_extra_isize(struct inode *inode,
{
struct ext4_inode *raw_inode;
struct ext4_xattr_ibody_header *header;
@ -1971,10 +2067,10 @@ index 3557c5717c8d..271d8d9d0598 100644
header = IHDR(inode, raw_inode);
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 6f00388a1471..adf02b1509ca 100644
index 9a652931eef8..aeb6b9aa326b 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3169,6 +3169,40 @@ int ext4_calculate_overhead(struct super_block *sb)
@@ -3168,6 +3168,40 @@ int ext4_calculate_overhead(struct super_block *sb)
return 0;
}
@ -2015,7 +2111,7 @@ index 6f00388a1471..adf02b1509ca 100644
static void ext4_set_resv_clusters(struct super_block *sb)
{
ext4_fsblk_t resv_clusters;
@@ -3991,29 +4025,7 @@ no_journal:
@@ -3990,29 +4024,7 @@ no_journal:
if (ext4_setup_super(sb, es, sb->s_flags & MS_RDONLY))
sb->s_flags |= MS_RDONLY;
@ -2046,7 +2142,7 @@ index 6f00388a1471..adf02b1509ca 100644
ext4_set_resv_clusters(sb);
@@ -4766,6 +4778,8 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
@@ -4769,6 +4781,8 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
goto restore_opts;
}
@ -2125,10 +2221,10 @@ index df4661abadc4..83720460c5bc 100644
/*
* Tagged format, for easy grepping and expansion.
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index e4b945925e40..4ae5d6ecd727 100644
index abe6bd269d1b..3c0281d382d7 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -264,6 +264,7 @@ struct queue_limits {
@@ -267,6 +267,7 @@ struct queue_limits {
unsigned int max_sectors;
unsigned int max_segment_size;
unsigned int physical_block_size;
@ -2136,7 +2232,7 @@ index e4b945925e40..4ae5d6ecd727 100644
unsigned int alignment_offset;
unsigned int io_min;
unsigned int io_opt;
@@ -273,7 +274,6 @@ struct queue_limits {
@@ -276,7 +277,6 @@ struct queue_limits {
unsigned int discard_granularity;
unsigned int discard_alignment;
@ -2144,7 +2240,7 @@ index e4b945925e40..4ae5d6ecd727 100644
unsigned short max_segments;
unsigned short max_integrity_segments;
@@ -975,7 +975,7 @@ extern void blk_queue_max_discard_sectors(struct request_queue *q,
@@ -978,7 +978,7 @@ extern void blk_queue_max_discard_sectors(struct request_queue *q,
unsigned int max_discard_sectors);
extern void blk_queue_max_write_same_sectors(struct request_queue *q,
unsigned int max_write_same_sectors);
@ -2153,7 +2249,7 @@ index e4b945925e40..4ae5d6ecd727 100644
extern void blk_queue_physical_block_size(struct request_queue *, unsigned int);
extern void blk_queue_alignment_offset(struct request_queue *q,
unsigned int alignment);
@@ -1193,7 +1193,7 @@ static inline unsigned int queue_max_segment_size(struct request_queue *q)
@@ -1197,7 +1197,7 @@ static inline unsigned int queue_max_segment_size(struct request_queue *q)
return q->limits.max_segment_size;
}
@ -2162,7 +2258,7 @@ index e4b945925e40..4ae5d6ecd727 100644
{
int retval = 512;
@@ -1203,7 +1203,7 @@ static inline unsigned short queue_logical_block_size(struct request_queue *q)
@@ -1207,7 +1207,7 @@ static inline unsigned short queue_logical_block_size(struct request_queue *q)
return retval;
}
@ -2172,10 +2268,10 @@ index e4b945925e40..4ae5d6ecd727 100644
return queue_logical_block_size(bdev_get_queue(bdev));
}
diff --git a/include/linux/mm.h b/include/linux/mm.h
index ed653ba47c46..15f81b2b87ed 100644
index e4f71bafb155..6fc30c9d9985 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1802,6 +1802,7 @@ extern int __meminit init_per_zone_wmark_min(void);
@@ -1818,6 +1818,7 @@ extern int __meminit init_per_zone_wmark_min(void);
extern void mem_init(void);
extern void __init mmap_init(void);
extern void show_mem(unsigned int flags);
@ -2219,7 +2315,7 @@ index c05748cc1b20..3fe53101b72a 100644
* DOC: Regulatory enforcement infrastructure
*
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index d2211e42b779..698806914be7 100644
index 789a5d462634..50928e430ef0 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -200,11 +200,11 @@ static void wb_min_max_ratio(struct bdi_writeback *wb,
@ -2237,10 +2333,10 @@ index d2211e42b779..698806914be7 100644
}
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index fd75e27c9b40..df589416ace6 100644
index 2a5271aa8ccd..0d49d66a67db 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3650,6 +3650,49 @@ static inline void show_node(struct zone *zone)
@@ -3655,6 +3655,49 @@ static inline void show_node(struct zone *zone)
printk("Node %d ", zone_to_nid(zone));
}
@ -2344,10 +2440,10 @@ index 943378d6e4c3..8dd239214a14 100644
hsr_stag = (typeof(hsr_stag)) skb_put(skb, sizeof(*hsr_stag));
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 1abf88aec19d..88bfd663d9a2 100644
index 4fe4b2430a84..46c00ec00cd8 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -895,9 +895,10 @@ static void tcp_update_reordering(struct sock *sk, const int metric,
@@ -896,9 +896,10 @@ static void tcp_update_reordering(struct sock *sk, const int metric,
/* This must be called before lost_out is incremented */
static void tcp_verify_retransmit_hint(struct tcp_sock *tp, struct sk_buff *skb)
{
@ -2485,10 +2581,10 @@ index b0bc475f641e..adc703ccd68b 100644
set->data = NULL;
diff --git a/net/socket.c b/net/socket.c
index e5bb73eb36fe..15bdba4211ad 100644
index f14e6e2e08ea..fa1e85afc9b3 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -3143,6 +3143,7 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,
@@ -3169,6 +3169,7 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,
case SIOCSARP:
case SIOCGARP:
case SIOCDARP:
@ -2690,3 +2786,6 @@ index 000000000000..e7b9417537fb
+++ b/tools/testing/selftests/rseq/settings
@@ -0,0 +1 @@
+timeout=0
--
Armbian

293
patch/kernel/archive/rockchip64-4.4/patch-4.4.211-212.patch
View File

@ -1,5 +1,233 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Thu, 6 Feb 2020 23:47:12 +0100
Subject: [ARCHEOLOGY] Update rockchip64 kernel config - getting closer to
Ayufan configuration which is apparently more stable. Need testings
> X-Git-Archeology: - Revision 50dd1ca46782a4d33ed8395758f362e46c4313df: https://github.com/armbian/build/commit/50dd1ca46782a4d33ed8395758f362e46c4313df
> X-Git-Archeology: Date: Thu, 06 Feb 2020 23:47:12 +0100
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Update rockchip64 kernel config - getting closer to Ayufan configuration which is apparently more stable. Need testings
> X-Git-Archeology:
> X-Git-Archeology: - Revision bd128e97a317abc1cb0afcd80317faa7d3b50afc: https://github.com/armbian/build/commit/bd128e97a317abc1cb0afcd80317faa7d3b50afc
> X-Git-Archeology: Date: Sun, 09 Feb 2020 16:13:09 +0100
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Add Rockchip legacy upstream patches
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
Makefile | 2 +-
arch/arm/common/mcpm_entry.c | 2 +-
arch/arm/include/asm/suspend.h | 1 +
arch/arm/kernel/sleep.S | 12 +
arch/arm/mach-omap2/omap_hwmod.c | 2 +-
arch/arm/mach-rpc/irq.c | 3 +-
arch/arm/plat-pxa/ssp.c | 6 -
arch/arm64/boot/dts/arm/juno-clocks.dtsi | 4 +-
arch/m68k/amiga/cia.c | 9 +
arch/m68k/atari/ataints.c | 4 +-
arch/m68k/atari/time.c | 15 +-
arch/m68k/bvme6000/config.c | 20 +-
arch/m68k/hp300/time.c | 10 +-
arch/m68k/mac/via.c | 119 ++++++----
arch/m68k/mvme147/config.c | 18 +-
arch/m68k/mvme16x/config.c | 21 +-
arch/m68k/q40/q40ints.c | 19 +-
arch/m68k/sun3/sun3ints.c | 3 +
arch/m68k/sun3x/time.c | 16 +-
arch/mips/include/asm/io.h | 14 +-
arch/mips/kernel/setup.c | 2 +-
arch/nios2/kernel/nios2_ksyms.c | 12 +
arch/powerpc/Makefile | 2 +
arch/powerpc/include/asm/archrandom.h | 2 +-
arch/powerpc/kernel/cacheinfo.c | 17 ++
arch/powerpc/kernel/cacheinfo.h | 4 +
arch/powerpc/sysdev/qe_lib/gpio.c | 4 +-
arch/x86/Kconfig.debug | 2 +-
arch/x86/kernel/kgdb.c | 2 +-
block/blk-merge.c | 8 +-
crypto/pcrypt.c | 2 +-
crypto/tgr192.c | 6 +-
drivers/ata/libahci.c | 1 -
drivers/atm/firestream.c | 3 +
drivers/bcma/driver_pci.c | 4 +-
drivers/block/drbd/drbd_main.c | 2 +
drivers/clk/clk-highbank.c | 1 +
drivers/clk/clk-qoriq.c | 1 +
drivers/clk/imx/clk-imx6q.c | 1 +
drivers/clk/imx/clk-imx6sx.c | 1 +
drivers/clk/imx/clk-imx7d.c | 1 +
drivers/clk/imx/clk-vf610.c | 1 +
drivers/clk/mvebu/armada-370.c | 4 +-
drivers/clk/mvebu/armada-xp.c | 4 +-
drivers/clk/mvebu/kirkwood.c | 2 +
drivers/clk/samsung/clk-exynos4.c | 1 +
drivers/clk/socfpga/clk-pll-a10.c | 1 +
drivers/clk/socfpga/clk-pll.c | 1 +
drivers/clocksource/timer-sun5i.c | 10 +
drivers/crypto/caam/caamrng.c | 5 +-
drivers/dma/dma-axi-dmac.c | 2 +-
drivers/dma/dw/platform.c | 14 +-
drivers/dma/edma.c | 6 +-
drivers/dma/imx-sdma.c | 8 +
drivers/gpu/drm/drm_dp_mst_topology.c | 15 +-
drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 24 +-
drivers/gpu/drm/msm/dsi/dsi_host.c | 6 +-
drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c | 2 +-
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gddr3.c | 2 +-
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c | 4 +-
drivers/gpu/drm/radeon/cik.c | 4 +-
drivers/gpu/drm/radeon/r600.c | 4 +-
drivers/gpu/drm/radeon/si.c | 4 +-
drivers/gpu/drm/virtio/virtgpu_vq.c | 5 +-
drivers/hwmon/adt7475.c | 5 +-
drivers/hwmon/nct7802.c | 4 +-
drivers/hwmon/shtc1.c | 2 +-
drivers/hwmon/w83627hf.c | 42 +++-
drivers/iio/dac/ad5380.c | 2 +-
drivers/iio/industrialio-buffer.c | 6 +-
drivers/infiniband/hw/mlx5/qp.c | 21 ++
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +-
drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 2 +-
drivers/infiniband/ulp/isert/ib_isert.c | 12 -
drivers/input/keyboard/nomadik-ske-keypad.c | 2 +-
drivers/input/misc/keyspan_remote.c | 9 +-
drivers/input/tablet/aiptek.c | 6 +-
drivers/input/tablet/gtco.c | 10 +-
drivers/input/touchscreen/sur40.c | 2 +-
drivers/iommu/amd_iommu.c | 2 +
drivers/iommu/amd_iommu_init.c | 3 +
drivers/iommu/intel-iommu.c | 5 +-
drivers/iommu/iommu.c | 6 +-
drivers/md/bitmap.c | 8 +-
drivers/media/i2c/ov2659.c | 2 +-
drivers/media/i2c/soc_camera/ov6650.c | 72 ++++--
drivers/media/pci/cx18/cx18-fileops.c | 2 +-
drivers/media/pci/cx23885/cx23885-dvb.c | 5 +-
drivers/media/pci/ivtv/ivtv-fileops.c | 2 +-
drivers/media/platform/davinci/isif.c | 9 -
drivers/media/platform/davinci/vpbe.c | 2 +-
drivers/media/platform/omap/omap_vout.c | 15 +-
drivers/media/platform/s5p-jpeg/jpeg-core.c | 2 +-
drivers/media/platform/vivid/vivid-osd.c | 2 +-
drivers/media/radio/wl128x/fmdrv_common.c | 5 +-
drivers/mfd/intel-lpss.c | 1 +
drivers/misc/mic/card/mic_x100.c | 28 +--
drivers/misc/sgi-xp/xpc_partition.c | 2 +-
drivers/mmc/host/sdhci.c | 10 +-
drivers/net/can/slcan.c | 12 +-
drivers/net/ethernet/broadcom/bcmsysport.c | 2 +-
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 +
drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +-
drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +-
drivers/net/ethernet/natsemi/sonic.c | 6 +-
drivers/net/ethernet/pasemi/pasemi_mac.c | 2 +-
drivers/net/ethernet/qualcomm/qca_spi.c | 9 +-
drivers/net/ethernet/qualcomm/qca_spi.h | 1 +
drivers/net/ethernet/renesas/sh_eth.c | 6 +-
drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 2 +-
drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 2 +-
drivers/net/slip/slip.c | 12 +-
drivers/net/usb/lan78xx.c | 15 ++
drivers/net/wireless/ath/ath9k/dynack.c | 8 +-
drivers/net/wireless/libertas/cfg.c | 16 +-
drivers/net/wireless/libertas_tf/cmd.c | 2 +-
drivers/net/wireless/mediatek/mt7601u/phy.c | 2 +-
drivers/pinctrl/sh-pfc/pfc-emev2.c | 20 ++
drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 3 +-
drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 8 +-
drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 2 +-
drivers/pinctrl/sh-pfc/pfc-sh7269.c | 2 +-
drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 4 +-
drivers/pinctrl/sh-pfc/pfc-sh7734.c | 4 +-
drivers/platform/mips/cpu_hwmon.c | 2 +-
drivers/platform/x86/alienware-wmi.c | 2 +-
drivers/power/power_supply_core.c | 10 +-
drivers/regulator/wm831x-dcdc.c | 4 +-
drivers/rtc/rtc-88pm80x.c | 21 +-
drivers/rtc/rtc-88pm860x.c | 21 +-
drivers/rtc/rtc-ds1672.c | 3 +-
drivers/rtc/rtc-pcf8563.c | 11 +-
drivers/rtc/rtc-pm8xxx.c | 6 +-
drivers/scsi/libfc/fc_exch.c | 2 +-
drivers/scsi/megaraid/megaraid_sas_base.c | 4 +-
drivers/scsi/qla2xxx/qla_os.c | 34 ++-
drivers/scsi/scsi_transport_iscsi.c | 7 +
drivers/spi/spi-bcm2835aux.c | 13 +-
drivers/spi/spi-fsl-spi.c | 2 +-
drivers/spi/spi-tegra114.c | 45 +++-
drivers/staging/comedi/drivers/ni_mio_common.c | 24 +-
drivers/target/iscsi/iscsi_target.c | 6 +-
drivers/thermal/cpu_cooling.c | 2 +-
drivers/tty/ipwireless/hardware.c | 2 +
drivers/usb/class/cdc-wdm.c | 2 +-
drivers/usb/host/xhci-hub.c | 2 +-
drivers/vfio/pci/vfio_pci.c | 19 +-
drivers/video/backlight/lm3630a_bl.c | 4 +-
drivers/video/fbdev/chipsfb.c | 3 +-
drivers/xen/cpu_hotplug.c | 2 +-
fs/btrfs/inode-map.c | 1 +
fs/cifs/connect.c | 3 +-
fs/exportfs/expfs.c | 1 +
fs/ext4/inline.c | 2 +-
fs/jfs/jfs_txnmgr.c | 3 +-
fs/namei.c | 17 +-
fs/nfs/super.c | 2 +-
fs/xfs/xfs_quotaops.c | 3 +
include/asm-generic/rtc.h | 2 +-
include/linux/bitmap.h | 8 +
include/linux/device.h | 3 +-
include/linux/netfilter/ipset/ip_set.h | 7 -
include/linux/platform_data/dma-imx-sdma.h | 3 +
include/linux/signal.h | 15 +-
include/media/davinci/vpbe.h | 2 +-
include/trace/events/xen.h | 6 +-
kernel/debug/kdb/kdb_main.c | 2 +-
kernel/signal.c | 5 +
lib/bitmap.c | 20 ++
lib/devres.c | 3 +-
lib/kfifo.c | 3 +-
net/6lowpan/nhc.c | 2 +-
net/bridge/netfilter/ebtables.c | 4 +-
net/core/neighbour.c | 4 +-
net/ieee802154/6lowpan/reassembly.c | 2 +-
net/ipv4/ip_tunnel.c | 4 +-
net/ipv6/reassembly.c | 2 +-
net/iucv/af_iucv.c | 27 ++-
net/llc/af_llc.c | 34 +--
net/llc/llc_conn.c | 35 +--
net/llc/llc_if.c | 12 +-
net/mac80211/rc80211_minstrel_ht.c | 2 +-
net/mac80211/rx.c | 11 +-
net/netfilter/ipset/ip_set_bitmap_gen.h | 2 +-
net/netfilter/ipset/ip_set_bitmap_ip.c | 6 +-
net/netfilter/ipset/ip_set_bitmap_ipmac.c | 6 +-
net/netfilter/ipset/ip_set_bitmap_port.c | 6 +-
net/packet/af_packet.c | 25 +-
net/rds/ib_stats.c | 2 +-
net/sched/ematch.c | 2 +-
net/tipc/sysctl.c | 8 +-
net/x25/af_x25.c | 6 +-
scripts/recordmcount.c | 17 ++
sound/aoa/codecs/onyx.c | 4 +-
sound/pci/hda/hda_controller.h | 9 +-
sound/soc/codecs/cs4349.c | 1 +
sound/soc/codecs/es8328.c | 2 +-
sound/soc/codecs/wm8737.c | 2 +-
sound/soc/davinci/davinci-mcasp.c | 13 +-
sound/soc/fsl/imx-sgtl5000.c | 3 +-
sound/soc/qcom/apq8016_sbc.c | 21 +-
sound/soc/soc-pcm.c | 4 +-
sound/usb/mixer.c | 4 +-
sound/usb/quirks-table.h | 9 +-
204 files changed, 1059 insertions(+), 559 deletions(-)
diff --git a/Makefile b/Makefile
index 9f03733dac69..379f2a525c02 100644
index 87fcb337f5fd..d454f213a910 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
@ -685,7 +913,7 @@ index ab1df19b0957..60604b26fa72 100644
/*
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 4f9f1ae49213..fadc946b306d 100644
index 34fd37e5c898..ded8f4ff0cdc 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -80,7 +80,7 @@ static char __initdata builtin_cmdline[COMMAND_LINE_SIZE] = CONFIG_CMDLINE;
@ -813,10 +1041,10 @@ index 521e67a49dc4..4052e3d7edbd 100644
if (!of_device_is_compatible(gc->of_node, "fsl,mpc8323-qe-pario-bank")) {
pr_debug("%s: tried to get a non-qe pin\n", __func__);
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 2aa212fb0faf..31c191a08bb1 100644
index 3cb8e179f2f2..056717be912f 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -221,7 +221,7 @@ config HAVE_MMIOTRACE_SUPPORT
@@ -209,7 +209,7 @@ config HAVE_MMIOTRACE_SUPPORT
config X86_DECODER_SELFTEST
bool "x86 instruction decoder selftest"
@ -826,7 +1054,7 @@ index 2aa212fb0faf..31c191a08bb1 100644
---help---
Perform x86 instruction decoder selftests at build time.
diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
index 44256a62702b..4a08fda2b06f 100644
index ed15cd486d06..7c759ef6ddfb 100644
--- a/arch/x86/kernel/kgdb.c
+++ b/arch/x86/kernel/kgdb.c
@@ -437,7 +437,7 @@ static void kgdb_disable_hw_debug(struct pt_regs *regs)
@ -1076,10 +1304,10 @@ index b3094315a3c0..2fa15a274719 100644
}
CLK_OF_DECLARE(axp_clk, "marvell,armada-xp-core-clock", axp_clk_init);
diff --git a/drivers/clk/mvebu/kirkwood.c b/drivers/clk/mvebu/kirkwood.c
index 99550f25975e..1d2b9a1a9609 100644
index a2a8d614039d..890ebf623261 100644
--- a/drivers/clk/mvebu/kirkwood.c
+++ b/drivers/clk/mvebu/kirkwood.c
@@ -335,6 +335,8 @@ static void __init kirkwood_clk_init(struct device_node *np)
@@ -333,6 +333,8 @@ static void __init kirkwood_clk_init(struct device_node *np)
if (cgnp) {
mvebu_clk_gating_setup(cgnp, kirkwood_gating_desc);
kirkwood_clk_muxing_setup(cgnp, kirkwood_mux_desc);
@ -1972,7 +2200,7 @@ index 7a50728b9389..391090c455ce 100644
}
EXPORT_SYMBOL_GPL(bitmap_copy_from_slot);
diff --git a/drivers/media/i2c/ov2659.c b/drivers/media/i2c/ov2659.c
index 6eefb8bbb5b5..20e3c56991cf 100644
index c4661963e231..c72a44d2382c 100644
--- a/drivers/media/i2c/ov2659.c
+++ b/drivers/media/i2c/ov2659.c
@@ -1137,7 +1137,7 @@ static int ov2659_set_fmt(struct v4l2_subdev *sd,
@ -2385,10 +2613,10 @@ index 6956f7e7d439..ca5f0102daef 100644
enum xp_retval (*get_partition_rsvd_page_pa)
(void *, u64 *, unsigned long *, size_t *) =
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 2bae0214528b..bf309a8a66a1 100644
index fa7f91695d2e..a4822fdbb153 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -3096,11 +3096,13 @@ int sdhci_add_host(struct sdhci_host *host)
@@ -3094,11 +3094,13 @@ int sdhci_add_host(struct sdhci_host *host)
if (host->ops->get_min_clock)
mmc->f_min = host->ops->get_min_clock(host);
else if (host->version >= SDHCI_SPEC_300) {
@ -3006,10 +3234,10 @@ index 3df47c1b04ec..f5585740a765 100644
}
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
index b13cd074c52a..9281e42c9ed5 100644
index a74d8ca383a1..d83ddefa69e9 100644
--- a/drivers/power/power_supply_core.c
+++ b/drivers/power/power_supply_core.c
@@ -755,14 +755,14 @@ __power_supply_register(struct device *parent,
@@ -758,14 +758,14 @@ __power_supply_register(struct device *parent,
}
spin_lock_init(&psy->changed_lock);
@ -3028,7 +3256,7 @@ index b13cd074c52a..9281e42c9ed5 100644
rc = psy_register_thermal(psy);
if (rc)
goto register_thermal_failed;
@@ -798,8 +798,8 @@ register_cooler_failed:
@@ -802,8 +802,8 @@ register_cooler_failed:
psy_unregister_thermal(psy);
register_thermal_failed:
device_del(dev);
@ -3680,10 +3908,10 @@ index 71ad04d54212..1a1d1cfc3704 100644
static struct usb_driver wdm_driver = {
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index 40c95ed6afbf..3ef80c2c0dcc 100644
index 60238f3770ae..3726f9ef938d 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -965,7 +965,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
@@ -968,7 +968,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
}
port_li = readl(port_array[wIndex] + PORTLI);
status = xhci_get_ext_port_status(temp, port_li);
@ -3835,10 +4063,10 @@ index 6599c6124552..01cbdd0987c0 100644
}
if (tmp != dentry) {
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index 0dcd33f62637..00f9433eea23 100644
index 6fbcdf23df90..0f795da06fc6 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -1418,7 +1418,7 @@ int htree_inlinedir_to_tree(struct file *dir_file,
@@ -1432,7 +1432,7 @@ int htree_inlinedir_to_tree(struct file *dir_file,
err = ext4_htree_store_dirent(dir_file, hinfo->hash,
hinfo->minor_hash, de, &tmp_str);
if (err) {
@ -3862,10 +4090,10 @@ index d595856453b2..de6351c1c8db 100644
/*
diff --git a/fs/namei.c b/fs/namei.c
index 40049d61ef37..a4ed9c337c21 100644
index 9071bb1bd184..98b8884767f8 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -988,7 +988,8 @@ static int may_linkat(struct path *link)
@@ -1003,7 +1003,8 @@ static int may_linkat(struct path *link)
* may_create_in_sticky - Check whether an O_CREAT open in a sticky directory
* should be allowed, or not, on files that already
* exist.
@ -3875,7 +4103,7 @@ index 40049d61ef37..a4ed9c337c21 100644
* @inode: the inode of the file to open
*
* Block an O_CREAT open of a FIFO (or a regular file) when:
@@ -1004,18 +1005,18 @@ static int may_linkat(struct path *link)
@@ -1019,18 +1020,18 @@ static int may_linkat(struct path *link)
*
* Returns 0 if the open is allowed, -ve on error.
*/
@ -3899,7 +4127,7 @@ index 40049d61ef37..a4ed9c337c21 100644
((sysctl_protected_fifos >= 2 && S_ISFIFO(inode->i_mode)) ||
(sysctl_protected_regular >= 2 && S_ISREG(inode->i_mode))))) {
return -EACCES;
@@ -3059,6 +3060,8 @@ static int do_last(struct nameidata *nd,
@@ -3091,6 +3092,8 @@ static int do_last(struct nameidata *nd,
int *opened)
{
struct dentry *dir = nd->path.dentry;
@ -3908,7 +4136,7 @@ index 40049d61ef37..a4ed9c337c21 100644
int open_flag = op->open_flag;
bool will_truncate = (open_flag & O_TRUNC) != 0;
bool got_write = false;
@@ -3211,7 +3214,7 @@ finish_open:
@@ -3243,7 +3246,7 @@ finish_open:
error = -EISDIR;
if (d_is_dir(nd->path.dentry))
goto out;
@ -3977,7 +4205,7 @@ index 714ce4a5e31f..39d47af6ca7b 100644
* lib/bitmap.c provides these functions:
*/
diff --git a/include/linux/device.h b/include/linux/device.h
index 834000903525..eb891c9c4b62 100644
index 5f9fa7fb2088..5829aae9f5da 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -677,7 +677,8 @@ extern unsigned long devm_get_free_pages(struct device *dev,
@ -3988,8 +4216,8 @@ index 834000903525..eb891c9c4b62 100644
+void __iomem *devm_ioremap_resource(struct device *dev,
+ const struct resource *res);
/* allows to add/remove a custom action to devres stack */
int devm_add_action(struct device *dev, void (*action)(void *), void *data);
void __iomem *devm_of_iomap(struct device *dev,
struct device_node *node, int index,
diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h
index 0e1f433cc4b7..378c234ba3e4 100644
--- a/include/linux/netfilter/ipset/ip_set.h
@ -4087,7 +4315,7 @@ index d6be935caa50..ecd1a0f7bd3e 100644
),
TP_fast_assign(
diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
index ebc52c7bd8a6..cba287a5c976 100644
index 5a58421d7e2d..a52a6da8c3d0 100644
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
@@ -2632,7 +2632,7 @@ static int kdb_per_cpu(int argc, const char **argv)
@ -4100,7 +4328,7 @@ index ebc52c7bd8a6..cba287a5c976 100644
return KDB_BADCPUNUM;
}
diff --git a/kernel/signal.c b/kernel/signal.c
index 3095b2309876..7e4a4b199a11 100644
index 9759e9b783d8..07c1620515cb 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -79,6 +79,11 @@ static int sig_task_ignored(struct task_struct *t, int sig, bool force)
@ -4151,10 +4379,10 @@ index 814814397cce..bdf572d09b8f 100644
+}
+EXPORT_SYMBOL(bitmap_free);
diff --git a/lib/devres.c b/lib/devres.c
index 8c85672639d3..9d18ccd00df5 100644
index 12ab4eb241c5..38de51c08a77 100644
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -131,7 +131,8 @@ EXPORT_SYMBOL(devm_iounmap);
@@ -132,7 +132,8 @@ EXPORT_SYMBOL(devm_iounmap);
* if (IS_ERR(base))
* return PTR_ERR(base);
*/
@ -4959,10 +5187,10 @@ index 0ac8fc5ed4ae..9ebd500ecf38 100644
.id_table = cs4349_i2c_id,
.probe = cs4349_i2c_probe,
diff --git a/sound/soc/codecs/es8328.c b/sound/soc/codecs/es8328.c
index afa6c5db9dcc..2bf30d0eb82f 100644
index 7f3edd8fb7ac..c48419f669f2 100644
--- a/sound/soc/codecs/es8328.c
+++ b/sound/soc/codecs/es8328.c
@@ -210,7 +210,7 @@ static const struct soc_enum es8328_rline_enum =
@@ -241,7 +241,7 @@ static const struct soc_enum es8328_rline_enum =
ARRAY_SIZE(es8328_line_texts),
es8328_line_texts);
static const struct snd_kcontrol_new es8328_right_line_controls =
@ -5143,3 +5371,6 @@ index d32727c74a16..c892b4d1e733 100644
.altsetting = 1,
.altset_idx = 1,
.attributes = UAC_EP_CS_ATTR_FILL_MAX |
--
Armbian

123
patch/kernel/archive/rockchip64-4.4/patch-4.4.212-213.patch
View File

@ -1,5 +1,81 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Thu, 6 Feb 2020 23:47:12 +0100
Subject: [ARCHEOLOGY] Update rockchip64 kernel config - getting closer to
Ayufan configuration which is apparently more stable. Need testings
> X-Git-Archeology: - Revision 50dd1ca46782a4d33ed8395758f362e46c4313df: https://github.com/armbian/build/commit/50dd1ca46782a4d33ed8395758f362e46c4313df
> X-Git-Archeology: Date: Thu, 06 Feb 2020 23:47:12 +0100
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Update rockchip64 kernel config - getting closer to Ayufan configuration which is apparently more stable. Need testings
> X-Git-Archeology:
> X-Git-Archeology: - Revision bd128e97a317abc1cb0afcd80317faa7d3b50afc: https://github.com/armbian/build/commit/bd128e97a317abc1cb0afcd80317faa7d3b50afc
> X-Git-Archeology: Date: Sun, 09 Feb 2020 16:13:09 +0100
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Add Rockchip legacy upstream patches
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
Makefile | 2 +-
arch/arm64/boot/Makefile | 2 +-
crypto/af_alg.c | 6 +-
crypto/pcrypt.c | 3 +-
drivers/atm/eni.c | 4 +-
drivers/char/ttyprintk.c | 15 +-
drivers/clk/mmp/clk-of-mmp2.c | 2 +-
drivers/media/radio/si470x/radio-si470x-i2c.c | 2 +-
drivers/media/usb/dvb-usb/digitv.c | 10 +-
drivers/media/usb/dvb-usb/dvb-usb-urb.c | 2 +-
drivers/media/usb/gspca/gspca.c | 2 +-
drivers/net/ethernet/broadcom/b44.c | 9 +-
drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 3 +-
drivers/net/ethernet/chelsio/cxgb4/l2t.c | 3 +-
drivers/net/ethernet/freescale/xgmac_mdio.c | 7 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 37 ++-
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 5 -
drivers/net/ethernet/natsemi/sonic.c | 109 ++++++--
drivers/net/ethernet/natsemi/sonic.h | 25 +-
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 1 +
drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 2 +
drivers/net/usb/r8152.c | 9 +-
drivers/net/wan/sdla.c | 2 +-
drivers/net/wireless/airo.c | 20 +-
drivers/net/wireless/ath/ath9k/hif_usb.c | 2 +-
drivers/net/wireless/brcm80211/brcmfmac/usb.c | 4 +-
drivers/net/wireless/orinoco/orinoco_usb.c | 4 +-
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 2 +-
drivers/net/wireless/rsi/rsi_91x_usb.c | 2 +-
drivers/net/wireless/zd1211rw/zd_usb.c | 2 +-
drivers/scsi/fnic/fnic_scsi.c | 3 +
drivers/staging/most/aim-network/networking.c | 10 +
drivers/staging/vt6656/device.h | 2 +
drivers/staging/vt6656/int.c | 6 +-
drivers/staging/vt6656/main_usb.c | 1 +
drivers/staging/vt6656/rxtx.c | 26 +-
drivers/staging/wlan-ng/prism2mgmt.c | 2 +-
drivers/usb/dwc3/core.c | 3 +
drivers/usb/serial/ir-usb.c | 136 +++++++---
drivers/usb/storage/unusual_uas.h | 7 +-
drivers/watchdog/rn5t618_wdt.c | 1 +
fs/btrfs/super.c | 24 +-
fs/namei.c | 4 +-
fs/reiserfs/super.c | 2 +
include/linux/usb/irda.h | 13 +-
mm/mempolicy.c | 6 +-
net/core/utils.c | 20 +-
net/ipv4/ip_vti.c | 13 +-
net/ipv6/ip6_vti.c | 13 +-
net/sched/ematch.c | 3 +
net/wireless/wext-core.c | 3 +-
sound/core/pcm_native.c | 2 +-
52 files changed, 434 insertions(+), 164 deletions(-)
diff --git a/Makefile b/Makefile
index 379f2a525c02..6e86896525d9 100644
index d454f213a910..32f05cef5606 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
@ -11,18 +87,18 @@ index 379f2a525c02..6e86896525d9 100644
NAME = Blurry Fish Butt
diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile
index abcbba2f01ba..a29f640de983 100644
index 9eac75047996..14dfc7f61f80 100644
--- a/arch/arm64/boot/Makefile
+++ b/arch/arm64/boot/Makefile
@@ -14,7 +14,7 @@
# Based on the ia64 boot/Makefile.
#
@@ -16,7 +16,7 @@
include $(srctree)/arch/arm64/boot/dts/Makefile
-targets := Image Image.gz
+targets := Image Image.bz2 Image.gz Image.lz4 Image.lzma Image.lzo
$(obj)/Image: vmlinux FORCE
$(call if_changed,objcopy)
DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES))
ifneq ($(DTB_NAMES),)
diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index b5953f1d1a18..cf3975ee4fd8 100644
--- a/crypto/af_alg.c
@ -725,10 +801,10 @@ index cda9e604a95f..e5ea8e972b91 100644
fw_dump->clr = 1;
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index db8b489b0513..23e299c86b81 100644
index 5f97024238cc..be757f6ccdb1 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -4313,6 +4313,11 @@ static int rtl8152_probe(struct usb_interface *intf,
@@ -4314,6 +4314,11 @@ static int rtl8152_probe(struct usb_interface *intf,
intf->needs_remote_wakeup = 1;
@ -740,7 +816,7 @@ index db8b489b0513..23e299c86b81 100644
tp->rtl_ops.init(tp);
set_ethernet_addr(tp);
@@ -4325,10 +4330,6 @@ static int rtl8152_probe(struct usb_interface *intf,
@@ -4326,10 +4331,6 @@ static int rtl8152_probe(struct usb_interface *intf,
goto out1;
}
@ -1042,10 +1118,10 @@ index c1ad0aea23b9..73ec8d3936d5 100644
/*----------------------------------------------------------------
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 4378e758baef..591bc3f7be76 100644
index 3f9e5c47b2a2..ea4a0a40ac94 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -801,6 +801,9 @@ static void dwc3_core_exit_mode(struct dwc3 *dwc)
@@ -899,6 +899,9 @@ static void dwc3_core_exit_mode(struct dwc3 *dwc)
/* do nothing */
break;
}
@ -1261,10 +1337,10 @@ index 73956d48a0c5..1347c77facd0 100644
}
diff --git a/drivers/usb/storage/unusual_uas.h b/drivers/usb/storage/unusual_uas.h
index 8ed80f28416f..9aad6825947c 100644
index e466d3727b9d..ec12516d403f 100644
--- a/drivers/usb/storage/unusual_uas.h
+++ b/drivers/usb/storage/unusual_uas.h
@@ -162,12 +162,15 @@ UNUSUAL_DEV(0x2537, 0x1068, 0x0000, 0x9999,
@@ -180,12 +180,15 @@ UNUSUAL_DEV(0x2537, 0x1068, 0x0000, 0x9999,
USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_UAS),
@ -1344,10 +1420,10 @@ index 0f99336c37eb..df211bad255c 100644
buf->f_type = BTRFS_SUPER_MAGIC;
diff --git a/fs/namei.c b/fs/namei.c
index a4ed9c337c21..9f1aae507909 100644
index 98b8884767f8..70874eeebcda 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3060,8 +3060,8 @@ static int do_last(struct nameidata *nd,
@@ -3092,8 +3092,8 @@ static int do_last(struct nameidata *nd,
int *opened)
{
struct dentry *dir = nd->path.dentry;
@ -1407,10 +1483,10 @@ index e345ceaf72d6..9dc46010a067 100644
* outbound header:
*
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 878d05bd185c..41c678199b80 100644
index 77167933686a..5165bfac345a 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -2701,6 +2701,9 @@ int mpol_parse_str(char *str, struct mempolicy **mpol)
@@ -2700,6 +2700,9 @@ int mpol_parse_str(char *str, struct mempolicy **mpol)
char *flags = strchr(str, '=');
int err = 1;
@ -1420,7 +1496,7 @@ index 878d05bd185c..41c678199b80 100644
if (nodelist) {
/* NUL-terminate mode or flags string */
*nodelist++ = '\0';
@@ -2711,9 +2714,6 @@ int mpol_parse_str(char *str, struct mempolicy **mpol)
@@ -2710,9 +2713,6 @@ int mpol_parse_str(char *str, struct mempolicy **mpol)
} else
nodes_clear(nodes);
@ -1493,7 +1569,7 @@ index bbcbbc1cc2cc..42dbd280dc9b 100644
dst_hold(dst);
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
index 51da5987952c..623963a2d8a6 100644
index 5dd544c5cfe2..cbee6b00de49 100644
--- a/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
@@ -441,8 +441,17 @@ vti6_xmit(struct sk_buff *skb, struct net_device *dev, struct flowi *fl)
@ -1545,10 +1621,10 @@ index b50ee5d622e1..843d2cf1e6a6 100644
union iwreq_data * wrqu,
char * extra)
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index b9bfbf394959..59423576b1cc 100644
index cd375f864fbd..a60165e94f4c 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -588,7 +588,7 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream,
@@ -597,7 +597,7 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream,
runtime->boundary *= 2;
/* clear the buffer for avoiding possible kernel info leaks */
@ -1557,3 +1633,6 @@ index b9bfbf394959..59423576b1cc 100644
memset(runtime->dma_area, 0, runtime->dma_bytes);
snd_pcm_timer_resolution_change(substream);
--
Armbian

36
patch/kernel/archive/rockchip64-4.4/rk3328-adjust-pbl-for-mtu-1500.patch
View File

@ -1,15 +1,32 @@
Default Programmable Buffer Length in rk3328's gmac is not suitable
for MTUs higher than 1498. The easiest solution would be to disable
offloading but it is not ideal as it disables hardware checksumming.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Gauthier Provost <gauthier@kobol.io>
Date: Tue, 23 Mar 2021 08:00:10 +0100
Subject: [ARCHEOLOGY] Re-enable network checksum TX offload on rockchip64
family (#2623)
This patch sets pbl to 0x4 which is good for the most popular MTU
value of 1500.
> X-Git-Archeology: > recovered message: > * Re-enable network checksum TX offload on rockchip64 family
> X-Git-Archeology: > recovered message: > * Adjust gmac PBL setting for rk3399 legacy to fix network issues with MTU 1500
> X-Git-Archeology: > recovered message: > * Adjust gmac PBL setting for rk3328 in rockchip64-legacy to fix network issues with MTU 1500
> X-Git-Archeology: > recovered message: > Co-authored-by: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: - Revision 5e69351b3dc05829133e893f6efe575ef58c7866: https://github.com/armbian/build/commit/5e69351b3dc05829133e893f6efe575ef58c7866
> X-Git-Archeology: Date: Tue, 23 Mar 2021 08:00:10 +0100
> X-Git-Archeology: From: Gauthier Provost <gauthier@kobol.io>
> X-Git-Archeology: Subject: Re-enable network checksum TX offload on rockchip64 family (#2623)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index 085c6848..3ebdc6bd 100644
index ac71ce493833..3ebdc6bd2c0c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -1287,6 +1301,7 @@
@@ -1301,6 +1301,7 @@
"pclk_mac";
resets = <&cru SRST_GMAC2IO_A>;
reset-names = "stmmaceth";
@ -17,7 +34,7 @@ index 085c6848..3ebdc6bd 100644
status = "disabled";
};
@@ -1310,6 +1325,7 @@
@@ -1324,6 +1325,7 @@
phy-is-integrated;
pinctrl-names = "default";
pinctrl-0 = <&fephyled_rxm1 &fephyled_linkm1>;
@ -25,3 +42,6 @@ index 085c6848..3ebdc6bd 100644
status = "disabled";
};
--
Armbian

32
patch/kernel/archive/rockchip64-4.4/rk3399-adjust-pbl-for-mtu-1500.patch
View File

@ -1,12 +1,29 @@
Default Programmable Buffer Length in rk3399's gmac is not suitable
for MTUs higher than 1498. The easiest solution would be to disable
offloading but it is not ideal as it disables hardware checksumming.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Gauthier Provost <gauthier@kobol.io>
Date: Tue, 23 Mar 2021 08:00:10 +0100
Subject: [ARCHEOLOGY] Re-enable network checksum TX offload on rockchip64
family (#2623)
This patch sets pbl to 0x4 which is good for the most popular MTU
value of 1500.
> X-Git-Archeology: > recovered message: > * Re-enable network checksum TX offload on rockchip64 family
> X-Git-Archeology: > recovered message: > * Adjust gmac PBL setting for rk3399 legacy to fix network issues with MTU 1500
> X-Git-Archeology: > recovered message: > * Adjust gmac PBL setting for rk3328 in rockchip64-legacy to fix network issues with MTU 1500
> X-Git-Archeology: > recovered message: > Co-authored-by: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: - Revision 5e69351b3dc05829133e893f6efe575ef58c7866: https://github.com/armbian/build/commit/5e69351b3dc05829133e893f6efe575ef58c7866
> X-Git-Archeology: Date: Tue, 23 Mar 2021 08:00:10 +0100
> X-Git-Archeology: From: Gauthier Provost <gauthier@kobol.io>
> X-Git-Archeology: Subject: Re-enable network checksum TX offload on rockchip64 family (#2623)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 0125fc6e..e8b26881 100644
index 0125fc6e2731..e8b26881c506 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -286,6 +286,7 @@
@ -16,4 +33,7 @@ index 0125fc6e..e8b26881 100644
+ snps,pbl = <0x4>;
status = "disabled";
};
--
Armbian

56
patch/kernel/archive/rockchip64-4.4/rock64-DT-add-ethernet-aliases.patch
View File

@ -1,15 +1,59 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: zador-blood-stained <zador-blood-stained@users.noreply.github.com>
Date: Thu, 17 Aug 2017 20:00:34 +0300
Subject: [ARCHEOLOGY] Set MAC addresses for Rock64 from armbianEnv.txt
> X-Git-Archeology: > recovered message: > Currently rockchip-cpuinfo driver reads SoC serial as all zeroes due to
> X-Git-Archeology: > recovered message: > either a bug, hardware limitation or serial not flashed to eFuses
> X-Git-Archeology: - Revision d5c6bf69db29fd8cd0b929aa15d7fc056cb02441: https://github.com/armbian/build/commit/d5c6bf69db29fd8cd0b929aa15d7fc056cb02441
> X-Git-Archeology: Date: Thu, 17 Aug 2017 20:00:34 +0300
> X-Git-Archeology: From: zador-blood-stained <zador-blood-stained@users.noreply.github.com>
> X-Git-Archeology: Subject: Set MAC addresses for Rock64 from armbianEnv.txt
> X-Git-Archeology:
> X-Git-Archeology: - Revision 62e07d2ccad712e4c3448fbc56a0d417637d7646: https://github.com/armbian/build/commit/62e07d2ccad712e4c3448fbc56a0d417637d7646
> X-Git-Archeology: Date: Sun, 27 Aug 2017 22:52:05 +0200
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: RK3328 remove deprecated patches, config update
> X-Git-Archeology:
> X-Git-Archeology: - Revision c63b2129f64a741d71b30bc7bf3bb6ede98de6fb: https://github.com/armbian/build/commit/c63b2129f64a741d71b30bc7bf3bb6ede98de6fb
> X-Git-Archeology: Date: Sun, 01 Jul 2018 13:55:11 +0000
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Lock RK3328 to last known working tag. Thanks for idea/tip to @markh-de
> X-Git-Archeology:
> X-Git-Archeology: - Revision 41b589372f2c1a8450033db78f3d8ed9db1b2196: https://github.com/armbian/build/commit/41b589372f2c1a8450033db78f3d8ed9db1b2196
> X-Git-Archeology: Date: Sun, 26 Aug 2018 14:14:14 +0200
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Creating new family rockchip64. 3288 and 3399 was merged in, except Nanopi which stays in RK3399 family with sources attached to FA repository until we manage to join that in. Enabled Nanopc T4, Nanopi M4, Renegade. Tested on Rock64 and Nanopc T4.
> X-Git-Archeology:
> X-Git-Archeology: - Revision 150ac0c2afa147d9e3b036c8ecd8238fe5648cf3: https://github.com/armbian/build/commit/150ac0c2afa147d9e3b036c8ecd8238fe5648cf3
> X-Git-Archeology: Date: Tue, 19 Nov 2019 23:25:39 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Remove K<4, change branches, new features (#1586)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
index 113b82cd..d0612eb1 100644
index 8f39efce33cc..48a6c74cb4e9 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
@@ -47,6 +47,10 @@
model = "PINE64 ROCK64";
@@ -49,6 +49,10 @@
model = "Pine64 Rock64";
compatible = "pine64,rock64", "rockchip,rk3328";
+ aliases {
+ ethernet0 = &gmac2io;
+ };
+
chosen {
bootargs = "rockchip_jtag earlyprintk=uart8250-32bit,0xff130000";
};
// disable USB autosuspend as this solves USB stability issues
bootargs = "earlycon=uart8250,mmio32,0xff130000 swiotlb=1 kpti=0 no_console_suspend=1 usbcore.autosuspend=-1";
--
Armbian

12
patch/kernel/archive/rockchip64-4.4/rockpi4b-Fixed-headphone-no-audio-output.patch
View File

@ -1,18 +1,18 @@
From cb87df464f991cba7ac15fb8a0ec6225c6e5ac24 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: brian <brian@vamrs.com>
Date: Wed, 18 Mar 2020 12:10:10 +0800
Subject: [PATCH] arm64: dts: rk3399-rockpi4b: Fixed headphone no audio output
Subject: arm64: dts: rk3399-rockpi4b: Fixed headphone no audio output
Signed-off-by: brian <brian@vamrs.com>
---
arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts | 12 ++++++++++--
arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts | 12 ++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts
index 3db06a2..9d88c06 100644
index 672a897db849..5cc57e16b86a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts
@@ -1097,8 +1097,16 @@
@@ -1099,8 +1099,16 @@
i2s0 {
i2s0_8ch_bus: i2s0-8ch-bus {
rockchip,pins =
@ -32,5 +32,5 @@ index 3db06a2..9d88c06 100644
};
};
--
2.7.4
Armbian

10
patch/kernel/archive/rockchip64-4.4/rockpi4b-add-isp-camera.patch
View File

@ -1,15 +1,15 @@
From cc28806a79956cfa531bfa56554c0cd90a382e97 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: JMCC <JMCC@localhost>
Date: Tue, 29 Dec 2020 19:26:31 +0100
Subject: [PATCH] rockpi4b-add-isp-camera
Subject: rockpi4b-add-isp-camera
Signed-off-by: JMCC <JMCC@localhost>
---
.../boot/dts/rockchip/rk3399-rockpi4b.dts | 35 +++++++++++++------
arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts | 35 +++++++---
1 file changed, 25 insertions(+), 10 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts
index 5cc57e16b..09ac9eb89 100644
index 5cc57e16b86a..09ac9eb89b65 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts
@@ -633,10 +633,8 @@
@ -101,5 +101,5 @@ index 5cc57e16b..09ac9eb89 100644
status = "okay";
};
--
Created with Armbian build tools https://github.com/armbian/build
Armbian

34
patch/kernel/archive/rockchip64-4.4/rockpro-read-wireless-fw-at-standard-place.patch
View File

@ -1,5 +1,34 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Sun, 12 Aug 2018 22:21:47 +0200
Subject: [ARCHEOLOGY] Adjust wireless firmware path to usual location
> X-Git-Archeology: - Revision d1a553e189da7aaab17faad5b96b31bb84a02d69: https://github.com/armbian/build/commit/d1a553e189da7aaab17faad5b96b31bb84a02d69
> X-Git-Archeology: Date: Sun, 12 Aug 2018 22:21:47 +0200
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Adjust wireless firmware path to usual location
> X-Git-Archeology:
> X-Git-Archeology: - Revision 08031ae67a2083815f81d30e15ba44742403722e: https://github.com/armbian/build/commit/08031ae67a2083815f81d30e15ba44742403722e
> X-Git-Archeology: Date: Mon, 04 Mar 2019 20:06:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: [ rockpro64 ] adjust wireless firmware path
> X-Git-Archeology:
> X-Git-Archeology: - Revision 150ac0c2afa147d9e3b036c8ecd8238fe5648cf3: https://github.com/armbian/build/commit/150ac0c2afa147d9e3b036c8ecd8238fe5648cf3
> X-Git-Archeology: Date: Tue, 19 Nov 2019 23:25:39 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Remove K<4, change branches, new features (#1586)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c b/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c
index fa07a94c..2377a34e 100644
index fa07a94c27c1..2377a34e0deb 100644
--- a/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c
+++ b/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c
@@ -17,8 +17,8 @@
@ -13,3 +42,6 @@ index fa07a94c..2377a34e 100644
char ANDROID_FW_PATH[64] = {0};
extern int get_wifi_chip_type(void);
--
Armbian

110
patch/kernel/archive/rockchip64-4.4/vcodec-fixes.patch
View File

@ -1,11 +1,11 @@
From e222e9913d3c70967bae92f1aed46de726974dc7 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Thu, 5 Jul 2018 00:14:14 +0200
Subject: [PATCH] Revert "drm/drm-prime: cache dma_buf import context"
Subject: Revert "drm/drm-prime: cache dma_buf import context"
This reverts commit 5a90381e5acc2cf32be03099a14d05d4362b3348.
---
drivers/gpu/drm/drm_prime.c | 46 ++---------------------------
drivers/gpu/drm/drm_prime.c | 46 +---------
drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 1 +
2 files changed, 3 insertions(+), 44 deletions(-)
@ -123,11 +123,13 @@ index 273a52b5eb66..85bbd19c87b0 100644
} else {
rockchip_gem_free_buf(rk_obj);
}
--
Armbian
From 0868438e92b0e9a44d6c6e711ef3be0a429ab4af Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Rob Clark <robdclark@gmail.com>
Date: Thu, 9 Jun 2016 15:29:19 -0400
Subject: [PATCH] UPSTREAM: drm/prime: fix error path deadlock fail
Subject: UPSTREAM: drm/prime: fix error path deadlock fail
There were a couple messed up things about this fail path.
(1) it would drop object_name_lock twice
@ -186,11 +188,13 @@ index 6b7417a194a3..d8d85286764d 100644
return ret;
}
EXPORT_SYMBOL(drm_gem_prime_fd_to_handle);
--
Armbian
From 8e4ac090d0a814f73d719887f96f7dc44112e03e Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 26 Sep 2016 21:44:14 +0100
Subject: [PATCH] UPSTREAM: drm: Convert prime dma-buf <-> handle to rbtree
Subject: UPSTREAM: drm: Convert prime dma-buf <-> handle to rbtree
Currently we use a linear walk to lookup a handle and return a dma-buf,
and vice versa. A long overdue TODO task is to convert that to a
@ -218,8 +222,8 @@ Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20160926204414.23222-1-chris@chris-wilson.co.uk
(cherry picked from commit 077675c1e8a193a6355d4a7c8c7bf63be310b472)
---
drivers/gpu/drm/drm_prime.c | 85 +++++++++++++++++++++++++++++++++++++++------
include/drm/drmP.h | 5 +--
drivers/gpu/drm/drm_prime.c | 85 ++++++++--
include/drm/drmP.h | 5 +-
2 files changed, 77 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
@ -410,15 +414,14 @@ index 04edcd32b409..93da65df2e7e 100644
};
/** File private data */
--
Armbian
From fcb8af30f524cd437434ec6ddea0231cc37529bc Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 5 Oct 2016 13:21:44 +0100
Subject: [PATCH] UPSTREAM: drm/prime: Take a ref on the drm_dev when exporting
a dma_buf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: UPSTREAM: drm/prime: Take a ref on the drm_dev when exporting a
dma_buf
dma_buf may live a long time, longer than the last direct user of the
driver. We already hold a reference to the owner module (that prevents
@ -439,17 +442,17 @@ Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: stable@vger.kernel.org
Tested-by: Petri Latvala <petri.latvala@intel.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Christian Konig <christian.koenig@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20161005122145.1507-2-chris@chris-wilson.co.uk
(cherry picked from commit a4fce9cb782ad340ee5576a38e934e5e75832dc6)
---
drivers/gpu/drm/armada/armada_gem.c | 2 +-
drivers/gpu/drm/drm_prime.c | 30 +++++++++++++++++++++++++++++-
drivers/gpu/drm/drm_prime.c | 30 +++++++++-
drivers/gpu/drm/i915/i915_gem_dmabuf.c | 2 +-
drivers/gpu/drm/tegra/gem.c | 2 +-
drivers/gpu/drm/udl/udl_dmabuf.c | 2 +-
include/drm/drmP.h | 4 ++++
include/drm/drmP.h | 4 ++
6 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
@ -587,12 +590,13 @@ index 93da65df2e7e..4aba6478d718 100644
extern void drm_gem_dmabuf_release(struct dma_buf *dma_buf);
extern int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **pages,
--
Armbian
From 2c0a8737dd35ba259d3bbbf1b956fb43da32f117 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 7 Dec 2016 21:45:27 +0000
Subject: [PATCH] UPSTREAM: drm: Take ownership of the dmabuf->obj when
exporting
Subject: UPSTREAM: drm: Take ownership of the dmabuf->obj when exporting
Currently the reference for the dmabuf->obj is incremented for the
dmabuf in drm_gem_prime_handle_to_fd() (at the high level userspace
@ -607,7 +611,7 @@ Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20161207214527.22533-1-chris@chris-wilson.co.uk
(cherry picked from commit 72a93e8dd52c9feea42f1258d555e6070680a347)
---
drivers/gpu/drm/drm_prime.c | 12 +++++++-----
drivers/gpu/drm/drm_prime.c | 12 ++++++----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
@ -647,11 +651,13 @@ index 94b4872255c8..dbd34fa7f71c 100644
return dmabuf;
}
--
Armbian
From 595e921b1e908458bd1ee022c9a7ee08cf203ad9 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Lucas Stach <l.stach@pengutronix.de>
Date: Thu, 30 Nov 2017 18:34:28 +0100
Subject: [PATCH] UPSTREAM: drm/prime: skip CPU sync in map/unmap dma_buf
Subject: UPSTREAM: drm/prime: skip CPU sync in map/unmap dma_buf
Dma-bufs should already be device coherent, as they are only pulled in the
CPU domain via the begin/end cpu_access calls. As we cache the mapping set
@ -670,7 +676,7 @@ Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20171130173428.8666-1-l.stach@pengutronix.de
(cherry picked from commit ca0e68e21aae10220eff71a297e7d794425add77)
---
drivers/gpu/drm/drm_prime.c | 11 ++++++++---
drivers/gpu/drm/drm_prime.c | 11 +++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
@ -703,25 +709,24 @@ index dbd34fa7f71c..133362279591 100644
sg_free_table(sgt);
kfree(sgt);
sgt = ERR_PTR(-ENOMEM);
--
Armbian
From d314fd1a48e930d034eccd49342a23340c3f1c27 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig.leichtzumerken@gmail.com>
Date: Tue, 27 Feb 2018 12:49:56 +0100
Subject: [PATCH] UPSTREAM: drm/prime: fix potential race in drm_gem_map_detach
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: UPSTREAM: drm/prime: fix potential race in drm_gem_map_detach
Unpin the GEM object only after freeing the sg table.
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Christian Konig <christian.koenig@amd.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Roger He <Hongbo.He@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180227115000.4105-1-christian.koenig@amd.com
(cherry picked from commit 681066ec1d41e4b299146bada52cef846b323c04)
---
drivers/gpu/drm/drm_prime.c | 36 ++++++++++++++++++------------------
drivers/gpu/drm/drm_prime.c | 36 +++++-----
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
@ -775,19 +780,18 @@ index 133362279591..95ecc69d03a0 100644
}
void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpriv,
--
Armbian
From c74449bbd7e3ee3f3195ac9da48271c83c56f101 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig.leichtzumerken@gmail.com>
Date: Tue, 27 Feb 2018 12:49:57 +0100
Subject: [PATCH] UPSTREAM: drm/prime: make the pages array optional for
Subject: UPSTREAM: drm/prime: make the pages array optional for
drm_prime_sg_to_page_addr_arrays
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Most of the time we only need the dma addresses.
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Christian Konig <christian.koenig@amd.com>
Reviewed-by: Roger He <Hongbo.He@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180227115000.4105-2-christian.koenig@amd.com
@ -797,7 +801,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20180227115000.4105-5-christ
Link: https://patchwork.freedesktop.org/patch/msgid/BN6PR12MB18262C0DE9B5F07B9A42EAE7F2C60@BN6PR12MB1826.namprd12.prod.outlook.com
(cherry picked from commit 186ca446aea19e49d2e1433dd170c6e1c211a52a)
---
drivers/gpu/drm/drm_prime.c | 20 ++++++++++----------
drivers/gpu/drm/drm_prime.c | 20 +++++-----
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
@ -855,15 +859,14 @@ index 95ecc69d03a0..7ea65c4105c1 100644
}
}
return 0;
--
Armbian
From 2fc969d64eb928db78c9fd99fb68d9d2442a8919 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat, 19 Aug 2017 13:05:58 +0100
Subject: [PATCH] UPSTREAM: drm: Release driver tracking before making the
object available again
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: UPSTREAM: drm: Release driver tracking before making the object
available again
This is the same bug as we fixed in commit f6cd7daecff5 ("drm: Release
driver references to handle before making it available again"), but now
@ -879,7 +882,7 @@ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Thierry Reding <treding@nvidia.com>
Cc: stable@vger.kernel.org
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
@ -911,21 +914,23 @@ index d7f39a03c2c9..966ea63581b1 100644
drm_gem_object_handle_unreference_unlocked(obj);
return 0;
--
Armbian
From 1d9b65acb4e776f43408afed2b0fd7b86fdb95ce Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sat, 17 Feb 2018 05:30:36 +0100
Subject: [PATCH] vcodec: skip reduce freq
Subject: vcodec: skip reduce freq
---
drivers/video/rockchip/vcodec/vcodec_service.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/video/rockchip/vcodec/vcodec_service.c b/drivers/video/rockchip/vcodec/vcodec_service.c
index c4ee73be92d3..9d5ee5c8b1f9 100644
index fcf7a043f7b9..059c81be0bb5 100644
--- a/drivers/video/rockchip/vcodec/vcodec_service.c
+++ b/drivers/video/rockchip/vcodec/vcodec_service.c
@@ -1630,9 +1630,6 @@ static void try_set_reg(struct vpu_subdev_data *data)
@@ -1645,9 +1645,6 @@ static void try_set_reg(struct vpu_subdev_data *data)
reg_from_wait_to_run(pservice, reg);
reg_copy_to_hw(reg->data, reg);
}
@ -935,7 +940,7 @@ index c4ee73be92d3..9d5ee5c8b1f9 100644
}
mutex_unlock(&pservice->shutdown_lock);
@@ -2385,6 +2382,7 @@ static void vcodec_set_freq_rk3328(struct vpu_service_info *pservice,
@@ -2400,6 +2397,7 @@ static void vcodec_set_freq_rk3328(struct vpu_service_info *pservice,
if (curr == reg->freq)
return;
@ -943,3 +948,6 @@ index c4ee73be92d3..9d5ee5c8b1f9 100644
if (pservice->dev_id == VCODEC_DEVICE_ID_RKVDEC) {
if (reg->reg[1] & 0x00800000) {
if (rkv_dec_get_fmt(reg->reg) == FMT_H264D)
--
Armbian

168
patch/kernel/archive/rockchip64-4.4/video-fixes.patch
View File

@ -1,11 +1,12 @@
From 61382c4e328df487f69b2095865c2e9e2c9e4121 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sun, 28 May 2017 09:08:50 +0200
Subject: [PATCH] gpu/arm/mali400: default to performance gpu governor
Subject: gpu/arm/mali400: default to performance gpu governor
---
drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c
index c9b8652f100d..6c97c530a2ae 100644
@ -20,12 +21,11 @@ index c9b8652f100d..6c97c530a2ae 100644
if (IS_ERR(mdev->devfreq)) {
mali_devfreq_term_freq_table(mdev);
return PTR_ERR(mdev->devfreq);
diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
index a58edabe600c..7273561fe6b1 100644
index b650f7125406..ac7ab2c28f6e 100644
--- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
@@ -510,9 +510,15 @@ dw_hdmi_rockchip_mode_valid(struct drm_connector *connector,
@@ -511,9 +511,15 @@ dw_hdmi_rockchip_mode_valid(struct drm_connector *connector,
return MODE_BAD;
hdmi = to_rockchip_hdmi(encoder);
@ -42,11 +42,13 @@ index a58edabe600c..7273561fe6b1 100644
/*
* ensure all drm display mode can work, if someone want support more
* resolutions, please limit the possible_crtc, only connect to
--
Armbian
From 28e3e0508d53dd697fc3dd75588bba08adee1bb0 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: xuhuicong <xhc@rock-chips.com>
Date: Fri, 23 Jun 2017 18:56:17 +0800
Subject: [PATCH] drm/rockchip: hdmi: fix no sound some time
Subject: drm/rockchip: hdmi: fix no sound some time
Change-Id: Ic9f931d9a5b7bca954363293a20ca242eb0bfa6f
Signed-off-by: xuhuicong <xhc@rock-chips.com>
@ -55,10 +57,10 @@ Signed-off-by: xuhuicong <xhc@rock-chips.com>
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index 8cb2cb4e61a6..30b6bd979eb8 100644
index 6157cb00663f..3419cf714799 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -1991,10 +1991,6 @@ static void hdmi_av_composer(struct dw_hdmi *hdmi,
@@ -1988,10 +1988,6 @@ static void hdmi_av_composer(struct dw_hdmi *hdmi,
HDMI_FC_INVIDCONF_IN_I_P_INTERLACED :
HDMI_FC_INVIDCONF_IN_I_P_PROGRESSIVE;
@ -69,7 +71,7 @@ index 8cb2cb4e61a6..30b6bd979eb8 100644
hdmi_writeb(hdmi, inv_val, HDMI_FC_INVIDCONF);
hdisplay = mode->hdisplay;
@@ -2292,6 +2288,9 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
@@ -2302,6 +2298,9 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
/* not for DVI mode */
if (hdmi->sink_is_hdmi) {
dev_dbg(hdmi->dev, "%s HDMI mode\n", __func__);
@ -79,18 +81,20 @@ index 8cb2cb4e61a6..30b6bd979eb8 100644
/* HDMI Initialization Step F - Configure AVI InfoFrame */
hdmi_config_AVI(hdmi, mode);
--
Armbian
From 16f51adab10ab06bfecbd0ed9e444329debb426d Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sat, 18 Nov 2017 11:09:39 +0100
Subject: [PATCH] rockchip: vop: force skip lines if image too big
Subject: rockchip: vop: force skip lines if image too big
---
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 13 ++++++++++---
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 13 +++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index 76610608c723..1418402c2668 100644
index 9c2e2379512c..1b762765c736 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -1653,6 +1653,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
@ -117,7 +121,7 @@ index 76610608c723..1418402c2668 100644
act_info = (actual_h - 1) << 16 | ((actual_w - 1) & 0xffff);
dsp_info = (drm_rect_height(dest) - 1) << 16;
@@ -1727,12 +1734,12 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
@@ -1728,12 +1735,12 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
VOP_WIN_SET(vop, win, xmirror, xmirror);
VOP_WIN_SET(vop, win, ymirror, ymirror);
VOP_WIN_SET(vop, win, format, vop_plane_state->format);
@ -132,11 +136,13 @@ index 76610608c723..1418402c2668 100644
VOP_WIN_SET(vop, win, uv_mst, vop_plane_state->uv_mst);
}
VOP_WIN_SET(vop, win, fmt_10, is_yuv_10bit(fb->pixel_format));
--
Armbian
From d56d2c8dcd6dc828693bed0cf965d68e90431019 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sat, 18 Nov 2017 23:17:24 +0100
Subject: [PATCH] gpu/arm/midgard: default to performance gpu governor
Subject: gpu/arm/midgard: default to performance gpu governor
---
drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c | 5 ++---
@ -180,11 +186,13 @@ index 1cf44b3500cf..a6a1a52f0463 100644
/*
* Power Management poweroff tick granuality. This is in nanoseconds to
--
Armbian
From 955a2a87c8fa737d78c022afef1ed32fd6f06760 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sun, 10 Dec 2017 14:16:09 +0100
Subject: [PATCH] uapi: install rockchip_drm header
Subject: uapi: install rockchip_drm header
---
include/uapi/drm/Kbuild | 1 +
@ -202,14 +210,16 @@ index 38d437096c35..b7ae9969d41e 100644
header-y += savage_drm.h
header-y += sis_drm.h
header-y += tegra_drm.h
--
Armbian
From f3f9dc1c2c697f0c9fefd501731a07ef64a026b1 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Tue, 12 Dec 2017 00:37:27 +0100
Subject: [PATCH] clk: rockchip: fix round rate
Subject: clk: rockchip: fix round rate
---
drivers/clk/rockchip/clk-pll.c | 11 +++++++++++
drivers/clk/rockchip/clk-pll.c | 11 ++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/clk/rockchip/clk-pll.c b/drivers/clk/rockchip/clk-pll.c
@ -234,11 +244,13 @@ index 0a9f31f2dd27..183114d824a7 100644
return drate;
}
--
Armbian
From 5a5f5ea8edcc75ca49961a458ac0380e60f30a4d Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sun, 21 Jan 2018 17:20:00 +0100
Subject: [PATCH] drm: fix HDR metadata infoframe length
Subject: drm: fix HDR metadata infoframe length
HDR metadata infoframe length is 26 bytes (not 30) according to [1]
(CTA-861-G: 6.9 Dynamic Range and Mastering InfoFrame)
@ -252,7 +264,7 @@ Fixes activation of HDR mode on my LG OLED
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index 30b6bd979eb8..ec002a4a7a7d 100644
index 3419cf714799..81d8ac736255 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -1857,7 +1857,7 @@ static void hdmi_config_hdr_infoframe(struct dw_hdmi *hdmi)
@ -265,10 +277,10 @@ index 30b6bd979eb8..ec002a4a7a7d 100644
hdmi_writeb(hdmi, frame.eotf, HDMI_FC_DRM_PB0);
hdmi_writeb(hdmi, frame.metadata_type, HDMI_FC_DRM_PB1);
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index bfe671071d9f..e3a0f561e8f0 100644
index e1b515287d26..0c165dff362a 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -4735,10 +4735,10 @@ drm_hdmi_infoframe_set_hdr_metadata(struct hdmi_drm_infoframe *frame,
@@ -4740,10 +4740,10 @@ drm_hdmi_infoframe_set_hdr_metadata(struct hdmi_drm_infoframe *frame,
hdr_source_metadata = (struct hdr_static_metadata *)hdr_metadata;
@ -281,18 +293,20 @@ index bfe671071d9f..e3a0f561e8f0 100644
for (i = 0; i < 3; i++) {
frame->display_primaries_x[i] =
--
Armbian
From 19e9d690fe47e5e4b47760d060b11707bb44194b Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sun, 11 Feb 2018 19:21:41 +0100
Subject: [PATCH] drm: bridge: dw-hdmi: default to underscan mode
Subject: drm: bridge: dw-hdmi: default to underscan mode
---
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index ec002a4a7a7d..393bd5b28f07 100644
index 81d8ac736255..56a992aead27 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -1691,7 +1691,7 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
@ -304,11 +318,13 @@ index ec002a4a7a7d..393bd5b28f07 100644
/*
* The Designware IP uses a different byte format from standard
--
Armbian
From 922cc477bd191cbfddae005b27a2c89cb9c9623a Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sun, 1 Jul 2018 23:17:47 +0200
Subject: [PATCH] drm/rockchip: clip yuv
Subject: drm/rockchip: clip yuv
---
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 ++
@ -317,10 +333,10 @@ Subject: [PATCH] drm/rockchip: clip yuv
3 files changed, 7 insertions(+)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index 1418402c2668..0916b4284f88 100644
index 1b762765c736..efff7cae524e 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -1731,6 +1731,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
@@ -1732,6 +1732,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
s = to_rockchip_crtc_state(crtc->state);
spin_lock(&vop->reg_lock);
@ -328,7 +344,7 @@ index 1418402c2668..0916b4284f88 100644
VOP_WIN_SET(vop, win, xmirror, xmirror);
VOP_WIN_SET(vop, win, ymirror, ymirror);
VOP_WIN_SET(vop, win, format, vop_plane_state->format);
@@ -2544,6 +2545,7 @@ static void vop_update_csc(struct drm_crtc *crtc)
@@ -2548,6 +2549,7 @@ static void vop_update_csc(struct drm_crtc *crtc)
VOP_CTRL_SET(vop, dsp_data_swap, 0);
VOP_CTRL_SET(vop, out_mode, s->output_mode);
@ -357,7 +373,7 @@ index 618de17e608a..391998c7aa50 100644
struct vop_reg ymirror;
struct vop_reg rb_swap;
diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
index 9c96d5614e54..aeb1c7644bc9 100644
index b2667e7411b8..a818b3db21ce 100644
--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
+++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
@@ -119,6 +119,7 @@ static const struct vop_win_phy rk3288_win01_data = {
@ -384,19 +400,20 @@ index 9c96d5614e54..aeb1c7644bc9 100644
.xmirror = VOP_REG(RK3328_DSP_CTRL0, 0x1, 22),
.ymirror = VOP_REG(RK3328_DSP_CTRL0, 0x1, 23),
--
Armbian
From 991811443d72d7915afdee23c30843669a347d7c Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sun, 8 Jul 2018 12:38:00 +0200
Subject: [PATCH] drm/atomic: use active_only flag for connector atomic
begin/flush
Subject: drm/atomic: use active_only flag for connector atomic begin/flush
---
drivers/gpu/drm/drm_atomic_helper.c | 20 ++++++++++----------
drivers/gpu/drm/drm_atomic_helper.c | 20 +++++-----
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index f77d4aa1e58b..4da489b54dc5 100644
index a30621abfee1..6ef0b74514f4 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -1563,15 +1563,15 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev,
@ -441,22 +458,24 @@ index f77d4aa1e58b..4da489b54dc5 100644
continue;
DRM_DEBUG_ATOMIC("flushing [CONNECTOR:%d:%s]\n",
--
Armbian
From 8d514d5127fbb4d49247f893ac6b803cbdd3304d Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sun, 22 Jul 2018 14:51:58 +0200
Subject: [PATCH] drm: rockchip: dw-hdmi: only force YCbCr422 when max tmds is
up to 340Mhz
Subject: drm: rockchip: dw-hdmi: only force YCbCr422 when max tmds is up to
340Mhz
---
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
index 7273561fe6b1..e2aad6e2149b 100644
index ac7ab2c28f6e..8459737791e9 100644
--- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
@@ -728,7 +728,9 @@ dw_hdmi_rockchip_select_output(struct drm_connector_state *conn_state,
@@ -731,7 +731,9 @@ dw_hdmi_rockchip_select_output(struct drm_connector_state *conn_state,
/* BT2020 require color depth at lest 10bit */
*color_depth = 10;
/* We prefer use YCbCr422 to send 10bit */
@ -467,18 +486,20 @@ index 7273561fe6b1..e2aad6e2149b 100644
*color_format = DRM_HDMI_OUTPUT_YCBCR422;
}
--
Armbian
From 9d6de32c2e992b71e6634a284dc99ab1b3bd43e2 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sun, 22 Jul 2018 15:09:16 +0200
Subject: [PATCH] drm: bridge: dw-hdmi: signal full range for rgb output
Subject: drm: bridge: dw-hdmi: signal full range for rgb output
---
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index 393bd5b28f07..91c5b8fc8fa0 100644
index 56a992aead27..a3a5e8cb1c5c 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -1693,6 +1693,14 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
@ -496,21 +517,23 @@ index 393bd5b28f07..91c5b8fc8fa0 100644
/*
* The Designware IP uses a different byte format from standard
* AVI info frames, though generally the bits are in the correct
--
Armbian
From 24a070f21767a8d381b81ab5fc5f39c2b9729b24 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sat, 4 Aug 2018 15:19:39 +0200
Subject: [PATCH] drm: add picture_aspect_ratio to hdmi 1.4 4k modes
Subject: drm: add picture_aspect_ratio to hdmi 1.4 4k modes
---
drivers/gpu/drm/drm_edid.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index f7d41950614e..69a1eb4ee382 100644
index 0c165dff362a..927dc7f469f1 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1233,25 +1233,25 @@ static const struct drm_display_mode edid_4k_modes[] = {
@@ -1236,25 +1236,25 @@ static const struct drm_display_mode edid_4k_modes[] = {
3840, 4016, 4104, 4400, 0,
2160, 2168, 2178, 2250, 0,
DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
@ -540,18 +563,20 @@ index f7d41950614e..69a1eb4ee382 100644
};
/*** DDC fetch and block validation ***/
--
Armbian
From daadd2b2e1bf5419694ebae5243e61e462885b03 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sat, 4 Aug 2018 16:26:47 +0200
Subject: [PATCH] drm: bridge: dw-hdmi: signal none colorimetry for rgb output
Subject: drm: bridge: dw-hdmi: signal none colorimetry for rgb output
---
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index 91c5b8fc8fa0..8261ba15f98e 100644
index a3a5e8cb1c5c..c8c13c05ad9a 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -1694,6 +1694,8 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
@ -563,18 +588,20 @@ index 91c5b8fc8fa0..8261ba15f98e 100644
frame.quantization_range = HDMI_QUANTIZATION_RANGE_FULL;
frame.ycc_quantization_range = HDMI_YCC_QUANTIZATION_RANGE_FULL;
} else {
--
Armbian
From 88c6dbd7a37b01d4029102c6fdad2b1fc24098e0 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sat, 4 Aug 2018 16:27:08 +0200
Subject: [PATCH] drm: bridge: dw-hdmi: signal it content and content type
Subject: drm: bridge: dw-hdmi: signal it content and content type
---
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index 8261ba15f98e..cdfa295fc323 100644
index c8c13c05ad9a..3c5e554015f9 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -1692,6 +1692,8 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
@ -586,11 +613,13 @@ index 8261ba15f98e..cdfa295fc323 100644
if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format)) {
frame.colorimetry = HDMI_COLORIMETRY_NONE;
--
Armbian
From 7405c1596ae36388bc2d32dd8b72f0b1f22ffb41 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Randy Li <randy.li@rock-chips.com>
Date: Thu, 20 Sep 2018 10:59:11 +0800
Subject: [PATCH] Mali: midgard: fix the memory translation for aarch32
Subject: Mali: midgard: fix the memory translation for aarch32
When the clients are 32 bits while the kernel is 64 bits,
we need to translate the memory address before accessing.
@ -598,7 +627,7 @@ we need to translate the memory address before accessing.
Change-Id: I7f47ab94da258e9d170613252aae9b396623cf48
Signed-off-by: Randy Li <randy.li@rock-chips.com>
---
drivers/gpu/arm/midgard/mali_kbase_core_linux.c | 88 +++++++++++++++++++------
drivers/gpu/arm/midgard/mali_kbase_core_linux.c | 88 ++++++++--
1 file changed, 69 insertions(+), 19 deletions(-)
diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
@ -789,18 +818,20 @@ index 24bafe2bf32c..65bc5ad2a7c2 100644
if (err) {
kfree(buf);
return err;
--
Armbian
From 309a27eaf2f4e429ef102e3eef70a2f908360c44 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nick <nick@khadas.com>
Date: Wed, 19 Sep 2018 22:14:58 +0800
Subject: [PATCH] bump PD voltage & current for board without charge IC
Subject: bump PD voltage & current for board without charge IC
---
drivers/mfd/fusb302.c | 28 ++++++++++++++++++++++++++--
drivers/mfd/fusb302.c | 28 +++++++++-
1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/drivers/mfd/fusb302.c b/drivers/mfd/fusb302.c
index 240cecac65b5..8fe4163214e0 100644
index a627252d6710..5fb172acd0c3 100644
--- a/drivers/mfd/fusb302.c
+++ b/drivers/mfd/fusb302.c
@@ -217,8 +217,32 @@ static int fusb302_set_pos_power_by_charge_ic(struct fusb30x_chip *chip)
@ -838,3 +869,6 @@ index 240cecac65b5..8fe4163214e0 100644
psp = POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX;
if (power_supply_get_property(psy, psp, &val) == 0)
--
Armbian

17
patch/kernel/archive/rockchip64-4.4/xxx-0001-Add-Rockpi-E.patch
View File

@ -1,20 +1,19 @@
From 86f5fa6f8a81d92c3c491f53e0bf3c530f755986 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Sat, 8 Aug 2020 20:03:26 +0200
Subject: [PATCH] Add Rockpi E
Subject: Add Rockpi E
Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
---
arch/arm64/boot/dts/rockchip/Makefile | 1 +
.../boot/dts/rockchip/rk3328-rock-pi-e.dts | 468 ++++++++++++++++++
arch/arm64/boot/dts/rockchip/Makefile | 1 +
arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 468 ++++++++++
2 files changed, 469 insertions(+)
create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index 8ed0112e..0fad7396 100644
index f899bbbe4575..3f12c5dd2edd 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -39,6 +39,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-w7-icn6211-rk618-rgb.dtb
@@ -40,6 +40,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-w7-icn6211-rk618-rgb.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-863-lp3-v10.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-863-lp3-v10-avb.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-86v-v10.dtb
@ -24,7 +23,7 @@ index 8ed0112e..0fad7396 100644
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
new file mode 100644
index 00000000..8bda9c3a
index 000000000000..8bda9c3a4b6d
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
@@ -0,0 +1,468 @@
@ -497,5 +496,5 @@ index 00000000..8bda9c3a
+ status = "okay";
+};
--
Created with Armbian build tools https://github.com/armbian/build
Armbian

49
patch/kernel/archive/rockchip64-4.4/z28pro_8822bs.patch
View File

@ -1,8 +1,48 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Thu, 24 May 2018 15:44:15 +0200
Subject: [ARCHEOLOGY] Merging Rockchip family
> X-Git-Archeology: - Revision 7d2f3af08f23049c91c88eec5062613bbfbc85d4: https://github.com/armbian/build/commit/7d2f3af08f23049c91c88eec5062613bbfbc85d4
> X-Git-Archeology: Date: Thu, 24 May 2018 15:44:15 +0200
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Merging Rockchip family
> X-Git-Archeology:
> X-Git-Archeology: - Revision e7630c5092f51ec10f9aad099f543d5446a07bb6: https://github.com/armbian/build/commit/e7630c5092f51ec10f9aad099f543d5446a07bb6
> X-Git-Archeology: Date: Sat, 07 Jul 2018 11:42:05 +0000
> X-Git-Archeology: From: Staars <baars@gmx.de>
> X-Git-Archeology: Subject: Updated DTS for z28pro
> X-Git-Archeology:
> X-Git-Archeology: - Revision 41b589372f2c1a8450033db78f3d8ed9db1b2196: https://github.com/armbian/build/commit/41b589372f2c1a8450033db78f3d8ed9db1b2196
> X-Git-Archeology: Date: Sun, 26 Aug 2018 14:14:14 +0200
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Creating new family rockchip64. 3288 and 3399 was merged in, except Nanopi which stays in RK3399 family with sources attached to FA repository until we manage to join that in. Enabled Nanopc T4, Nanopi M4, Renegade. Tested on Rock64 and Nanopc T4.
> X-Git-Archeology:
> X-Git-Archeology: - Revision 58725209d970c98489a4ee5cdf085a80347c5d47: https://github.com/armbian/build/commit/58725209d970c98489a4ee5cdf085a80347c5d47
> X-Git-Archeology: Date: Tue, 09 Apr 2019 14:44:44 +0200
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: [ rockchip64 default and dev ] Attaching to latest Ayufan branch, patches adjustement, disabled CEC due to issues @darinatoda and briefly tested on both kernels
> X-Git-Archeology:
> X-Git-Archeology: - Revision 150ac0c2afa147d9e3b036c8ecd8238fe5648cf3: https://github.com/armbian/build/commit/150ac0c2afa147d9e3b036c8ecd8238fe5648cf3
> X-Git-Archeology: Date: Tue, 19 Nov 2019 23:25:39 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Remove K<4, change branches, new features (#1586)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/Makefile | 1 +
arch/arm64/boot/dts/rockchip/rk3328-z28pro.dts | 779 ++++++++++
2 files changed, 780 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index 92981d8..1dbe50c 100644
index 3f12c5dd2edd..e59cd4d12eba 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -17,6 +17,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb
@@ -49,6 +49,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb-android-avb.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64-android.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64-android-avb.dtb
@ -12,7 +52,7 @@ index 92981d8..1dbe50c 100644
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-z28pro.dts b/arch/arm64/boot/dts/rockchip/rk3328-z28pro.dts
new file mode 100644
index 0000000..7b82b78
index 000000000000..7b82b7862537
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3328-z28pro.dts
@@ -0,0 +1,779 @@
@ -795,3 +835,6 @@ index 0000000..7b82b78
+&vpu_service {
+ status = "okay";
+};
--
Armbian

26
patch/kernel/archive/rockchip64-4.4/zz-001-overlay-oc-opp-rk3399.patch
View File

@ -1,20 +1,18 @@
From 440c2ac99c32cfdf9556a041e5da4489fb3eaa77 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: JMCC <JMCC@localhost>
Date: Sun, 27 Dec 2020 02:58:41 +0100
Subject: [PATCH] add-oc-opp-rk3399
Subject: add-oc-opp-rk3399
Signed-off-by: JMCC <JMCC@localhost>
---
arch/arm64/boot/dts/rockchip/overlay/Makefile | 4 +-
.../rockchip/overlay/README.rockchip-overlays | 11 ++++
.../overlay/rockchip-rk3399-oc-20.dts | 38 ++++++++++++
.../overlay/rockchip-rk3399-oc-22.dts | 58 +++++++++++++++++++
arch/arm64/boot/dts/rockchip/overlay/Makefile | 4 +-
arch/arm64/boot/dts/rockchip/overlay/README.rockchip-overlays | 11 ++
arch/arm64/boot/dts/rockchip/overlay/rockchip-rk3399-oc-20.dts | 38 ++++++
arch/arm64/boot/dts/rockchip/overlay/rockchip-rk3399-oc-22.dts | 58 ++++++++++
4 files changed, 110 insertions(+), 1 deletion(-)
create mode 100644 arch/arm64/boot/dts/rockchip/overlay/rockchip-rk3399-oc-20.dts
create mode 100644 arch/arm64/boot/dts/rockchip/overlay/rockchip-rk3399-oc-22.dts
diff --git a/arch/arm64/boot/dts/rockchip/overlay/Makefile b/arch/arm64/boot/dts/rockchip/overlay/Makefile
index c5f52da3..9d39fce0 100644
index c5f52da3ab08..9d39fce0031f 100644
--- a/arch/arm64/boot/dts/rockchip/overlay/Makefile
+++ b/arch/arm64/boot/dts/rockchip/overlay/Makefile
@@ -3,10 +3,12 @@ dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
@ -32,10 +30,10 @@ index c5f52da3..9d39fce0 100644
scr-$(CONFIG_ARCH_ROCKCHIP) += \
rockchip-fixup.scr
diff --git a/arch/arm64/boot/dts/rockchip/overlay/README.rockchip-overlays b/arch/arm64/boot/dts/rockchip/overlay/README.rockchip-overlays
index ba6d51f6..13b55335 100644
index 3da852a20d27..efb8d23fde7b 100644
--- a/arch/arm64/boot/dts/rockchip/overlay/README.rockchip-overlays
+++ b/arch/arm64/boot/dts/rockchip/overlay/README.rockchip-overlays
@@ -29,6 +29,17 @@ I2C8 pins (SCL, SDA): GPIO1-C5, GPIO1-C4
@@ -29,6 +29,17 @@ I2C8 pins (pi-conn) (pi-conn) (SCL, SDA): GPIO1-C5, GPIO1-C4
Enables PCIe Gen2 link speed on RK3399.
WARNING! Not officially supported by Rockchip!!!
@ -55,7 +53,7 @@ index ba6d51f6..13b55335 100644
Activates MTD support for JEDEC compatible SPI NOR flash chips on SPI bus
diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-rk3399-oc-20.dts b/arch/arm64/boot/dts/rockchip/overlay/rockchip-rk3399-oc-20.dts
new file mode 100644
index 00000000..32f70cfe
index 000000000000..32f70cfe8a14
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-rk3399-oc-20.dts
@@ -0,0 +1,38 @@
@ -99,7 +97,7 @@ index 00000000..32f70cfe
+};
diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-rk3399-oc-22.dts b/arch/arm64/boot/dts/rockchip/overlay/rockchip-rk3399-oc-22.dts
new file mode 100644
index 00000000..04b23b57
index 000000000000..04b23b578eeb
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-rk3399-oc-22.dts
@@ -0,0 +1,58 @@
@ -162,5 +160,5 @@ index 00000000..04b23b57
+ };
+};
--
Created with Armbian build tools https://github.com/armbian/build
Armbian

29
patch/kernel/archive/rockchip64-4.4/zz-002-overlay-rpi-camera-and-screen.patch
View File

@ -1,22 +1,19 @@
From 42543b9b492731d72547987f84bd64477a3ce992 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: JMCC <JMCC@localhost>
Date: Sun, 27 Dec 2020 01:44:20 +0100
Subject: [PATCH] zz-53-add-rpi-camera-and-screen
Subject: zz-53-add-rpi-camera-and-screen
Signed-off-by: JMCC <JMCC@localhost>
---
arch/arm64/boot/dts/rockchip/overlay/Makefile | 3 ++
.../rockchip/overlay/README.rockchip-overlays | 16 +++++++
.../overlay/rockchip-rpi-7inch-lcd.dts | 45 +++++++++++++++++++
.../overlay/rockchip-rpi-cam-imx219.dts | 22 +++++++++
.../overlay/rockchip-rpi-cam-ov5647.dts | 30 +++++++++++++
arch/arm64/boot/dts/rockchip/overlay/Makefile | 3 +
arch/arm64/boot/dts/rockchip/overlay/README.rockchip-overlays | 16 ++++
arch/arm64/boot/dts/rockchip/overlay/rockchip-rpi-7inch-lcd.dts | 45 ++++++++++
arch/arm64/boot/dts/rockchip/overlay/rockchip-rpi-cam-imx219.dts | 22 +++++
arch/arm64/boot/dts/rockchip/overlay/rockchip-rpi-cam-ov5647.dts | 30 +++++++
5 files changed, 116 insertions(+)
create mode 100644 arch/arm64/boot/dts/rockchip/overlay/rockchip-rpi-7inch-lcd.dts
create mode 100644 arch/arm64/boot/dts/rockchip/overlay/rockchip-rpi-cam-imx219.dts
create mode 100644 arch/arm64/boot/dts/rockchip/overlay/rockchip-rpi-cam-ov5647.dts
diff --git a/arch/arm64/boot/dts/rockchip/overlay/Makefile b/arch/arm64/boot/dts/rockchip/overlay/Makefile
index 9d39fce0..6443999d 100644
index 9d39fce0031f..6443999d0f31 100644
--- a/arch/arm64/boot/dts/rockchip/overlay/Makefile
+++ b/arch/arm64/boot/dts/rockchip/overlay/Makefile
@@ -5,6 +5,9 @@ dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
@ -30,7 +27,7 @@ index 9d39fce0..6443999d 100644
rockchip-spi-spidev.dtbo \
rockchip-uart4.dtbo \
diff --git a/arch/arm64/boot/dts/rockchip/overlay/README.rockchip-overlays b/arch/arm64/boot/dts/rockchip/overlay/README.rockchip-overlays
index 13b55335..ba34d596 100644
index efb8d23fde7b..6ae79d9422ad 100644
--- a/arch/arm64/boot/dts/rockchip/overlay/README.rockchip-overlays
+++ b/arch/arm64/boot/dts/rockchip/overlay/README.rockchip-overlays
@@ -40,6 +40,22 @@ Enables Overclocking frequencies 2.2/1.7 Ghz.
@ -58,7 +55,7 @@ index 13b55335..ba34d596 100644
Activates MTD support for JEDEC compatible SPI NOR flash chips on SPI bus
diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-rpi-7inch-lcd.dts b/arch/arm64/boot/dts/rockchip/overlay/rockchip-rpi-7inch-lcd.dts
new file mode 100644
index 00000000..77fe1438
index 000000000000..77fe14383a93
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-rpi-7inch-lcd.dts
@@ -0,0 +1,45 @@
@ -109,7 +106,7 @@ index 00000000..77fe1438
+};
diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-rpi-cam-imx219.dts b/arch/arm64/boot/dts/rockchip/overlay/rockchip-rpi-cam-imx219.dts
new file mode 100644
index 00000000..2cd419b6
index 000000000000..2cd419b6d414
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-rpi-cam-imx219.dts
@@ -0,0 +1,22 @@
@ -137,7 +134,7 @@ index 00000000..2cd419b6
+};
diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-rpi-cam-ov5647.dts b/arch/arm64/boot/dts/rockchip/overlay/rockchip-rpi-cam-ov5647.dts
new file mode 100644
index 00000000..61c8b88b
index 000000000000..61c8b88b7ed6
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-rpi-cam-ov5647.dts
@@ -0,0 +1,30 @@
@ -172,5 +169,5 @@ index 00000000..61c8b88b
+ };
+};
--
Created with Armbian build tools https://github.com/armbian/build
Armbian

60
patch/kernel/archive/rockchip64-4.4/zz-add-rk3328-firefly-core-dtsi.patch
View File

@ -1,5 +1,61 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
Date: Sat, 20 Jun 2020 22:39:57 +0200
Subject: [ARCHEOLOGY] Initial ROCK Pi E support (as WIP) (#2042)
> X-Git-Archeology: > recovered message: > * WIP: Adding RockpiE config
> X-Git-Archeology: > recovered message: > Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: > recovered message: > * Mainline u-boot for ROCK Pi E
> X-Git-Archeology: > recovered message: > * Initial ROCK Pi E device tree in kernel
> X-Git-Archeology: > recovered message: > * Fixed supplies for ROCK Pi E device tree
> X-Git-Archeology: > recovered message: > * Adjusted u-boot load address for rockchip64 boards with 256MB eg. ROCK Pi E
> X-Git-Archeology: > recovered message: > * Blacklisted lima on ROCK Pi E
> X-Git-Archeology: > recovered message: > * Fixed ROCK Pi E patch after merge from master
> X-Git-Archeology: > recovered message: > * Removed mode settings from rk805 regulators
> X-Git-Archeology: > recovered message: > * Fixed issues with offloading for gigabit interface of RockPi E
> X-Git-Archeology: > recovered message: > * Adjusted ROCK Pi E board config
> X-Git-Archeology: > recovered message: > * Added dev branch for ROCK Pi E
> X-Git-Archeology: > recovered message: > * Add build targets
> X-Git-Archeology: > recovered message: > Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: > recovered message: > * Exchange legacy to current in ROCK Pi E build targets
> X-Git-Archeology: > recovered message: > Co-authored-by: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: - Revision e1ecb098330dc372740371dc2386f911833a0529: https://github.com/armbian/build/commit/e1ecb098330dc372740371dc2386f911833a0529
> X-Git-Archeology: Date: Sat, 20 Jun 2020 22:39:57 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Initial ROCK Pi E support (as WIP) (#2042)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 72257bd0648c28fca32962126bb885a4a2c188cc: https://github.com/armbian/build/commit/72257bd0648c28fca32962126bb885a4a2c188cc
> X-Git-Archeology: Date: Tue, 23 Jun 2020 16:37:54 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Make USB3 support of ROCK Pi E on par with other rk3328 boards (#2050)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 36405e3397b68600bdd2c34d5a7bcfa0a09b1226: https://github.com/armbian/build/commit/36405e3397b68600bdd2c34d5a7bcfa0a09b1226
> X-Git-Archeology: Date: Sat, 29 Aug 2020 00:16:28 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Add Rockpi 4C (#2129)
> X-Git-Archeology:
> X-Git-Archeology: - Revision a1e96e68d864ddc2fef169f3f503a9493311313b: https://github.com/armbian/build/commit/a1e96e68d864ddc2fef169f3f503a9493311313b
> X-Git-Archeology: Date: Mon, 04 Jan 2021 11:51:43 +0100
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: add station legacy (#2521)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 438563b6656ccdd5d1176974ecf064d0a80736c5: https://github.com/armbian/build/commit/438563b6656ccdd5d1176974ecf064d0a80736c5
> X-Git-Archeology: Date: Fri, 22 Jan 2021 20:34:45 +0100
> X-Git-Archeology: From: JMCC <jmcc1@gmx.com>
> X-Git-Archeology: Subject: Station M1 Legacy: Enable 1.51Ghz OPP
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/rk3328-firefly-core.dtsi | 453 ++++++++++
1 file changed, 453 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-firefly-core.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-firefly-core.dtsi
new file mode 100644
index 0000000..7b82b78
index 000000000000..db60b8597d51
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3328-firefly-core.dtsi
@@ -0,0 +1,453 @@
@ -456,4 +512,6 @@ index 0000000..7b82b78
+ status = "okay";
+};
+
--
Armbian

24
patch/kernel/archive/rockchip64-4.4/zz-add-rk3328-firefly-port-dtsi.patch
View File

@ -1,5 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Oleg <balbes-150@yandex.ru>
Date: Mon, 4 Jan 2021 11:51:43 +0100
Subject: [ARCHEOLOGY] add station legacy (#2521)
> X-Git-Archeology: - Revision a1e96e68d864ddc2fef169f3f503a9493311313b: https://github.com/armbian/build/commit/a1e96e68d864ddc2fef169f3f503a9493311313b
> X-Git-Archeology: Date: Mon, 04 Jan 2021 11:51:43 +0100
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: add station legacy (#2521)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/rk3328-firefly-port.dtsi | 377 ++++++++++
1 file changed, 377 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-firefly-port.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-firefly-port.dtsi
new file mode 100644
index 0000000..7b82b78
index 000000000000..9d6c8bf751d1
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3328-firefly-port.dtsi
@@ -0,0 +1,377 @@
@ -380,4 +400,6 @@ index 0000000..7b82b78
+ <0xb5 KEY_BACKSPACE>;
+ };
+};
--
Armbian

24
patch/kernel/archive/rockchip64-4.4/zz-add-rk3328-linux-dtsi.patch
View File

@ -1,5 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Oleg <balbes-150@yandex.ru>
Date: Mon, 4 Jan 2021 11:51:43 +0100
Subject: [ARCHEOLOGY] add station legacy (#2521)
> X-Git-Archeology: - Revision a1e96e68d864ddc2fef169f3f503a9493311313b: https://github.com/armbian/build/commit/a1e96e68d864ddc2fef169f3f503a9493311313b
> X-Git-Archeology: Date: Mon, 04 Jan 2021 11:51:43 +0100
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: add station legacy (#2521)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/rk3328-linux.dtsi | 41 ++++++++++
1 file changed, 41 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-linux.dtsi
new file mode 100644
index 0000000..7b82b78
index 000000000000..77e9dbf874eb
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3328-linux.dtsi
@@ -0,0 +1,41 @@
@ -44,4 +64,6 @@ index 0000000..7b82b78
+&rga {
+ status = "okay";
+};
--
Armbian

24
patch/kernel/archive/rockchip64-4.4/zz-add-rk3328-roc-pc-dts.patch
View File

@ -1,5 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Oleg <balbes-150@yandex.ru>
Date: Mon, 4 Jan 2021 11:51:43 +0100
Subject: [ARCHEOLOGY] add station legacy (#2521)
> X-Git-Archeology: - Revision a1e96e68d864ddc2fef169f3f503a9493311313b: https://github.com/armbian/build/commit/a1e96e68d864ddc2fef169f3f503a9493311313b
> X-Git-Archeology: Date: Mon, 04 Jan 2021 11:51:43 +0100
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: add station legacy (#2521)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts | 121 ++++++++++
1 file changed, 121 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts
new file mode 100644
index 0000000..7b82b78
index 000000000000..8f58ed93117a
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts
@@ -0,0 +1,121 @@
@ -124,4 +144,6 @@ index 0000000..7b82b78
+ SYS_STATUS_BOOST 786000
+ >;
+};
--
Armbian

25
patch/kernel/archive/rockchip64-4.4/zz-add-rk3328-roc-pc-make.patch
View File

@ -1,6 +1,27 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Oleg <balbes-150@yandex.ru>
Date: Mon, 4 Jan 2021 11:51:43 +0100
Subject: [ARCHEOLOGY] add station legacy (#2521)
> X-Git-Archeology: - Revision a1e96e68d864ddc2fef169f3f503a9493311313b: https://github.com/armbian/build/commit/a1e96e68d864ddc2fef169f3f503a9493311313b
> X-Git-Archeology: Date: Mon, 04 Jan 2021 11:51:43 +0100
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: add station legacy (#2521)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index e59cd4d12eba..22aba56284dd 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -45,6 +45,7 @@
@@ -46,6 +46,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-box-liantong-avb.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb-android.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb-android-avb.dtb
@ -8,4 +29,6 @@
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64-android.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64-android-avb.dtb
--
Armbian

35
patch/kernel/archive/rockchip64-4.4/zz-add-rk3399-roc-pc-make.patch
View File

@ -1,6 +1,37 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Oleg <balbes-150@yandex.ru>
Date: Mon, 4 Jan 2021 11:51:43 +0100
Subject: [ARCHEOLOGY] add station legacy (#2521)
> X-Git-Archeology: - Revision a1e96e68d864ddc2fef169f3f503a9493311313b: https://github.com/armbian/build/commit/a1e96e68d864ddc2fef169f3f503a9493311313b
> X-Git-Archeology: Date: Mon, 04 Jan 2021 11:51:43 +0100
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: add station legacy (#2521)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 804c57dd5925e67383a3d82c85f18868a6173d4b: https://github.com/armbian/build/commit/804c57dd5925e67383a3d82c85f18868a6173d4b
> X-Git-Archeology: Date: Tue, 26 Jan 2021 21:22:37 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Enable RTC (hym8563) for Station P1 in mainline (renaming DT in process) (#2577)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 510e348202f8efb838a57a9eec6ccbc910d7e06e: https://github.com/armbian/build/commit/510e348202f8efb838a57a9eec6ccbc910d7e06e
> X-Git-Archeology: Date: Sun, 18 Apr 2021 22:48:56 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: 150balbes fix station legacy (#2782)
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/Makefile | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index 22aba56284dd..9dcebdaff2ff 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -84,6 +84,9 @@
@@ -87,6 +87,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb-rev3-android-mipi-edp.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb-rev3-cros.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly-android.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly-linux.dtb
@ -10,4 +41,6 @@
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-fpga.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-gru.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin-r0.dtb
--
Armbian

51
patch/kernel/archive/rockchip64-4.4/zz-add-rk3399-roc-pc-mezzanine-dts.patch
View File

@ -1,5 +1,52 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
Date: Sat, 29 Aug 2020 00:16:28 +0200
Subject: [ARCHEOLOGY] Add Rockpi 4C (#2129)
> X-Git-Archeology: > recovered message: > * Add Rockpi 4C
> X-Git-Archeology: > recovered message: > * Update config/boards/rockpi-4c.conf
> X-Git-Archeology: > recovered message: > Co-authored-by: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: > recovered message: > * Change backward compatibility link to B model
> X-Git-Archeology: > recovered message: > * Various changes - tested for building.
> X-Git-Archeology: > recovered message: > - add Radxa overlays
> X-Git-Archeology: > recovered message: > - update naming with mainline
> X-Git-Archeology: > recovered message: > - add Rockpi-E
> X-Git-Archeology: > recovered message: > * Reverting improvements for rockpi legacy and create a link to new DT only
> X-Git-Archeology: > recovered message: > * Copied ROCK Pi 4 device treesplitting patches to dev which was broken
> X-Git-Archeology: > recovered message: > * Add Rockpi 4c targets
> X-Git-Archeology: > recovered message: > Co-authored-by: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: - Revision 36405e3397b68600bdd2c34d5a7bcfa0a09b1226: https://github.com/armbian/build/commit/36405e3397b68600bdd2c34d5a7bcfa0a09b1226
> X-Git-Archeology: Date: Sat, 29 Aug 2020 00:16:28 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Add Rockpi 4C (#2129)
> X-Git-Archeology:
> X-Git-Archeology: - Revision a1e96e68d864ddc2fef169f3f503a9493311313b: https://github.com/armbian/build/commit/a1e96e68d864ddc2fef169f3f503a9493311313b
> X-Git-Archeology: Date: Mon, 04 Jan 2021 11:51:43 +0100
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: add station legacy (#2521)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 804c57dd5925e67383a3d82c85f18868a6173d4b: https://github.com/armbian/build/commit/804c57dd5925e67383a3d82c85f18868a6173d4b
> X-Git-Archeology: Date: Tue, 26 Jan 2021 21:22:37 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Enable RTC (hym8563) for Station P1 in mainline (renaming DT in process) (#2577)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 510e348202f8efb838a57a9eec6ccbc910d7e06e: https://github.com/armbian/build/commit/510e348202f8efb838a57a9eec6ccbc910d7e06e
> X-Git-Archeology: Date: Sun, 18 Apr 2021 22:48:56 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: 150balbes fix station legacy (#2782)
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts | 1223 ++++++++++
1 file changed, 1223 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts
new file mode 100644
index 0000000..7b82b78
index 000000000000..d83db8fc1122
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts
@@ -0,0 +1,1223 @@
@ -1226,4 +1273,6 @@ index 0000000..7b82b78
+&dsi1_in_vopb {
+ status = "disabled";
+};
--
Armbian

56
patch/kernel/archive/rockchip64-4.4/zz-add-rk3399-roc-pc-plus-dts.patch
View File

@ -1,5 +1,57 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
Date: Sat, 29 Aug 2020 00:16:28 +0200
Subject: [ARCHEOLOGY] Add Rockpi 4C (#2129)
> X-Git-Archeology: > recovered message: > * Add Rockpi 4C
> X-Git-Archeology: > recovered message: > * Update config/boards/rockpi-4c.conf
> X-Git-Archeology: > recovered message: > Co-authored-by: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: > recovered message: > * Change backward compatibility link to B model
> X-Git-Archeology: > recovered message: > * Various changes - tested for building.
> X-Git-Archeology: > recovered message: > - add Radxa overlays
> X-Git-Archeology: > recovered message: > - update naming with mainline
> X-Git-Archeology: > recovered message: > - add Rockpi-E
> X-Git-Archeology: > recovered message: > * Reverting improvements for rockpi legacy and create a link to new DT only
> X-Git-Archeology: > recovered message: > * Copied ROCK Pi 4 device treesplitting patches to dev which was broken
> X-Git-Archeology: > recovered message: > * Add Rockpi 4c targets
> X-Git-Archeology: > recovered message: > Co-authored-by: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: - Revision 36405e3397b68600bdd2c34d5a7bcfa0a09b1226: https://github.com/armbian/build/commit/36405e3397b68600bdd2c34d5a7bcfa0a09b1226
> X-Git-Archeology: Date: Sat, 29 Aug 2020 00:16:28 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Add Rockpi 4C (#2129)
> X-Git-Archeology:
> X-Git-Archeology: - Revision a1e96e68d864ddc2fef169f3f503a9493311313b: https://github.com/armbian/build/commit/a1e96e68d864ddc2fef169f3f503a9493311313b
> X-Git-Archeology: Date: Mon, 04 Jan 2021 11:51:43 +0100
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: add station legacy (#2521)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 804c57dd5925e67383a3d82c85f18868a6173d4b: https://github.com/armbian/build/commit/804c57dd5925e67383a3d82c85f18868a6173d4b
> X-Git-Archeology: Date: Tue, 26 Jan 2021 21:22:37 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Enable RTC (hym8563) for Station P1 in mainline (renaming DT in process) (#2577)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 510e348202f8efb838a57a9eec6ccbc910d7e06e: https://github.com/armbian/build/commit/510e348202f8efb838a57a9eec6ccbc910d7e06e
> X-Git-Archeology: Date: Sun, 18 Apr 2021 22:48:56 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: 150balbes fix station legacy (#2782)
> X-Git-Archeology:
> X-Git-Archeology: - Revision ee2607897232d2b8668f58ac860c0b47922d72f1: https://github.com/armbian/build/commit/ee2607897232d2b8668f58ac860c0b47922d72f1
> X-Git-Archeology: Date: Wed, 21 Apr 2021 10:10:56 +0200
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: fix rk3399-roc-ps-plus (#2786)
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts | 1223 ++++++++++
1 file changed, 1223 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts
new file mode 100644
index 0000000..7b82b78
index 000000000000..d83db8fc1122
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts
@@ -0,0 +1,1223 @@
@ -1226,4 +1278,6 @@ index 0000000..7b82b78
+&dsi1_in_vopb {
+ status = "disabled";
+};
--
Armbian

20
patch/kernel/archive/rockchip64-4.4/zzz-add-rk3399-cru-h.patch
View File

@ -1,3 +1,21 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
Date: Sun, 18 Apr 2021 22:48:56 +0200
Subject: [ARCHEOLOGY] 150balbes fix station legacy (#2782)
> X-Git-Archeology: > recovered message: > * Fix Legacy Stations
> X-Git-Archeology: > recovered message: > Co-authored-by: balbes150 <balbes-150@yandex.ru>
> X-Git-Archeology: - Revision 510e348202f8efb838a57a9eec6ccbc910d7e06e: https://github.com/armbian/build/commit/510e348202f8efb838a57a9eec6ccbc910d7e06e
> X-Git-Archeology: Date: Sun, 18 Apr 2021 22:48:56 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: 150balbes fix station legacy (#2782)
> X-Git-Archeology:
---
include/dt-bindings/clock/rk3399-cru.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/dt-bindings/clock/rk3399-cru.h b/include/dt-bindings/clock/rk3399-cru.h
index a2aa50c8d3ab..252515746aee 100644
--- a/include/dt-bindings/clock/rk3399-cru.h
+++ b/include/dt-bindings/clock/rk3399-cru.h
@@ -31,6 +31,7 @@
@ -8,4 +26,6 @@
#define SCLK_I2C1 65
#define SCLK_I2C2 66
#define SCLK_I2C3 67
--
Armbian

115
patch/kernel/archive/rockchip64-4.4/zzz-add-rk3399-es8323-c.patch
View File

@ -1,3 +1,21 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
Date: Sun, 18 Apr 2021 22:48:56 +0200
Subject: [ARCHEOLOGY] 150balbes fix station legacy (#2782)
> X-Git-Archeology: > recovered message: > * Fix Legacy Stations
> X-Git-Archeology: > recovered message: > Co-authored-by: balbes150 <balbes-150@yandex.ru>
> X-Git-Archeology: - Revision 510e348202f8efb838a57a9eec6ccbc910d7e06e: https://github.com/armbian/build/commit/510e348202f8efb838a57a9eec6ccbc910d7e06e
> X-Git-Archeology: Date: Sun, 18 Apr 2021 22:48:56 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: 150balbes fix station legacy (#2782)
> X-Git-Archeology:
---
sound/soc/codecs/es8323.c | 211 ++++++++--
1 file changed, 187 insertions(+), 24 deletions(-)
diff --git a/sound/soc/codecs/es8323.c b/sound/soc/codecs/es8323.c
index b7a41b8342d2..c8f1227fbecd 100755
--- a/sound/soc/codecs/es8323.c
+++ b/sound/soc/codecs/es8323.c
@@ -33,17 +33,19 @@
@ -11,21 +29,19 @@
#define ES8323_CODEC_SET_SPK 1
#define ES8323_CODEC_SET_HP 2
-
-#define es8323_DEF_VOL 0x1b
-
-static int es8323_set_bias_level(struct snd_soc_codec *codec,
- enum snd_soc_bias_level level);
+#define MUTED_TYPE_OFF 0
+#define MUTED_TYPE_ON 1
+
-#define es8323_DEF_VOL 0x1b
+#define es8323_DEF_VOL 0x1e
+
-static int es8323_set_bias_level(struct snd_soc_codec *codec,
- enum snd_soc_bias_level level);
+#define DBG(fmt, ...) printk("%s-%d:" fmt, __FUNCTION__, __LINE__, ##__VA_ARGS__)
/*
* es8323 register cache
@@ -72,21 +74,41 @@
@@ -72,23 +74,43 @@ struct es8323_priv {
unsigned int sysclk;
struct clk *mclk;
struct snd_pcm_hw_constraint_list *sysclk_constraints;
@ -47,7 +63,6 @@
static struct es8323_priv *es8323_private;
-static int es8323_set_gpio(struct es8323_priv *es8323, int gpio, bool level)
-{
+static struct snd_soc_codec *es8323_codec;
+
+static int es8323_set_bias_level(struct snd_soc_codec *codec,
@ -56,26 +71,26 @@
+static DECLARE_DELAYED_WORK(aux_det_work, aux_det_work_func);
+
+static int es8323_set_gpio(int gpio, bool level)
+{
{
+ struct es8323_priv *es8323 = es8323_private;
+
if (!es8323) {
return 0;
+ }
+
}
+ if ((gpio & ES8323_CODEC_SET_HP) && es8323
+ && es8323->hp_ctl_gpio != INVALID_GPIO) {
+ gpio_set_value(es8323->hp_ctl_gpio, level);
}
+ }
+
if ((gpio & ES8323_CODEC_SET_SPK) && es8323
@@ -97,29 +119,91 @@
&& es8323->spk_ctl_gpio != INVALID_GPIO) {
gpio_set_value(es8323->spk_ctl_gpio, level);
@@ -97,29 +119,91 @@ static int es8323_set_gpio(struct es8323_priv *es8323, int gpio, bool level)
return 0;
}
-static void es8323_get_hp_det_gpio(struct es8323_priv *es8323)
-{
- if (es8323->hp_det_gpio == INVALID_GPIO)
+static void spk_detect_do_switch(int flags)
+{
+ struct es8323_priv *es8323 = es8323_private;
@ -100,7 +115,8 @@
+}
+
+static irqreturn_t hp_det_irq_handler(int irq, void *dev_id)
+{
{
- if (es8323->hp_det_gpio == INVALID_GPIO)
+ struct es8323_priv *es8323 = es8323_private;
+
+ if (!gpio_get_value(es8323->hp_det_gpio)) {
@ -116,27 +132,19 @@
+ spk_detect_do_switch(!es8323->muted);
else
- es8323->hp_inserted = 0;
-}
-
+ spk_detect_do_switch(1);
+
+ return IRQ_HANDLED;
}
-static void es8323_set_spk_gpio(struct es8323_priv *es8323)
-{
+static void es8323_set_linein(unsigned int flags)
{
- if (es8323->muted || es8323->hp_inserted)
- es8323_set_gpio(es8323, ES8323_CODEC_SET_SPK, !es8323->spk_gpio_level);
- else
- es8323_set_gpio(es8323, ES8323_CODEC_SET_SPK, es8323->spk_gpio_level);
-}
-
-static irqreturn_t hp_det_irq_handler(int irq, void *dev_id)
+ spk_detect_do_switch(1);
+
+ return IRQ_HANDLED;
+}
+
+static void es8323_set_linein(unsigned int flags)
{
struct es8323_priv *es8323 = es8323_private;
- es8323_get_hp_det_gpio(es8323);
- es8323_set_spk_gpio(es8323);
+ struct es8323_priv *es8323 = es8323_private;
+
+ if (flags) {
+ printk("ES8323 enter line in mode\n");
@ -159,11 +167,14 @@
+
+ spk_detect_do_switch(!es8323->muted);
+ }
+}
+
}
-static irqreturn_t hp_det_irq_handler(int irq, void *dev_id)
+static void aux_det_work_func(struct work_struct *work)
+{
+ struct es8323_priv *es8323 = es8323_private;
{
struct es8323_priv *es8323 = es8323_private;
- es8323_get_hp_det_gpio(es8323);
- es8323_set_spk_gpio(es8323);
+
+ es8323->line_in_status = !gpio_get_value(es8323->aux_det_gpio);
+
@ -179,7 +190,7 @@
return IRQ_HANDLED;
}
@@ -673,7 +757,7 @@
@@ -673,7 +757,7 @@ static int es8323_mute(struct snd_soc_dai *dai, int mute)
es8323->muted = mute;
if (mute) {
@ -188,7 +199,7 @@
usleep_range(18000, 20000);
snd_soc_write(codec, ES8323_DACCONTROL3, 0x06);
} else {
@@ -681,9 +765,16 @@
@@ -681,9 +765,16 @@ static int es8323_mute(struct snd_soc_dai *dai, int mute)
snd_soc_write(codec, 0x30, es8323_DEF_VOL);
snd_soc_write(codec, 0x31, es8323_DEF_VOL);
msleep(50);
@ -206,7 +217,7 @@
return 0;
}
@@ -798,7 +889,31 @@
@@ -798,7 +889,31 @@ static int es8323_resume(struct snd_soc_codec *codec)
return 0;
}
@ -239,7 +250,7 @@
static int es8323_probe(struct snd_soc_codec *codec)
{
struct es8323_priv *es8323 = snd_soc_codec_get_drvdata(codec);
@@ -821,7 +936,17 @@
@@ -821,7 +936,17 @@ static int es8323_probe(struct snd_soc_codec *codec)
codec->hw_write = (hw_write_t) i2c_master_send;
codec->control_data = container_of(codec->dev, struct i2c_client, dev);
@ -257,7 +268,7 @@
ret = es8323_reset(codec);
if (ret < 0) {
dev_err(codec->dev, "Failed to issue reset\n");
@@ -840,6 +965,7 @@
@@ -840,6 +965,7 @@ static int es8323_probe(struct snd_soc_codec *codec)
snd_soc_write(codec, 0x09, 0x88); /* ADC L/R PGA = +24dB */
snd_soc_write(codec, 0x0a, 0xf0); /* ADC INPUT=LIN2/RIN2 */
snd_soc_write(codec, 0x0b, 0x82); /* ADC INPUT=LIN2/RIN2 */
@ -265,7 +276,7 @@
snd_soc_write(codec, 0x0C, 0x4c); /* I2S-24BIT */
snd_soc_write(codec, 0x0d, 0x02); /* MCLK/LRCK=256 */
snd_soc_write(codec, 0x10, 0x00); /* ADC Left Volume=0db */
@@ -890,6 +1016,8 @@
@@ -890,6 +1016,8 @@ static struct snd_soc_codec_driver soc_codec_dev_es8323 = {
.remove = es8323_remove,
.suspend = es8323_suspend,
.resume = es8323_resume,
@ -274,7 +285,7 @@
.set_bias_level = es8323_set_bias_level,
.reg_cache_size = ARRAY_SIZE(es8323_reg),
.reg_word_size = sizeof(u16),
@@ -930,7 +1058,7 @@
@@ -930,7 +1058,7 @@ static int es8323_i2c_probe(struct i2c_client *i2c,
}
es8323_private = es8323;
@ -283,7 +294,7 @@
if (es8323->spk_ctl_gpio < 0) {
dev_info(&i2c->dev, "Can not read property spk_ctl_gpio\n");
es8323->spk_ctl_gpio = INVALID_GPIO;
@@ -941,6 +1069,21 @@
@@ -941,6 +1069,21 @@ static int es8323_i2c_probe(struct i2c_client *i2c,
dev_err(&i2c->dev, "Failed to request spk_ctl_gpio\n");
return ret;
}
@ -305,17 +316,15 @@
}
es8323->hp_det_gpio = of_get_named_gpio_flags(i2c->dev.of_node, "hp-det-gpio", 0, &flags);
@@ -964,11 +1107,30 @@
@@ -964,11 +1107,30 @@ static int es8323_i2c_probe(struct i2c_client *i2c,
return ret;
}
}
-
- es8323_get_hp_det_gpio(es8323);
- }
-
}
- es8323_set_spk_gpio(es8323);
+ }
+
+ es8323->aux_det_gpio = of_get_named_gpio_flags(i2c->dev.of_node, "aux-det-gpio", 0, &flags);
+ if (es8323->aux_det_gpio < 0) {
+ dev_info(&i2c->dev, "Can not read property aux_det_gpio\n");
@ -341,7 +350,7 @@
ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_es8323,
@@ -993,7 +1155,8 @@
@@ -993,7 +1155,8 @@ void es8323_i2c_shutdown(struct i2c_client *client)
{
struct es8323_priv *es8323 = es8323_private;
@ -351,4 +360,6 @@
mdelay(20);
snd_soc_write(es8323_codec, ES8323_CONTROL2, 0x58);
snd_soc_write(es8323_codec, ES8323_CONTROL1, 0x32);
--
Armbian

18
patch/kernel/archive/rockchip64-4.4/zzz-add-rk3399-firefly-dts.patch
View File

@ -1,3 +1,19 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Oleg <balbes-150@yandex.ru>
Date: Wed, 16 Jun 2021 19:47:19 +0200
Subject: [ARCHEOLOGY] fix dts for firefly-rk3399 legacy (#2902)
> X-Git-Archeology: - Revision f484fb7a8bbe1f71668d74fc258298d8694d7a4b: https://github.com/armbian/build/commit/f484fb7a8bbe1f71668d74fc258298d8694d7a4b
> X-Git-Archeology: Date: Wed, 16 Jun 2021 19:47:19 +0200
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: fix dts for firefly-rk3399 legacy (#2902)
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts | 129 +++++++++-
1 file changed, 126 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts
index 82bb2a63fe73..e7c8933bae45 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts
@@ -333,7 +333,7 @@
@ -164,4 +180,6 @@
&vopb {
status = "okay";
};
--
Armbian

23
patch/kernel/archive/rockchip64-4.4/zzz-add-rk3399-roc-pc-dts.patch
View File

@ -1,5 +1,22 @@
new file mode 120000
index 00000000..5a62cd6b
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
Date: Sun, 18 Apr 2021 22:48:56 +0200
Subject: [ARCHEOLOGY] 150balbes fix station legacy (#2782)
> X-Git-Archeology: > recovered message: > * Fix Legacy Stations
> X-Git-Archeology: > recovered message: > Co-authored-by: balbes150 <balbes-150@yandex.ru>
> X-Git-Archeology: - Revision 510e348202f8efb838a57a9eec6ccbc910d7e06e: https://github.com/armbian/build/commit/510e348202f8efb838a57a9eec6ccbc910d7e06e
> X-Git-Archeology: Date: Sun, 18 Apr 2021 22:48:56 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: 150balbes fix station legacy (#2782)
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
new file mode 100644
index 000000000000..99f3a24cadda
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
@@ -0,0 +1,7 @@
@ -10,4 +27,6 @@ index 00000000..5a62cd6b
+ model = "Firefly roc-rk3399-pc";
+ compatible = "firefly,roc-rk3399-pc", "rockchip,rk3399";
+};
--
Armbian

74
patch/kernel/archive/rockchip64-4.4/zzz-add-rk3399-roc-pc-dtsi.patch
View File

@ -1,5 +1,73 @@
new file mode 120000
index 00000000..5a62cd6b
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Piotr Szczepanik <piter75@gmail.com>
Date: Sun, 24 Nov 2019 22:07:46 +0100
Subject: [ARCHEOLOGY] Multiple bootloader creation options for rk3399 (#1614)
> X-Git-Archeology: > recovered message: > * Updated rockchip64-dev to u-boot v2019.10 and BL31 v1.30 (rk3399 boards)
> X-Git-Archeology: > recovered message: > * Updated rk3399 to u-boot v2019.10 and BL31 v1.30
> X-Git-Archeology: > recovered message: > * Revert changes to renegade u-boot patches
> X-Git-Archeology: > recovered message: > * Moved renegade u-boot patches into board dir
> X-Git-Archeology: > recovered message: > * Added debug info for RockPro64 and switched sdmmc to fifo-mode
> X-Git-Archeology: > recovered message: > * Disabled regulators in SPL for RockPro64
> X-Git-Archeology: > recovered message: > * Re-enabled sd vcc regulator in SPL for RockPro64
> X-Git-Archeology: > recovered message: > * Some device tree and config changes for OrangePi RK3399
> X-Git-Archeology: > recovered message: > * Fixed Rock Pi 4A's $BOOTCONFIG
> X-Git-Archeology: > recovered message: > * Let some boards use mainline atf instead of the one in rkbin
> X-Git-Archeology: > recovered message: > For example, roc-rk3399-pc can just boot the kernel using the
> X-Git-Archeology: > recovered message: > mainline atf.
> X-Git-Archeology: > recovered message: > * Add roc-rk3399-pc
> X-Git-Archeology: > recovered message: > * Fixed reset in mainline ATF
> X-Git-Archeology: > recovered message: > * Attached ATF version to v2.2 tag
> X-Git-Archeology: > recovered message: > * WIP: sdmmc fifo-mode in SPL only
> X-Git-Archeology: > recovered message: > * Renamed source config files
> X-Git-Archeology: > recovered message: > * Reverted changes to rockchip64 sources config
> X-Git-Archeology: > recovered message: > * Reverted patch moves
> X-Git-Archeology: > recovered message: > * Add missing trust.ini patch to rk3399 u-boot
> X-Git-Archeology: > recovered message: > * Reinstated tpl/spl patches in rk3399 family
> X-Git-Archeology: > recovered message: > * Added $RKBIN_DIR prefix in rk3399 sources
> X-Git-Archeology: > recovered message: > * Add demonstration of boards bootloader assignment in rk3399
> X-Git-Archeology: - Revision 1c9ef0872bfdda69e66de11f0e97b6b43218f73c: https://github.com/armbian/build/commit/1c9ef0872bfdda69e66de11f0e97b6b43218f73c
> X-Git-Archeology: Date: Sun, 24 Nov 2019 22:07:46 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Multiple bootloader creation options for rk3399 (#1614)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 79d0040b89ef733b2a16a28cf020557b70f0ccfc: https://github.com/armbian/build/commit/79d0040b89ef733b2a16a28cf020557b70f0ccfc
> X-Git-Archeology: Date: Mon, 09 Dec 2019 22:11:59 +0000
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Moved roc-rk3399-pc from default to legacy
> X-Git-Archeology:
> X-Git-Archeology: - Revision c27379e93fee03453d3275a4f68fea2277d375c9: https://github.com/armbian/build/commit/c27379e93fee03453d3275a4f68fea2277d375c9
> X-Git-Archeology: Date: Mon, 10 Aug 2020 18:22:48 +0200
> X-Git-Archeology: From: Aditya Prayoga <aprayoga@users.noreply.github.com>
> X-Git-Archeology: Subject: Add Helios64 support (#2126)
> X-Git-Archeology:
> X-Git-Archeology: - Revision b031de58d76f332cd4ab37c97ac3361383f0aa05: https://github.com/armbian/build/commit/b031de58d76f332cd4ab37c97ac3361383f0aa05
> X-Git-Archeology: Date: Mon, 05 Oct 2020 00:16:28 +0200
> X-Git-Archeology: From: Uwe Kleine-Konig <ukleinek@users.noreply.github.com>
> X-Git-Archeology: Subject: rk3399: Adapt helios64 devicetree name to match upstream linux (#2235)
> X-Git-Archeology:
> X-Git-Archeology: - Revision cd886792c0e4cb9761eddb6e9dca355892663769: https://github.com/armbian/build/commit/cd886792c0e4cb9761eddb6e9dca355892663769
> X-Git-Archeology: Date: Tue, 15 Dec 2020 23:07:54 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Fix booting of roc-rk3399-pc/station-p1 with legacy
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 510e348202f8efb838a57a9eec6ccbc910d7e06e: https://github.com/armbian/build/commit/510e348202f8efb838a57a9eec6ccbc910d7e06e
> X-Git-Archeology: Date: Sun, 18 Apr 2021 22:48:56 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: 150balbes fix station legacy (#2782)
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 1437 ++++++++++
1 file changed, 1437 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
new file mode 100644
index 000000000000..2c2208daf5dd
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
@@ -0,0 +1,1437 @@
@ -1440,4 +1508,6 @@ index 00000000..5a62cd6b
+&isp1_mmu {
+ status = "okay";
+};
--
Armbian

27
patch/kernel/archive/rockchip64-4.4/zzz-rk3399-firefly.patch
View File

@ -1,6 +1,23 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Oleg <balbes-150@yandex.ru>
Date: Mon, 27 Dec 2021 08:27:01 +0100
Subject: [ARCHEOLOGY] fix kernel legacy for firefly-rk3399 (#3369)
> X-Git-Archeology: - Revision e453e4dfbad6f9ceb5895b3f7812ae28c5d38db5: https://github.com/armbian/build/commit/e453e4dfbad6f9ceb5895b3f7812ae28c5d38db5
> X-Git-Archeology: Date: Mon, 27 Dec 2021 08:27:01 +0100
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: fix kernel legacy for firefly-rk3399 (#3369)
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/Makefile | 1 +
arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 7 +++++++
2 files changed, 8 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index 9dcebdaff2ff..3edaefe5593b 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -86,6 +86,7 @@
@@ -87,6 +87,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb-rev3-android-mipi-edp.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb-rev3-cros.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly-android.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly-linux.dtb
@ -8,9 +25,9 @@
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-plus.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
new file mode 120000
index 00000000..5a62cd6b
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
new file mode 100644
index 000000000000..f9f0526ce22b
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
@@ -0,0 +1,7 @@
@ -21,4 +38,6 @@ index 00000000..5a62cd6b
+ compatible = "rockchip,rk3399-firefly", "rockchip,rk3399";
+
+};
--
Armbian