flapjack: update kernel patches (CL:1565759/#3)
On top of 9ae0ce61e7314bc2cc9e9499e4d78f1cf8998760,
include the following in sequence of,
Sync kernel source to 68d609348481c72f79ddb91940f4b1736b0b90a8.
MTK ToT (CL:1317245/#151) squash
Kukui ISP ToT (CL:1358250/#139) squash
Cherry-picking CL:1490976/#40
HQ ToT (CL:1475596/#37) squash
Cherry-picking CL:1585667/#12
Cherry-picking CL:1585362/#6
Cherry-picking CL:1565759/#3 (new)
BUG=b:130842861
TEST=build and run
Change-Id: Ib87891138dc05706f4a5a90b557f6ef049ecca0b
diff --git a/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/chromeos-kernel-4_19-0.0.14.ebuild b/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/chromeos-kernel-4_19-0.0.15.ebuild
similarity index 100%
rename from overlay-flapjack/sys-kernel/chromeos-kernel-4_19/chromeos-kernel-4_19-0.0.14.ebuild
rename to overlay-flapjack/sys-kernel/chromeos-kernel-4_19/chromeos-kernel-4_19-0.0.15.ebuild
diff --git a/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0001-Sync-kernel-source-from-ToT.patch b/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0001-Sync-kernel-source-from-ToT.patch
index 06c1fbc..f074d1c 100644
--- a/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0001-Sync-kernel-source-from-ToT.patch
+++ b/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0001-Sync-kernel-source-from-ToT.patch
@@ -1,9 +1,9 @@
-From d1b88f158f322059f1a81e9b4e16aeb30400109a Mon Sep 17 00:00:00 2001
+From 4e88bd3ef30aebf2aa6f603182a6927bf6d43c62 Mon Sep 17 00:00:00 2001
From: YH Lin <yueherngl@google.com>
-Date: Thu, 9 May 2019 11:17:01 -0700
-Subject: [PATCH 1/7] Sync kernel source from ToT.
+Date: Wed, 22 May 2019 07:58:28 -0700
+Subject: [PATCH 1/8] Sync kernel source from ToT.
-Change-Id: I545a9f56ac1f03308165713ee1f071ed816bfcfc
+Change-Id: I518214d8365734183974b2be5a7e14aa57edf297
---
.../bindings/net/qualcomm-bluetooth.txt | 2 ++
.../mach-rockchip/embedded/rk3288_resume.c | 10 +++++-----
@@ -15,7 +15,7 @@
7 files changed, 51 insertions(+), 17 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt b/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt
-index 824c0e23c544..2bcea50fe88d 100644
+index 824c0e23c5443..2bcea50fe88d6 100644
--- a/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt
+++ b/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt
@@ -16,6 +16,7 @@ Optional properties for compatible string qcom,qca6174-bt:
@@ -35,7 +35,7 @@
};
diff --git a/arch/arm/mach-rockchip/embedded/rk3288_resume.c b/arch/arm/mach-rockchip/embedded/rk3288_resume.c
-index bf187b9f0291..090dbb451429 100644
+index bf187b9f0291d..090dbb451429c 100644
--- a/arch/arm/mach-rockchip/embedded/rk3288_resume.c
+++ b/arch/arm/mach-rockchip/embedded/rk3288_resume.c
@@ -58,31 +58,31 @@ static void __noreturn rk3288_resume_c(void)
@@ -76,7 +76,7 @@
if (rk3288_resume_params.ddr_resume_f)
diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
-index 77357ae4ebbe..2f55a63f0bfd 100644
+index 77357ae4ebbe7..2f55a63f0bfd4 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
@@ -414,6 +414,17 @@
@@ -98,7 +98,7 @@
compatible = "mediatek,mt8183-i2c";
reg = <0 0x1100f000 0 0x1000>,
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
-index 013fe3d21dbb..2ec202cb9dfd 100644
+index 013fe3d21dbb3..2ec202cb9dfd4 100644
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -117,12 +117,8 @@ static u64 kvm_sched_clock_read(void)
@@ -116,7 +116,7 @@
pv_time_ops.sched_clock = kvm_sched_clock_read;
diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
-index 612268574fc7..645a89313960 100644
+index 612268574fc78..645a893139603 100644
--- a/drivers/bluetooth/btqca.c
+++ b/drivers/bluetooth/btqca.c
@@ -332,7 +332,8 @@ int qca_set_bdaddr_rome(struct hci_dev *hdev, const bdaddr_t *bdaddr)
@@ -148,7 +148,7 @@
err = qca_download_firmware(hdev, &config);
if (err < 0) {
diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h
-index c72c56ea7480..e1fd0b0f0b15 100644
+index c72c56ea74808..e1fd0b0f0b15f 100644
--- a/drivers/bluetooth/btqca.h
+++ b/drivers/bluetooth/btqca.h
@@ -139,7 +139,8 @@ enum qca_btsoc_type {
@@ -172,7 +172,7 @@
return -EOPNOTSUPP;
}
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
-index 4ea995d610d2..9b8d4d7802fc 100644
+index 4ea995d610d25..9b8d4d7802fcb 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -168,6 +168,7 @@ struct qca_serdev {
@@ -230,5 +230,5 @@
if (IS_ERR(qcadev->susclk)) {
dev_err(&serdev->dev, "failed to acquire clk\n");
--
-2.21.0.1020.gf2820cf01a-goog
+2.22.0.rc1.257.g3120a18244-goog
diff --git a/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0002-Squash-MTK-ToT-151.patch b/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0002-Squash-MTK-ToT-151.patch
index bf5c62a..804cfc8 100644
--- a/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0002-Squash-MTK-ToT-151.patch
+++ b/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0002-Squash-MTK-ToT-151.patch
@@ -1,9 +1,9 @@
-From 1272f1c6486fdd9ea0a530db20d1b2327a44c26c Mon Sep 17 00:00:00 2001
+From 06fa6c7a04358c4f91eb80a6876febdf3d3e5f78 Mon Sep 17 00:00:00 2001
From: YH Lin <yueherngl@google.com>
-Date: Thu, 9 May 2019 11:18:51 -0700
-Subject: [PATCH 2/7] Squash MTK ToT #151.
+Date: Wed, 22 May 2019 07:59:40 -0700
+Subject: [PATCH 2/8] Squash MTK ToT #151.
-Change-Id: Icef8a6fc06f24ff1b00af0e76819454990da8883
+Change-Id: Ie080c7dac060b7311398c783245a27082bcad854
---
.../display/mediatek/mediatek,dsi.txt | 2 +-
.../devicetree/bindings/mailbox/mtk-gce.txt | 37 +-
@@ -67,7 +67,7 @@
59 files changed, 2797 insertions(+), 630 deletions(-)
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt b/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt
-index fadf327c7cdf..bd68195458b9 100644
+index fadf327c7cdf7..bd68195458b9b 100644
--- a/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt
+++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt
@@ -26,7 +26,7 @@ The MIPI TX configuration module controls the MIPI D-PHY.
@@ -80,7 +80,7 @@
- clocks: PLL reference clock
- clock-output-names: name of the output clock line to the DSI encoder
diff --git a/Documentation/devicetree/bindings/mailbox/mtk-gce.txt b/Documentation/devicetree/bindings/mailbox/mtk-gce.txt
-index 7d72b21c9e94..755b30fd6041 100644
+index 7d72b21c9e94d..755b30fd6041b 100644
--- a/Documentation/devicetree/bindings/mailbox/mtk-gce.txt
+++ b/Documentation/devicetree/bindings/mailbox/mtk-gce.txt
@@ -9,7 +9,7 @@ CMDQ driver uses mailbox framework for communication. Please refer to
@@ -155,7 +155,7 @@
...
};
diff --git a/Documentation/devicetree/bindings/media/mediatek-vpu.txt b/Documentation/devicetree/bindings/media/mediatek-vpu.txt
-index 2a5bac37f9a2..015123250b82 100644
+index 2a5bac37f9a22..015123250b825 100644
--- a/Documentation/devicetree/bindings/media/mediatek-vpu.txt
+++ b/Documentation/devicetree/bindings/media/mediatek-vpu.txt
@@ -4,7 +4,7 @@ Video Processor Unit is a HW video controller. It controls HW Codec including
@@ -168,7 +168,7 @@
- reg-names: Must include the following entries:
"tcm": tcm base
diff --git a/Documentation/devicetree/bindings/mfd/cros-ec.txt b/Documentation/devicetree/bindings/mfd/cros-ec.txt
-index 6245c9b1a68b..4860eabd0f72 100644
+index 6245c9b1a68bb..4860eabd0f729 100644
--- a/Documentation/devicetree/bindings/mfd/cros-ec.txt
+++ b/Documentation/devicetree/bindings/mfd/cros-ec.txt
@@ -3,7 +3,7 @@ ChromeOS Embedded Controller
@@ -191,7 +191,7 @@
- google,cros-ec-spi-pre-delay: Some implementations of the EC need a little
time to wake up from sleep before they can receive SPI transfers at a high
diff --git a/Makefile b/Makefile
-index cb22f3dc7848..520a4f465963 100644
+index cb22f3dc7848f..520a4f465963b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
@@ -200,7 +200,7 @@
VERSION = 4
PATCHLEVEL = 19
diff --git a/README b/README
-index 2c927ccbd970..768caa3970ef 100644
+index 2c927ccbd9705..768caa3970ef9 100644
--- a/README
+++ b/README
@@ -1,3 +1,4 @@
@@ -209,7 +209,7 @@
============
diff --git a/arch/arm64/boot/dts/mediatek/Makefile b/arch/arm64/boot/dts/mediatek/Makefile
-index d9124842fdd0..3a55c454b65d 100644
+index d9124842fdd08..3a55c454b65dd 100644
--- a/arch/arm64/boot/dts/mediatek/Makefile
+++ b/arch/arm64/boot/dts/mediatek/Makefile
@@ -9,3 +9,4 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-bananapi-bpi-r64.dtb
@@ -218,7 +218,7 @@
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-rev1.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-rev2.dtb
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-evb.dts b/arch/arm64/boot/dts/mediatek/mt8183-evb.dts
-index 50dc1e1a6881..d9980051f9b6 100644
+index 50dc1e1a6881f..d9980051f9b68 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183-evb.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-evb.dts
@@ -38,6 +38,10 @@
@@ -233,7 +233,7 @@
supply-names = "mali","mali_sram";
mali-supply = <&mt6358_vgpu_reg>;
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-rev1.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-rev1.dts
-index 46b8f0c16d7b..9a19b9d7a8fd 100644
+index 46b8f0c16d7b2..9a19b9d7a8fdb 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-rev1.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-rev1.dts
@@ -212,6 +212,17 @@
@@ -255,7 +255,7 @@
&touchscreen {
reset-gpios = <&pio 156 0>;
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
-index f8e1c7f9f603..467bc98f551e 100644
+index f8e1c7f9f6035..467bc98f551ea 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
@@ -14,6 +14,17 @@
@@ -641,7 +641,7 @@
#include <arm/cros-ec-sbs.dtsi>
diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
-index 2f55a63f0bfd..eaf3be4b3568 100644
+index 2f55a63f0bfd4..eaf3be4b35689 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
@@ -6,11 +6,14 @@
@@ -1386,7 +1386,7 @@
compatible = "mediatek,mt8183-smi-larb";
reg = <0 0x14017000 0 0x1000>;
diff --git a/chromeos/config/arm64/chromiumos-arm64.flavour.config b/chromeos/config/arm64/chromiumos-arm64.flavour.config
-index 14dbbc992e29..86ef390d6160 100644
+index 14dbbc992e29c..86ef390d61605 100644
--- a/chromeos/config/arm64/chromiumos-arm64.flavour.config
+++ b/chromeos/config/arm64/chromiumos-arm64.flavour.config
@@ -124,6 +124,7 @@ CONFIG_COMMON_CLK_RK808=y
@@ -1472,7 +1472,7 @@
CONFIG_VGA_ARB=y
CONFIG_VGA_ARB_MAX_GPUS=16
diff --git a/chromeos/config/arm64/chromiumos-mediatek.flavour.config b/chromeos/config/arm64/chromiumos-mediatek.flavour.config
-index 30e9317390a8..cf176ec20448 100644
+index 30e9317390a8a..cf176ec20448d 100644
--- a/chromeos/config/arm64/chromiumos-mediatek.flavour.config
+++ b/chromeos/config/arm64/chromiumos-mediatek.flavour.config
@@ -24,6 +24,7 @@ CONFIG_ATH10K_TRACING=y
@@ -1594,7 +1594,7 @@
+# CONFIG_VIRTIO_NET is not set
+# CONFIG_VIRTIO_WL is not set
diff --git a/chromeos/config/arm64/chromiumos-qualcomm.flavour.config b/chromeos/config/arm64/chromiumos-qualcomm.flavour.config
-index d80920df41f9..df8dee5a9ad2 100644
+index d80920df41f92..df8dee5a9ad25 100644
--- a/chromeos/config/arm64/chromiumos-qualcomm.flavour.config
+++ b/chromeos/config/arm64/chromiumos-qualcomm.flavour.config
@@ -43,6 +43,7 @@ CONFIG_COMMON_CLK_QCOM=y
@@ -1620,7 +1620,7 @@
CONFIG_VIDEOBUF2_MEMOPS=m
CONFIG_VIDEOBUF2_V4L2=m
diff --git a/chromeos/config/arm64/chromiumos-rockchip64.flavour.config b/chromeos/config/arm64/chromiumos-rockchip64.flavour.config
-index 80931110c50a..74542fedbd29 100644
+index 80931110c50af..74542fedbd29b 100644
--- a/chromeos/config/arm64/chromiumos-rockchip64.flavour.config
+++ b/chromeos/config/arm64/chromiumos-rockchip64.flavour.config
@@ -546,10 +546,16 @@ CONFIG_THERMAL_WRITABLE_TRIPS=y
@@ -1641,7 +1641,7 @@
CONFIG_USB_OHCI_HCD_PCI=y
CONFIG_USB_PCI=y
diff --git a/chromeos/config/arm64/common.config b/chromeos/config/arm64/common.config
-index e31977035cfe..7073cb8566dc 100644
+index e31977035cfe4..7073cb8566dc9 100644
--- a/chromeos/config/arm64/common.config
+++ b/chromeos/config/arm64/common.config
@@ -161,7 +161,7 @@ CONFIG_CHARGER_CROS_USBPD=y
@@ -1654,7 +1654,7 @@
# CONFIG_CLK_QORIQ is not set
# CONFIG_CLOCK_THERMAL is not set
diff --git a/chromeos/config/armel/common.config b/chromeos/config/armel/common.config
-index 879eb506cb82..d7ddad0f26b4 100644
+index 879eb506cb82e..d7ddad0f26b48 100644
--- a/chromeos/config/armel/common.config
+++ b/chromeos/config/armel/common.config
@@ -870,15 +870,21 @@ CONFIG_TIMER_PROBE=y
@@ -1680,7 +1680,7 @@
# CONFIG_USB_STORAGE_REALTEK is not set
CONFIG_USE_OF=y
diff --git a/chromeos/config/base.config b/chromeos/config/base.config
-index e76dd4414e68..f9fcd8e0e4ea 100644
+index e76dd4414e689..f9fcd8e0e4eac 100644
--- a/chromeos/config/base.config
+++ b/chromeos/config/base.config
@@ -3009,8 +3009,6 @@ CONFIG_USB_ARCH_HAS_HCD=y
@@ -1721,7 +1721,7 @@
# CONFIG_USB_M66592 is not set
# CONFIG_USB_MAX3421_HCD is not set
diff --git a/chromeos/config/x86_64/common.config b/chromeos/config/x86_64/common.config
-index de448d408582..89cc91210bc5 100644
+index de448d408582c..89cc91210bc5c 100644
--- a/chromeos/config/x86_64/common.config
+++ b/chromeos/config/x86_64/common.config
@@ -235,7 +235,7 @@ CONFIG_CHROMEOS=y
@@ -1756,7 +1756,7 @@
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_HCD_PCI=y
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
-index 9b8d4d7802fc..caa6c1b34aa2 100644
+index 9b8d4d7802fcb..caa6c1b34aa24 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -535,6 +535,8 @@ static int qca_open(struct hci_uart *hu)
@@ -1769,7 +1769,7 @@
hu->init_speed = qcadev->init_speed;
hu->oper_speed = qcadev->oper_speed;
diff --git a/drivers/clk/mediatek/Makefile b/drivers/clk/mediatek/Makefile
-index 3dc1b9f15ea2..5df0e476e94d 100644
+index 3dc1b9f15ea2f..5df0e476e94d8 100644
--- a/drivers/clk/mediatek/Makefile
+++ b/drivers/clk/mediatek/Makefile
@@ -44,3 +44,5 @@ obj-$(CONFIG_COMMON_CLK_MT8183_MFGCFG) += clk-mt8183-mfgcfg.o
@@ -1779,7 +1779,7 @@
+obj-$(CONFIG_COMMON_CLK_MT8183) += clkdbg.o clkdbg-mt8183.o
+obj-$(CONFIG_COMMON_CLK_MT8183) += clkchk.o clkchk-mt8183.o
diff --git a/drivers/clk/mediatek/clk-mt8183.c b/drivers/clk/mediatek/clk-mt8183.c
-index 68f157b31b28..d1458b431463 100644
+index 68f157b31b289..d1458b4314630 100644
--- a/drivers/clk/mediatek/clk-mt8183.c
+++ b/drivers/clk/mediatek/clk-mt8183.c
@@ -1204,13 +1204,21 @@ static int clk_mt8183_infra_probe(struct platform_device *pdev)
@@ -1806,7 +1806,7 @@
static int clk_mt8183_mcu_probe(struct platform_device *pdev)
diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h
-index 37ae944548e9..8f6282ec4000 100644
+index 37ae944548e9b..8f6282ec40006 100644
--- a/drivers/clk/mediatek/clk-mtk.h
+++ b/drivers/clk/mediatek/clk-mtk.h
@@ -236,4 +236,7 @@ struct clk *mtk_clk_register_ref2usb_tx(const char *name,
@@ -1818,7 +1818,7 @@
+
#endif /* __DRV_CLK_MTK_H */
diff --git a/drivers/clk/mediatek/reset.c b/drivers/clk/mediatek/reset.c
-index d3551d5efef2..e6dff4db7430 100644
+index d3551d5efef24..e6dff4db74300 100644
--- a/drivers/clk/mediatek/reset.c
+++ b/drivers/clk/mediatek/reset.c
@@ -27,6 +27,23 @@ struct mtk_reset {
@@ -1910,7 +1910,7 @@
+}
+
diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile
-index 82ae49c64221..8067a4be8311 100644
+index 82ae49c642211..8067a4be83115 100644
--- a/drivers/gpu/drm/mediatek/Makefile
+++ b/drivers/gpu/drm/mediatek/Makefile
@@ -12,6 +12,8 @@ mediatek-drm-y := mtk_disp_color.o \
@@ -1923,7 +1923,7 @@
obj-$(CONFIG_DRM_MEDIATEK) += mediatek-drm.o
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
-index 28d5766ecb74..faea76259457 100644
+index 28d5766ecb747..faea762594579 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -703,8 +703,8 @@ static struct platform_driver * const mtk_drm_drivers[] = {
@@ -1937,7 +1937,7 @@
static int __init mtk_drm_init(void)
diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
-index 27b507eb4a99..5d8227c90371 100644
+index 27b507eb4a997..5d8227c90371c 100644
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@ -21,10 +21,12 @@
@@ -2444,7 +2444,7 @@
.probe = mtk_dsi_probe,
.remove = mtk_dsi_remove,
diff --git a/drivers/gpu/drm/mediatek/mtk_mipi_tx.c b/drivers/gpu/drm/mediatek/mtk_mipi_tx.c
-index 90e913108950..73d19dfb3836 100644
+index 90e913108950d..73d19dfb38365 100644
--- a/drivers/gpu/drm/mediatek/mtk_mipi_tx.c
+++ b/drivers/gpu/drm/mediatek/mtk_mipi_tx.c
@@ -11,292 +11,45 @@
@@ -2898,7 +2898,7 @@
struct platform_driver mtk_mipi_tx_driver = {
diff --git a/drivers/gpu/drm/panel/panel-innolux-p079zca.c b/drivers/gpu/drm/panel/panel-innolux-p079zca.c
-index 88c7d035ace6..3fbc90218c5e 100644
+index 88c7d035ace66..3fbc90218c5eb 100644
--- a/drivers/gpu/drm/panel/panel-innolux-p079zca.c
+++ b/drivers/gpu/drm/panel/panel-innolux-p079zca.c
@@ -56,7 +56,7 @@ struct innolux_panel {
@@ -3115,7 +3115,7 @@
innolux->backlight = devm_of_find_backlight(dev);
diff --git a/drivers/mailbox/Kconfig b/drivers/mailbox/Kconfig
-index 841c005d8ebb..31dc4c5e37e1 100644
+index 841c005d8ebb2..31dc4c5e37e1c 100644
--- a/drivers/mailbox/Kconfig
+++ b/drivers/mailbox/Kconfig
@@ -205,4 +205,22 @@ config MTK_CMDQ_MBOX
@@ -3142,7 +3142,7 @@
+ You must enter the id.
endif
diff --git a/drivers/mailbox/Makefile b/drivers/mailbox/Makefile
-index c818b5d011ae..b356e36d8f2a 100644
+index c818b5d011aef..b356e36d8f2ac 100644
--- a/drivers/mailbox/Makefile
+++ b/drivers/mailbox/Makefile
@@ -44,3 +44,4 @@ obj-$(CONFIG_TEGRA_HSP_MBOX) += tegra-hsp.o
@@ -3151,7 +3151,7 @@
obj-$(CONFIG_MTK_CMDQ_MBOX) += mtk-cmdq-mailbox.o
+obj-$(CONFIG_MTK_CMDQ_DEBUG) += mtk-cmdq-debug.o
diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c
-index aec46d5d3506..2c53ece47abd 100644
+index aec46d5d35061..2c53ece47abd7 100644
--- a/drivers/mailbox/mtk-cmdq-mailbox.c
+++ b/drivers/mailbox/mtk-cmdq-mailbox.c
@@ -15,9 +15,11 @@
@@ -3363,7 +3363,7 @@
};
diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mtk-vpu/mtk_vpu.c
-index f8d35e3ac1dc..01cab05e7b81 100644
+index f8d35e3ac1dcc..01cab05e7b818 100644
--- a/drivers/media/platform/mtk-vpu/mtk_vpu.c
+++ b/drivers/media/platform/mtk-vpu/mtk_vpu.c
@@ -49,25 +49,63 @@
@@ -4029,7 +4029,7 @@
};
diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.h b/drivers/media/platform/mtk-vpu/mtk_vpu.h
-index aec0268be3d0..ca09de70ceda 100644
+index aec0268be3d01..ca09de70cedae 100644
--- a/drivers/media/platform/mtk-vpu/mtk_vpu.h
+++ b/drivers/media/platform/mtk-vpu/mtk_vpu.h
@@ -100,6 +100,10 @@ enum rst_id {
@@ -4070,7 +4070,7 @@
+
#endif /* _MTK_VPU_H */
diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig
-index 63389f075f1d..4a291dabf2cc 100644
+index 63389f075f1dc..4a291dabf2ccb 100644
--- a/drivers/memory/Kconfig
+++ b/drivers/memory/Kconfig
@@ -129,6 +129,15 @@ config JZ4780_NEMC
@@ -4090,7 +4090,7 @@
bool
depends on ARCH_MEDIATEK || COMPILE_TEST
diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile
-index a01ab3e22f94..dbd49ba94cab 100644
+index a01ab3e22f94d..dbd49ba94cab5 100644
--- a/drivers/memory/Makefile
+++ b/drivers/memory/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_FSL_CORENET_CF) += fsl-corenet-cf.o
@@ -4102,7 +4102,7 @@
obj-$(CONFIG_DA8XX_DDRCTL) += da8xx-ddrctl.o
diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
-index fef424efd65d..41eb0510e080 100644
+index fef424efd65d2..41eb0510e080d 100644
--- a/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@ -667,6 +667,16 @@ static int ec_device_probe(struct platform_device *pdev)
@@ -4123,7 +4123,7 @@
* Add the class device
* Link to the character device for creating the /dev entry
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
-index ce8398e6f2c0..c8f3fe701ea7 100644
+index ce8398e6f2c0e..c8f3fe701ea7b 100644
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@ -23,7 +23,7 @@ obj-$(CONFIG_MMC_SDHCI_F_SDH30) += sdhci_f_sdh30.o
@@ -4136,7 +4136,7 @@
obj-$(CONFIG_MMC_OMAP_HS) += omap_hsmmc.o
obj-$(CONFIG_MMC_ATMELMCI) += atmel-mci.o
diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c
-index 0de3749c9311..8aaa5d405987 100644
+index 0de3749c9311c..8aaa5d4059871 100644
--- a/drivers/mmc/host/mtk-sd.c
+++ b/drivers/mmc/host/mtk-sd.c
@@ -39,6 +39,8 @@
@@ -4159,7 +4159,7 @@
end:
pm_runtime_disable(host->dev);
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
-index 6a4c7b488782..80a38ad0db15 100644
+index 6a4c7b4887827..80a38ad0db15a 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -167,6 +167,32 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
@@ -4214,7 +4214,7 @@
ret = ath10k_bmi_write32(ar, hi_dbg_uart_txpin, ar->hw_params.uart_pin);
if (ret) {
diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
-index 9373a63b8646..8c86359354af 100644
+index 9373a63b86461..8c86359354afd 100644
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -2043,7 +2043,9 @@ static void ath10k_htt_rx_tx_compl_ind(struct ath10k *ar,
@@ -4229,7 +4229,7 @@
tx_done.msdu_id, tx_done.status);
ath10k_txrx_tx_unref(htt, &tx_done);
diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c
-index f54ef2c37044..d099681da42b 100644
+index f54ef2c370441..d099681da42b6 100644
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -554,7 +554,8 @@ void ath10k_htt_tx_free(struct ath10k_htt *htt)
@@ -4277,7 +4277,7 @@
/* Initialize peer_id to INVALID_PEER because this is NOT
* Reinjection path
diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h
-index 70682dff865f..d863b57effdb 100644
+index 70682dff865f8..d863b57effdbe 100644
--- a/drivers/net/wireless/ath/ath10k/hw.h
+++ b/drivers/net/wireless/ath/ath10k/hw.h
@@ -35,6 +35,7 @@ enum ath10k_bus {
@@ -4299,7 +4299,7 @@
bool rri_on_ddr;
diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c
-index 9f631120a9be..1ea6d2dc2f29 100644
+index 9f631120a9be0..1ea6d2dc2f290 100644
--- a/drivers/net/wireless/ath/ath10k/sdio.c
+++ b/drivers/net/wireless/ath/ath10k/sdio.c
@@ -2083,8 +2083,6 @@ static void ath10k_sdio_remove(struct sdio_func *func)
@@ -4312,7 +4312,7 @@
ath10k_core_destroy(ar);
}
diff --git a/drivers/net/wireless/ath/ath10k/txrx.c b/drivers/net/wireless/ath/ath10k/txrx.c
-index f13d88906b5a..6a87bd89418c 100644
+index f13d88906b5a7..6a87bd89418cb 100644
--- a/drivers/net/wireless/ath/ath10k/txrx.c
+++ b/drivers/net/wireless/ath/ath10k/txrx.c
@@ -91,7 +91,7 @@ int ath10k_txrx_tx_unref(struct ath10k_htt *htt,
@@ -4325,7 +4325,7 @@
spin_unlock_bh(&htt->tx_lock);
diff --git a/drivers/pwm/pwm-mtk-disp.c b/drivers/pwm/pwm-mtk-disp.c
-index 893940d45f0d..27079acc3e1d 100644
+index 893940d45f0d0..27079acc3e1d9 100644
--- a/drivers/pwm/pwm-mtk-disp.c
+++ b/drivers/pwm/pwm-mtk-disp.c
@@ -106,13 +106,13 @@ static int mtk_disp_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
@@ -4457,7 +4457,7 @@
};
MODULE_DEVICE_TABLE(of, mtk_disp_pwm_of_match);
diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig
-index f0abd2608044..01182936f4fa 100644
+index f0abd26080447..01182936f4fa8 100644
--- a/drivers/remoteproc/Kconfig
+++ b/drivers/remoteproc/Kconfig
@@ -22,6 +22,16 @@ config IMX_REMOTEPROC
@@ -4478,7 +4478,7 @@
tristate "OMAP remoteproc support"
depends on ARCH_OMAP4 || SOC_OMAP5
diff --git a/drivers/remoteproc/Makefile b/drivers/remoteproc/Makefile
-index ce5d061e92be..16b3e5e7a81c 100644
+index ce5d061e92be5..16b3e5e7a81c8 100644
--- a/drivers/remoteproc/Makefile
+++ b/drivers/remoteproc/Makefile
@@ -10,6 +10,7 @@ remoteproc-y += remoteproc_sysfs.o
@@ -4490,7 +4490,7 @@
obj-$(CONFIG_WKUP_M3_RPROC) += wkup_m3_rproc.o
obj-$(CONFIG_DA8XX_REMOTEPROC) += da8xx_remoteproc.o
diff --git a/drivers/rpmsg/Kconfig b/drivers/rpmsg/Kconfig
-index d0322b41eca5..85e3cc075cb4 100644
+index d0322b41eca54..85e3cc075cb47 100644
--- a/drivers/rpmsg/Kconfig
+++ b/drivers/rpmsg/Kconfig
@@ -15,6 +15,15 @@ config RPMSG_CHAR
@@ -4510,7 +4510,7 @@
tristate
select RPMSG
diff --git a/drivers/rpmsg/Makefile b/drivers/rpmsg/Makefile
-index 9aa859502d27..ae92a7fb08f6 100644
+index 9aa859502d275..ae92a7fb08f62 100644
--- a/drivers/rpmsg/Makefile
+++ b/drivers/rpmsg/Makefile
@@ -1,6 +1,7 @@
@@ -4522,7 +4522,7 @@
obj-$(CONFIG_RPMSG_QCOM_GLINK_NATIVE) += qcom_glink_native.o
obj-$(CONFIG_RPMSG_QCOM_GLINK_SMEM) += qcom_glink_smem.o
diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c
-index ff9fef5a032b..317ec441ad60 100644
+index ff9fef5a032b3..317ec441ad609 100644
--- a/drivers/soc/mediatek/mtk-cmdq-helper.c
+++ b/drivers/soc/mediatek/mtk-cmdq-helper.c
@@ -9,17 +9,109 @@
@@ -4813,7 +4813,7 @@
return err;
}
diff --git a/drivers/tty/serial/8250/8250_mtk.c b/drivers/tty/serial/8250/8250_mtk.c
-index c3f933d10295..2c7593702954 100644
+index c3f933d10295e..2c75937029543 100644
--- a/drivers/tty/serial/8250/8250_mtk.c
+++ b/drivers/tty/serial/8250/8250_mtk.c
@@ -1,11 +1,23 @@
@@ -5465,7 +5465,7 @@
static const struct dev_pm_ops mtk8250_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(mtk8250_suspend, mtk8250_resume)
diff --git a/drivers/usb/mtu3/mtu3_core.c b/drivers/usb/mtu3/mtu3_core.c
-index 48d10a61e271..542b67a6b5a6 100644
+index 48d10a61e271c..542b67a6b5a65 100644
--- a/drivers/usb/mtu3/mtu3_core.c
+++ b/drivers/usb/mtu3/mtu3_core.c
@@ -94,6 +94,7 @@ static int mtu3_device_enable(struct mtu3 *mtu)
@@ -5525,7 +5525,7 @@
dev_info(mtu->dev, "IP version 0x%x(%s IP)\n", mtu->hw_version,
mtu->is_u3_ip ? "U3" : "U2");
diff --git a/drivers/usb/mtu3/mtu3_dr.c b/drivers/usb/mtu3/mtu3_dr.c
-index ac60e9c8564e..7660d107e5bc 100644
+index ac60e9c8564e2..7660d107e5bcc 100644
--- a/drivers/usb/mtu3/mtu3_dr.c
+++ b/drivers/usb/mtu3/mtu3_dr.c
@@ -401,7 +401,7 @@ void ssusb_set_force_mode(struct ssusb_mtk *ssusb,
@@ -5538,7 +5538,7 @@
case MTU3_DR_FORCE_NONE:
value &= ~(SSUSB_U2_PORT_FORCE_IDDIG | SSUSB_U2_PORT_RG_IDDIG);
diff --git a/include/linux/mailbox/mtk-cmdq-mailbox.h b/include/linux/mailbox/mtk-cmdq-mailbox.h
-index ccb73422c2fa..1dfd5ed5c8c5 100644
+index ccb73422c2fa2..1dfd5ed5c8c52 100644
--- a/include/linux/mailbox/mtk-cmdq-mailbox.h
+++ b/include/linux/mailbox/mtk-cmdq-mailbox.h
@@ -19,6 +19,10 @@
@@ -5561,7 +5561,7 @@
CMDQ_CODE_WFE = 0x20,
CMDQ_CODE_EOC = 0x40,
diff --git a/include/linux/mfd/cros_ec.h b/include/linux/mfd/cros_ec.h
-index 00443e4ed9b7..f84e71c586e2 100644
+index 00443e4ed9b73..f84e71c586e23 100644
--- a/include/linux/mfd/cros_ec.h
+++ b/include/linux/mfd/cros_ec.h
@@ -28,6 +28,7 @@
@@ -5573,7 +5573,7 @@
/*
* The EC is unresponsive for a time after a reboot command. Add a
diff --git a/include/linux/mfd/cros_ec_commands.h b/include/linux/mfd/cros_ec_commands.h
-index 41cb61a17fb8..ff095219165a 100644
+index 41cb61a17fb81..ff095219165ad 100644
--- a/include/linux/mfd/cros_ec_commands.h
+++ b/include/linux/mfd/cros_ec_commands.h
@@ -1299,6 +1299,16 @@ enum ec_feature_code {
@@ -5594,7 +5594,7 @@
EC_FEATURE_ISH = 40,
};
diff --git a/include/linux/soc/mediatek/mtk-cmdq.h b/include/linux/soc/mediatek/mtk-cmdq.h
-index 54ade13a9b15..15884354af20 100644
+index 54ade13a9b157..15884354af20a 100644
--- a/include/linux/soc/mediatek/mtk-cmdq.h
+++ b/include/linux/soc/mediatek/mtk-cmdq.h
@@ -13,11 +13,14 @@
@@ -5711,7 +5711,7 @@
+
#endif /* __MTK_CMDQ_H__ */
diff --git a/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c b/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c
-index 1bc0fafe5e29..d569157fe945 100644
+index 1bc0fafe5e290..d569157fe9457 100644
--- a/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c
+++ b/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c
@@ -955,6 +955,20 @@ static irqreturn_t mt8183_afe_irq_handler(int irq_id, void *dev)
@@ -5745,5 +5745,5 @@
mt8183_afe_runtime_resume, NULL)
};
--
-2.21.0.1020.gf2820cf01a-goog
+2.22.0.rc1.257.g3120a18244-goog
diff --git a/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0003-Squash-Kukui-ISP-ToT-139-against-MTK-ToT-151.patch b/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0003-Squash-Kukui-ISP-ToT-139-against-MTK-ToT-151.patch
index aaafd5c..518e247 100644
--- a/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0003-Squash-Kukui-ISP-ToT-139-against-MTK-ToT-151.patch
+++ b/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0003-Squash-Kukui-ISP-ToT-139-against-MTK-ToT-151.patch
@@ -1,9 +1,9 @@
-From e35ad06af622e59485f43465a4c99436962cf989 Mon Sep 17 00:00:00 2001
+From be78081333836e42a1a3e792d03cf52ee133eda5 Mon Sep 17 00:00:00 2001
From: YH Lin <yueherngl@google.com>
-Date: Thu, 9 May 2019 11:20:14 -0700
-Subject: [PATCH 3/7] Squash Kukui ISP ToT #139 against MTK ToT #151.
+Date: Wed, 22 May 2019 08:01:05 -0700
+Subject: [PATCH 3/8] Squash Kukui ISP ToT #139 against MTK ToT #151.
-Change-Id: I53a528641be3f4dd1eb8770322331dc2b4960d34
+Change-Id: I71a327bac59c5a5580c307b753e075f790a58342
---
.../bindings/media/mediatek,cam_smem.txt | 32 +
.../bindings/media/mediatek,camisp.txt | 59 +
@@ -292,7 +292,7 @@
diff --git a/Documentation/devicetree/bindings/media/mediatek,cam_smem.txt b/Documentation/devicetree/bindings/media/mediatek,cam_smem.txt
new file mode 100644
-index 000000000000..d34006a3c69d
+index 0000000000000..d34006a3c69d9
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/mediatek,cam_smem.txt
@@ -0,0 +1,32 @@
@@ -330,7 +330,7 @@
+ };
diff --git a/Documentation/devicetree/bindings/media/mediatek,camisp.txt b/Documentation/devicetree/bindings/media/mediatek,camisp.txt
new file mode 100644
-index 000000000000..dbc7d08a94b8
+index 0000000000000..dbc7d08a94b86
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/mediatek,camisp.txt
@@ -0,0 +1,59 @@
@@ -395,7 +395,7 @@
+ };
diff --git a/Documentation/devicetree/bindings/media/mediatek-dip.txt b/Documentation/devicetree/bindings/media/mediatek-dip.txt
new file mode 100644
-index 000000000000..e1b62d69935c
+index 0000000000000..e1b62d69935c0
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/mediatek-dip.txt
@@ -0,0 +1,32 @@
@@ -433,7 +433,7 @@
+ };
diff --git a/Documentation/devicetree/bindings/media/mediatek-fd.txt b/Documentation/devicetree/bindings/media/mediatek-fd.txt
new file mode 100755
-index 000000000000..8d1829ca3227
+index 0000000000000..8d1829ca32270
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/mediatek-fd.txt
@@ -0,0 +1,30 @@
@@ -469,7 +469,7 @@
+ };
diff --git a/Documentation/devicetree/bindings/media/mediatek-isp.txt b/Documentation/devicetree/bindings/media/mediatek-isp.txt
new file mode 100644
-index 000000000000..91cd5e7ee8ad
+index 0000000000000..91cd5e7ee8adb
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/mediatek-isp.txt
@@ -0,0 +1,73 @@
@@ -548,7 +548,7 @@
+ };
diff --git a/Documentation/devicetree/bindings/media/mediatek-seninf.txt b/Documentation/devicetree/bindings/media/mediatek-seninf.txt
new file mode 100644
-index 000000000000..e8dd4cb47dd7
+index 0000000000000..e8dd4cb47dd77
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/mediatek-seninf.txt
@@ -0,0 +1,54 @@
@@ -609,7 +609,7 @@
\ No newline at end of file
diff --git a/Documentation/devicetree/bindings/memory-controllers/mediatek,emi.txt b/Documentation/devicetree/bindings/memory-controllers/mediatek,emi.txt
new file mode 100644
-index 000000000000..a19e3b39ba66
+index 0000000000000..a19e3b39ba661
--- /dev/null
+++ b/Documentation/devicetree/bindings/memory-controllers/mediatek,emi.txt
@@ -0,0 +1,19 @@
@@ -634,7 +634,7 @@
+};
diff --git a/Documentation/devicetree/bindings/remoteproc/mtk,scp.txt b/Documentation/devicetree/bindings/remoteproc/mtk,scp.txt
new file mode 100644
-index 000000000000..3ba668bab14b
+index 0000000000000..3ba668bab14b2
--- /dev/null
+++ b/Documentation/devicetree/bindings/remoteproc/mtk,scp.txt
@@ -0,0 +1,36 @@
@@ -676,7 +676,7 @@
+ };
diff --git a/Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-cam_smem.txt b/Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-cam_smem.txt
new file mode 100644
-index 000000000000..05c1bf185925
+index 0000000000000..05c1bf1859254
--- /dev/null
+++ b/Documentation/devicetree/bindings/reserved-memory/mediatek,reserve-memory-cam_smem.txt
@@ -0,0 +1,44 @@
@@ -725,7 +725,7 @@
+ };
+ };
diff --git a/README b/README
-index 768caa3970ef..977bc3b04f5a 100644
+index 768caa3970ef9..977bc3b04f5a3 100644
--- a/README
+++ b/README
@@ -1,4 +1,5 @@
@@ -743,7 +743,7 @@
+
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-rev2.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-rev2.dts
new file mode 100644
-index 000000000000..e0304b04ea37
+index 0000000000000..e0304b04ea370
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-rev2.dts
@@ -0,0 +1,444 @@
@@ -1192,7 +1192,7 @@
+ };
+};
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
-index 467bc98f551e..b2fd77e04164 100644
+index 467bc98f551ea..b2fd77e04164c 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
@@ -213,7 +213,35 @@
@@ -1343,7 +1343,7 @@
pins_cmd_dat {
pinmux = <PINMUX_GPIO123__FUNC_MSDC0_DAT0>,
diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
-index eaf3be4b3568..f3ab0cf7afca 100644
+index eaf3be4b35689..f3ab0cf7afcad 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
@@ -442,9 +442,30 @@
@@ -1772,7 +1772,7 @@
};
};
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
-index 9998d224c51a..fa0bd42d1a52 100644
+index 9998d224c51a0..fa0bd42d1a52d 100644
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
@@ -37,6 +37,9 @@ static int swiotlb __ro_after_init;
@@ -1795,7 +1795,7 @@
static void __iommu_sync_sg_for_device(struct device *dev,
diff --git a/chromeos/config/arm64/chromiumos-arm64.flavour.config b/chromeos/config/arm64/chromiumos-arm64.flavour.config
-index 86ef390d6160..4a054df0d6cb 100644
+index 86ef390d61605..4a054df0d6cb1 100644
--- a/chromeos/config/arm64/chromiumos-arm64.flavour.config
+++ b/chromeos/config/arm64/chromiumos-arm64.flavour.config
@@ -132,6 +132,7 @@ CONFIG_CROS_EC_RPMSG=m
@@ -1942,7 +1942,7 @@
# CONFIG_VIRTIO_BALLOON is not set
CONFIG_VIRTIO_BLK=y
diff --git a/chromeos/config/arm64/chromiumos-mediatek.flavour.config b/chromeos/config/arm64/chromiumos-mediatek.flavour.config
-index cf176ec20448..74855922e1c7 100644
+index cf176ec20448d..74855922e1c74 100644
--- a/chromeos/config/arm64/chromiumos-mediatek.flavour.config
+++ b/chromeos/config/arm64/chromiumos-mediatek.flavour.config
@@ -61,6 +61,7 @@ CONFIG_COMMON_CLK_XGENE=y
@@ -2080,7 +2080,7 @@
# CONFIG_VIRTIO_BALLOON is not set
# CONFIG_VIRTIO_BLK is not set
diff --git a/chromeos/config/arm64/chromiumos-qualcomm.flavour.config b/chromeos/config/arm64/chromiumos-qualcomm.flavour.config
-index df8dee5a9ad2..4eef80d63014 100644
+index df8dee5a9ad25..4eef80d63014e 100644
--- a/chromeos/config/arm64/chromiumos-qualcomm.flavour.config
+++ b/chromeos/config/arm64/chromiumos-qualcomm.flavour.config
@@ -77,6 +77,7 @@ CONFIG_DRM_TI_SN65DSI86=y
@@ -2114,7 +2114,7 @@
CONFIG_VIRTIO=y
# CONFIG_VIRTIO_BALLOON is not set
diff --git a/chromeos/config/arm64/chromiumos-rockchip64.flavour.config b/chromeos/config/arm64/chromiumos-rockchip64.flavour.config
-index 74542fedbd29..43d65f15f7a9 100644
+index 74542fedbd29b..43d65f15f7a90 100644
--- a/chromeos/config/arm64/chromiumos-rockchip64.flavour.config
+++ b/chromeos/config/arm64/chromiumos-rockchip64.flavour.config
@@ -90,6 +90,7 @@ CONFIG_DRM_ROCKCHIP=y
@@ -2150,7 +2150,7 @@
# CONFIG_VIRTIO_MMIO is not set
# CONFIG_VIRTIO_PCI is not set
diff --git a/chromeos/config/arm64/common.config b/chromeos/config/arm64/common.config
-index 7073cb8566dc..e31977035cfe 100644
+index 7073cb8566dc9..e31977035cfe4 100644
--- a/chromeos/config/arm64/common.config
+++ b/chromeos/config/arm64/common.config
@@ -161,7 +161,7 @@ CONFIG_CHARGER_CROS_USBPD=y
@@ -2163,7 +2163,7 @@
# CONFIG_CLK_QORIQ is not set
# CONFIG_CLOCK_THERMAL is not set
diff --git a/chromeos/config/armel/common.config b/chromeos/config/armel/common.config
-index d7ddad0f26b4..fb97c7f686c2 100644
+index d7ddad0f26b48..fb97c7f686c20 100644
--- a/chromeos/config/armel/common.config
+++ b/chromeos/config/armel/common.config
@@ -333,6 +333,7 @@ CONFIG_DW_APB_TIMER_OF=y
@@ -2203,7 +2203,7 @@
# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
# CONFIG_VIDEO_ROCKCHIP_RGA is not set
diff --git a/chromeos/config/base.config b/chromeos/config/base.config
-index f9fcd8e0e4ea..d78bb62f5549 100644
+index f9fcd8e0e4eac..d78bb62f5549b 100644
--- a/chromeos/config/base.config
+++ b/chromeos/config/base.config
@@ -669,7 +669,6 @@ CONFIG_DST_CACHE=y
@@ -2242,7 +2242,7 @@
# CONFIG_VIDEO_CPIA2 is not set
CONFIG_VIDEO_DEV=y
diff --git a/chromeos/config/x86_64/common.config b/chromeos/config/x86_64/common.config
-index 89cc91210bc5..e0df649342f4 100644
+index 89cc91210bc5c..e0df649342f4d 100644
--- a/chromeos/config/x86_64/common.config
+++ b/chromeos/config/x86_64/common.config
@@ -350,6 +350,7 @@ CONFIG_DUMMY_CONSOLE_COLUMNS=80
@@ -2280,7 +2280,7 @@
# CONFIG_VIDEO_TW68 is not set
diff --git a/drivers/clk/mediatek/clkchk-mt8183.c b/drivers/clk/mediatek/clkchk-mt8183.c
new file mode 100644
-index 000000000000..99813e053fca
+index 0000000000000..99813e053fcad
--- /dev/null
+++ b/drivers/clk/mediatek/clkchk-mt8183.c
@@ -0,0 +1,409 @@
@@ -2695,7 +2695,7 @@
+subsys_initcall(clkchk_platform_init);
diff --git a/drivers/clk/mediatek/clkchk.c b/drivers/clk/mediatek/clkchk.c
new file mode 100644
-index 000000000000..d50110a0d538
+index 0000000000000..d50110a0d5383
--- /dev/null
+++ b/drivers/clk/mediatek/clkchk.c
@@ -0,0 +1,188 @@
@@ -2889,7 +2889,7 @@
+}
diff --git a/drivers/clk/mediatek/clkchk.h b/drivers/clk/mediatek/clkchk.h
new file mode 100644
-index 000000000000..d99e1acb6477
+index 0000000000000..d99e1acb6477f
--- /dev/null
+++ b/drivers/clk/mediatek/clkchk.h
@@ -0,0 +1,18 @@
@@ -2913,7 +2913,7 @@
+int clkchk_init(struct clkchk_cfg_t *cfg);
diff --git a/drivers/clk/mediatek/clkdbg-mt8183.c b/drivers/clk/mediatek/clkdbg-mt8183.c
new file mode 100644
-index 000000000000..89060ec19e88
+index 0000000000000..89060ec19e88a
--- /dev/null
+++ b/drivers/clk/mediatek/clkdbg-mt8183.c
@@ -0,0 +1,857 @@
@@ -3776,7 +3776,7 @@
+device_initcall(clkdbg_mt8183_init);
diff --git a/drivers/clk/mediatek/clkdbg.c b/drivers/clk/mediatek/clkdbg.c
new file mode 100644
-index 000000000000..8c9f67968160
+index 0000000000000..8c9f679681605
--- /dev/null
+++ b/drivers/clk/mediatek/clkdbg.c
@@ -0,0 +1,2242 @@
@@ -6024,7 +6024,7 @@
+module_init(clkdbg_debug_init);
diff --git a/drivers/clk/mediatek/clkdbg.h b/drivers/clk/mediatek/clkdbg.h
new file mode 100644
-index 000000000000..b9cddf3445ff
+index 0000000000000..b9cddf3445ffc
--- /dev/null
+++ b/drivers/clk/mediatek/clkdbg.h
@@ -0,0 +1,83 @@
@@ -6113,7 +6113,7 @@
+void print_fmeter_all(void);
diff --git a/drivers/gpu/drm/mediatek/mtk_mipi_tx.h b/drivers/gpu/drm/mediatek/mtk_mipi_tx.h
new file mode 100644
-index 000000000000..af83023e81cf
+index 0000000000000..af83023e81cf5
--- /dev/null
+++ b/drivers/gpu/drm/mediatek/mtk_mipi_tx.h
@@ -0,0 +1,52 @@
@@ -6171,7 +6171,7 @@
+#endif
diff --git a/drivers/gpu/drm/mediatek/mtk_mt8173_mipi_tx.c b/drivers/gpu/drm/mediatek/mtk_mt8173_mipi_tx.c
new file mode 100644
-index 000000000000..943650cfed46
+index 0000000000000..943650cfed460
--- /dev/null
+++ b/drivers/gpu/drm/mediatek/mtk_mt8173_mipi_tx.c
@@ -0,0 +1,283 @@
@@ -6460,7 +6460,7 @@
+
diff --git a/drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c b/drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c
new file mode 100644
-index 000000000000..a1399568b8d5
+index 0000000000000..a1399568b8d5a
--- /dev/null
+++ b/drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c
@@ -0,0 +1,154 @@
@@ -6620,7 +6620,7 @@
+};
diff --git a/drivers/mailbox/mtk-cmdq-debug.c b/drivers/mailbox/mtk-cmdq-debug.c
new file mode 100644
-index 000000000000..61985342d564
+index 0000000000000..61985342d5644
--- /dev/null
+++ b/drivers/mailbox/mtk-cmdq-debug.c
@@ -0,0 +1,582 @@
@@ -7208,7 +7208,7 @@
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/mailbox/mtk-cmdq-debug.h b/drivers/mailbox/mtk-cmdq-debug.h
new file mode 100644
-index 000000000000..5392b00c9394
+index 0000000000000..5392b00c93949
--- /dev/null
+++ b/drivers/mailbox/mtk-cmdq-debug.h
@@ -0,0 +1,21 @@
@@ -7234,7 +7234,7 @@
+
+#endif /* MTK_CMDQ_DEBUG_H */
diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c
-index 9cf9b49e3ace..b754aca45a23 100644
+index 9cf9b49e3ace7..b754aca45a23a 100644
--- a/drivers/media/common/videobuf2/videobuf2-core.c
+++ b/drivers/media/common/videobuf2/videobuf2-core.c
@@ -1726,6 +1726,14 @@ static void __vb2_dqbuf(struct vb2_buffer *vb)
@@ -7253,7 +7253,7 @@
call_void_vb_qop(vb, buf_cleanup, vb);
diff --git a/drivers/media/common/videobuf2/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
-index aff0ab7bf83d..101e14b31459 100644
+index aff0ab7bf83d5..101e14b31459a 100644
--- a/drivers/media/common/videobuf2/videobuf2-dma-contig.c
+++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
@@ -62,6 +62,29 @@ static unsigned long vb2_dc_get_contiguous_size(struct sg_table *sgt)
@@ -7350,7 +7350,7 @@
{
struct vb2_dc_buf *buf = buf_priv;
diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
-index aa4f0b45e505..2f3b3ca5bde6 100644
+index aa4f0b45e5058..2f3b3ca5bde66 100644
--- a/drivers/media/common/videobuf2/videobuf2-v4l2.c
+++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c
@@ -721,6 +721,7 @@ int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create)
@@ -7362,7 +7362,7 @@
break;
default:
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
-index 63c9ac2c6a5f..7f6e4d35d985 100644
+index 63c9ac2c6a5ff..7f6e4d35d9851 100644
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -17,6 +17,32 @@ config VIDEO_IR_I2C
@@ -7399,7 +7399,7 @@
# Encoder / Decoder module configuration
#
diff --git a/drivers/media/i2c/ov2685.c b/drivers/media/i2c/ov2685.c
-index 385c1886a947..2d35d920e737 100644
+index 385c1886a9470..2d35d920e737f 100644
--- a/drivers/media/i2c/ov2685.c
+++ b/drivers/media/i2c/ov2685.c
@@ -35,7 +35,7 @@
@@ -7651,7 +7651,7 @@
err_clean_entity:
diff --git a/drivers/media/i2c/ov5695.c b/drivers/media/i2c/ov5695.c
-index 9a80decd93d3..1b63d26cb563 100644
+index 9a80decd93d3c..1b63d26cb5637 100644
--- a/drivers/media/i2c/ov5695.c
+++ b/drivers/media/i2c/ov5695.c
@@ -709,6 +709,8 @@ static int ov5695_write_reg(struct i2c_client *client, u16 reg,
@@ -7774,7 +7774,7 @@
err_clean_entity:
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
-index b8ec88612df7..f42082990c2e 100644
+index b8ec88612df70..f42082990c2e0 100644
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -502,6 +502,7 @@ static long media_device_enum_links32(struct media_device *mdev,
@@ -7803,7 +7803,7 @@
#define MEDIA_IOC_ENUM_LINKS32 _IOWR('|', 0x02, struct media_links_enum32)
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
-index 0dfb22114c49..919129eef895 100644
+index 0dfb22114c496..919129eef8951 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -32,6 +32,8 @@ source "drivers/media/platform/davinci/Kconfig"
@@ -7841,7 +7841,7 @@
tristate "Mediatek Video Codec driver"
depends on MTK_IOMMU || COMPILE_TEST
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
-index 41322ab65802..bb29deb0d1f2 100644
+index 41322ab658027..bb29deb0d1f2f 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -70,6 +70,8 @@ obj-$(CONFIG_VIDEO_ROCKCHIP_RGA) += rockchip/rga/
@@ -7863,7 +7863,7 @@
diff --git a/drivers/media/platform/mtk-isp/Kconfig b/drivers/media/platform/mtk-isp/Kconfig
new file mode 100644
-index 000000000000..56ac26204b9e
+index 0000000000000..56ac26204b9e1
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/Kconfig
@@ -0,0 +1,109 @@
@@ -7978,7 +7978,7 @@
+ module will be called mtk_seninf.
diff --git a/drivers/media/platform/mtk-isp/Makefile b/drivers/media/platform/mtk-isp/Makefile
new file mode 100644
-index 000000000000..111e241231c3
+index 0000000000000..111e241231c31
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/Makefile
@@ -0,0 +1,16 @@
@@ -8000,7 +8000,7 @@
+obj-$(CONFIG_VIDEO_MEDIATEK_ISP_FD_SUPPORT) += fd/
diff --git a/drivers/media/platform/mtk-isp/common/Makefile b/drivers/media/platform/mtk-isp/common/Makefile
new file mode 100644
-index 000000000000..ce715fb08bff
+index 0000000000000..ce715fb08bff4
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/common/Makefile
@@ -0,0 +1,32 @@
@@ -8038,7 +8038,7 @@
+
diff --git a/drivers/media/platform/mtk-isp/common/mtk_isp-ctrl.c b/drivers/media/platform/mtk-isp/common/mtk_isp-ctrl.c
new file mode 100644
-index 000000000000..a6822e00064a
+index 0000000000000..a6822e00064a2
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/common/mtk_isp-ctrl.c
@@ -0,0 +1,318 @@
@@ -8362,7 +8362,7 @@
+EXPORT_SYMBOL_GPL(mtk_isp_ctrl_init);
diff --git a/drivers/media/platform/mtk-isp/common/mtk_isp-ctrl.h b/drivers/media/platform/mtk-isp/common/mtk_isp-ctrl.h
new file mode 100644
-index 000000000000..dade294d6a3b
+index 0000000000000..dade294d6a3b0
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/common/mtk_isp-ctrl.h
@@ -0,0 +1,42 @@
@@ -8410,7 +8410,7 @@
+#endif /*__MTK_ISP_CTRL_H__*/
diff --git a/drivers/media/platform/mtk-isp/common/mtk_isp-ctx.h b/drivers/media/platform/mtk-isp/common/mtk_isp-ctx.h
new file mode 100644
-index 000000000000..3a5820a3fcf1
+index 0000000000000..3a5820a3fcf1c
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/common/mtk_isp-ctx.h
@@ -0,0 +1,341 @@
@@ -8757,7 +8757,7 @@
+#endif /*__MTK_ISP_CTX_H__*/
diff --git a/drivers/media/platform/mtk-isp/common/mtk_isp-dev-ctx-core.c b/drivers/media/platform/mtk-isp/common/mtk_isp-dev-ctx-core.c
new file mode 100644
-index 000000000000..5c0b5ae4ffea
+index 0000000000000..5c0b5ae4ffeaf
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/common/mtk_isp-dev-ctx-core.c
@@ -0,0 +1,1045 @@
@@ -9808,7 +9808,7 @@
+EXPORT_SYMBOL_GPL(mtk_isp_ctx_release);
diff --git a/drivers/media/platform/mtk-isp/common/mtk_isp-dev.c b/drivers/media/platform/mtk-isp/common/mtk_isp-dev.c
new file mode 100644
-index 000000000000..3f407f29f104
+index 0000000000000..3f407f29f104d
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/common/mtk_isp-dev.c
@@ -0,0 +1,372 @@
@@ -10186,7 +10186,7 @@
+
diff --git a/drivers/media/platform/mtk-isp/common/mtk_isp-dev.h b/drivers/media/platform/mtk-isp/common/mtk_isp-dev.h
new file mode 100644
-index 000000000000..b20a6f8dc33f
+index 0000000000000..b20a6f8dc33f5
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/common/mtk_isp-dev.h
@@ -0,0 +1,194 @@
@@ -10386,7 +10386,7 @@
+#endif /* __MTK_ISP_DEV_H__ */
diff --git a/drivers/media/platform/mtk-isp/common/mtk_isp-smem-drv.c b/drivers/media/platform/mtk-isp/common/mtk_isp-smem-drv.c
new file mode 100644
-index 000000000000..236bdfae2365
+index 0000000000000..236bdfae23651
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/common/mtk_isp-smem-drv.c
@@ -0,0 +1,805 @@
@@ -11197,7 +11197,7 @@
+MODULE_DESCRIPTION("Mediatek ISP V4L2 shared memory driver");
diff --git a/drivers/media/platform/mtk-isp/common/mtk_isp-smem.h b/drivers/media/platform/mtk-isp/common/mtk_isp-smem.h
new file mode 100644
-index 000000000000..5527d7345647
+index 0000000000000..5527d73456476
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/common/mtk_isp-smem.h
@@ -0,0 +1,24 @@
@@ -11227,7 +11227,7 @@
+
diff --git a/drivers/media/platform/mtk-isp/common/mtk_isp-v4l2.c b/drivers/media/platform/mtk-isp/common/mtk_isp-v4l2.c
new file mode 100644
-index 000000000000..736b3732c5a8
+index 0000000000000..736b3732c5a8a
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/common/mtk_isp-v4l2.c
@@ -0,0 +1,1632 @@
@@ -12865,7 +12865,7 @@
+
diff --git a/drivers/media/platform/mtk-isp/common/mtk_isp-v4l2.h b/drivers/media/platform/mtk-isp/common/mtk_isp-v4l2.h
new file mode 100644
-index 000000000000..1e253effced3
+index 0000000000000..1e253effced35
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/common/mtk_isp-v4l2.h
@@ -0,0 +1,49 @@
@@ -12920,7 +12920,7 @@
+#endif /* __MTK_ISP_DEV_V4L2_H__ */
diff --git a/drivers/media/platform/mtk-isp/fd/Makefile b/drivers/media/platform/mtk-isp/fd/Makefile
new file mode 100644
-index 000000000000..0001fdfd4b6c
+index 0000000000000..0001fdfd4b6cb
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/fd/Makefile
@@ -0,0 +1,38 @@
@@ -12964,7 +12964,7 @@
+$(info "FD: makefile end")
diff --git a/drivers/media/platform/mtk-isp/fd/mtk_fd-core.h b/drivers/media/platform/mtk-isp/fd/mtk_fd-core.h
new file mode 100644
-index 000000000000..2aab4ab53826
+index 0000000000000..2aab4ab53826f
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/fd/mtk_fd-core.h
@@ -0,0 +1,157 @@
@@ -13127,7 +13127,7 @@
+#endif/*__MTK_FD_CORE_H__*/
diff --git a/drivers/media/platform/mtk-isp/fd/mtk_fd-ctx.h b/drivers/media/platform/mtk-isp/fd/mtk_fd-ctx.h
new file mode 100644
-index 000000000000..d78a3afe12e4
+index 0000000000000..d78a3afe12e49
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/fd/mtk_fd-ctx.h
@@ -0,0 +1,299 @@
@@ -13432,7 +13432,7 @@
+#endif /*__MTK_FD_CTX_H__*/
diff --git a/drivers/media/platform/mtk-isp/fd/mtk_fd-dev-ctx-core.c b/drivers/media/platform/mtk-isp/fd/mtk_fd-dev-ctx-core.c
new file mode 100644
-index 000000000000..731443691fd6
+index 0000000000000..731443691fd60
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/fd/mtk_fd-dev-ctx-core.c
@@ -0,0 +1,912 @@
@@ -14350,7 +14350,7 @@
+EXPORT_SYMBOL_GPL(mtk_fd_ctx_trigger_job);
diff --git a/drivers/media/platform/mtk-isp/fd/mtk_fd-dev.c b/drivers/media/platform/mtk-isp/fd/mtk_fd-dev.c
new file mode 100644
-index 000000000000..7e3acf7e4bac
+index 0000000000000..7e3acf7e4bac2
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/fd/mtk_fd-dev.c
@@ -0,0 +1,355 @@
@@ -14711,7 +14711,7 @@
+
diff --git a/drivers/media/platform/mtk-isp/fd/mtk_fd-dev.h b/drivers/media/platform/mtk-isp/fd/mtk_fd-dev.h
new file mode 100644
-index 000000000000..d2b7d77fc7ec
+index 0000000000000..d2b7d77fc7ecc
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/fd/mtk_fd-dev.h
@@ -0,0 +1,198 @@
@@ -14915,7 +14915,7 @@
+#endif /* __MTK_FD_DEV_H__ */
diff --git a/drivers/media/platform/mtk-isp/fd/mtk_fd-smem-drv.c b/drivers/media/platform/mtk-isp/fd/mtk_fd-smem-drv.c
new file mode 100644
-index 000000000000..99a852debc46
+index 0000000000000..99a852debc467
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/fd/mtk_fd-smem-drv.c
@@ -0,0 +1,452 @@
@@ -15373,7 +15373,7 @@
+MODULE_DESCRIPTION("Mediatek FD shared memory driver");
diff --git a/drivers/media/platform/mtk-isp/fd/mtk_fd-smem.h b/drivers/media/platform/mtk-isp/fd/mtk_fd-smem.h
new file mode 100644
-index 000000000000..a19fc376a761
+index 0000000000000..a19fc376a7618
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/fd/mtk_fd-smem.h
@@ -0,0 +1,25 @@
@@ -15404,7 +15404,7 @@
+#endif /*__MTK_FD_SMEM_H__*/
diff --git a/drivers/media/platform/mtk-isp/fd/mtk_fd-v4l2-util.c b/drivers/media/platform/mtk-isp/fd/mtk_fd-v4l2-util.c
new file mode 100644
-index 000000000000..ab85aea422ff
+index 0000000000000..ab85aea422ffe
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/fd/mtk_fd-v4l2-util.c
@@ -0,0 +1,1046 @@
@@ -16456,7 +16456,7 @@
+EXPORT_SYMBOL_GPL(mtk_fd_v4l2_buffer_done);
diff --git a/drivers/media/platform/mtk-isp/fd/mtk_fd-v4l2.c b/drivers/media/platform/mtk-isp/fd/mtk_fd-v4l2.c
new file mode 100644
-index 000000000000..bd447b7b3f4c
+index 0000000000000..bd447b7b3f4c9
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/fd/mtk_fd-v4l2.c
@@ -0,0 +1,114 @@
@@ -16576,7 +16576,7 @@
+EXPORT_SYMBOL_GPL(mtk_fd_ctx_fd_init);
diff --git a/drivers/media/platform/mtk-isp/fd/mtk_fd-v4l2.h b/drivers/media/platform/mtk-isp/fd/mtk_fd-v4l2.h
new file mode 100644
-index 000000000000..0702abc0edd0
+index 0000000000000..0702abc0edd02
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/fd/mtk_fd-v4l2.h
@@ -0,0 +1,36 @@
@@ -16618,7 +16618,7 @@
+#endif /*__MTK_FD_V4L2__*/
diff --git a/drivers/media/platform/mtk-isp/fd/mtk_fd.c b/drivers/media/platform/mtk-isp/fd/mtk_fd.c
new file mode 100644
-index 000000000000..c8e097a8dc9a
+index 0000000000000..c8e097a8dc9ae
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/fd/mtk_fd.c
@@ -0,0 +1,754 @@
@@ -17378,7 +17378,7 @@
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/platform/mtk-isp/fd/mtk_fd.h b/drivers/media/platform/mtk-isp/fd/mtk_fd.h
new file mode 100644
-index 000000000000..6cae44064a32
+index 0000000000000..6cae44064a326
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/fd/mtk_fd.h
@@ -0,0 +1,127 @@
@@ -17511,7 +17511,7 @@
+#endif/*__MTK_FD_H__*/
diff --git a/drivers/media/platform/mtk-isp/isp_50/Makefile b/drivers/media/platform/mtk-isp/isp_50/Makefile
new file mode 100644
-index 000000000000..3211fb095f35
+index 0000000000000..3211fb095f35b
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/Makefile
@@ -0,0 +1,26 @@
@@ -17543,7 +17543,7 @@
+
diff --git a/drivers/media/platform/mtk-isp/isp_50/cam/Makefile b/drivers/media/platform/mtk-isp/isp_50/cam/Makefile
new file mode 100644
-index 000000000000..8ddc34baf386
+index 0000000000000..8ddc34baf3864
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/cam/Makefile
@@ -0,0 +1,19 @@
@@ -17568,7 +17568,7 @@
+obj-$(CONFIG_VIDEO_MEDIATEK_ISP_PASS1_SUPPORT) += mtk-cam-isp.o
diff --git a/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-ctrl.c b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-ctrl.c
new file mode 100644
-index 000000000000..455216ad9cc4
+index 0000000000000..455216ad9cc4b
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-ctrl.c
@@ -0,0 +1,133 @@
@@ -17707,7 +17707,7 @@
+}
diff --git a/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-ctrl.h b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-ctrl.h
new file mode 100644
-index 000000000000..74a6538c81ac
+index 0000000000000..74a6538c81aca
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-ctrl.h
@@ -0,0 +1,32 @@
@@ -17745,7 +17745,7 @@
+#endif /* __MTK_CAM_CTRL_H__ */
diff --git a/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-ctx.h b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-ctx.h
new file mode 100644
-index 000000000000..5f3b807c595d
+index 0000000000000..5f3b807c595d8
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-ctx.h
@@ -0,0 +1,116 @@
@@ -17867,7 +17867,7 @@
+#endif /*__MTK_CAM_CTX_H__*/
diff --git a/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-dev-ctx-core.c b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-dev-ctx-core.c
new file mode 100644
-index 000000000000..c17b294c64f9
+index 0000000000000..c17b294c64f92
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-dev-ctx-core.c
@@ -0,0 +1,302 @@
@@ -18175,7 +18175,7 @@
+}
diff --git a/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-dev.c b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-dev.c
new file mode 100644
-index 000000000000..35e77ee4ec47
+index 0000000000000..35e77ee4ec478
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-dev.c
@@ -0,0 +1,525 @@
@@ -18706,7 +18706,7 @@
+}
diff --git a/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-dev.h b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-dev.h
new file mode 100644
-index 000000000000..57c02616c9c0
+index 0000000000000..57c02616c9c0f
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-dev.h
@@ -0,0 +1,166 @@
@@ -18878,7 +18878,7 @@
+#endif /* __MTK_CAM_DEV_H__ */
diff --git a/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-regs.h b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-regs.h
new file mode 100644
-index 000000000000..90736a14d996
+index 0000000000000..90736a14d996c
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-regs.h
@@ -0,0 +1,147 @@
@@ -19031,7 +19031,7 @@
+#endif /* _CAM_REGS_H */
diff --git a/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-scp.c b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-scp.c
new file mode 100644
-index 000000000000..be5fd365f16f
+index 0000000000000..be5fd365f16f4
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-scp.c
@@ -0,0 +1,488 @@
@@ -19525,7 +19525,7 @@
+}
diff --git a/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-scp.h b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-scp.h
new file mode 100644
-index 000000000000..abc34e785cd3
+index 0000000000000..abc34e785cd39
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-scp.h
@@ -0,0 +1,215 @@
@@ -19746,7 +19746,7 @@
+#endif /* _MTK_ISP_SCP_H */
diff --git a/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-smem-drv.c b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-smem-drv.c
new file mode 100644
-index 000000000000..9a92080a1451
+index 0000000000000..9a92080a14512
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-smem-drv.c
@@ -0,0 +1,398 @@
@@ -20150,7 +20150,7 @@
+MODULE_DESCRIPTION("Mediatek CAM shared memory driver");
diff --git a/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-smem.h b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-smem.h
new file mode 100644
-index 000000000000..719ec0255679
+index 0000000000000..719ec02556791
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-smem.h
@@ -0,0 +1,25 @@
@@ -20181,7 +20181,7 @@
+
diff --git a/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-v4l2-util.c b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-v4l2-util.c
new file mode 100644
-index 000000000000..97e88219a112
+index 0000000000000..97e88219a1123
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-v4l2-util.c
@@ -0,0 +1,1184 @@
@@ -21371,7 +21371,7 @@
+}
diff --git a/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-v4l2-util.h b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-v4l2-util.h
new file mode 100644
-index 000000000000..73b36916da08
+index 0000000000000..73b36916da08c
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-v4l2-util.h
@@ -0,0 +1,43 @@
@@ -21420,7 +21420,7 @@
+#endif /* __MTK_CAM_DEV_V4L2_H__ */
diff --git a/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam.c b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam.c
new file mode 100644
-index 000000000000..935cf7e1ec15
+index 0000000000000..935cf7e1ec157
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam.c
@@ -0,0 +1,1098 @@
@@ -22524,7 +22524,7 @@
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam.h b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam.h
new file mode 100644
-index 000000000000..6d1305826a5a
+index 0000000000000..6d1305826a5a2
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam.h
@@ -0,0 +1,288 @@
@@ -22818,7 +22818,7 @@
+#endif /*__CAMERA_ISP_H*/
diff --git a/drivers/media/platform/mtk-isp/isp_50/camSV/Makefile b/drivers/media/platform/mtk-isp/isp_50/camSV/Makefile
new file mode 100644
-index 000000000000..59b8a89496dd
+index 0000000000000..59b8a89496dd8
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/camSV/Makefile
@@ -0,0 +1,15 @@
@@ -22839,7 +22839,7 @@
+
diff --git a/drivers/media/platform/mtk-isp/isp_50/camSV/camerasv_isp.c b/drivers/media/platform/mtk-isp/isp_50/camSV/camerasv_isp.c
new file mode 100644
-index 000000000000..9020f725d3be
+index 0000000000000..9020f725d3bee
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/camSV/camerasv_isp.c
@@ -0,0 +1,6613 @@
@@ -29458,7 +29458,7 @@
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/platform/mtk-isp/isp_50/camSV/inc/cam_regs.h b/drivers/media/platform/mtk-isp/isp_50/camSV/inc/cam_regs.h
new file mode 100644
-index 000000000000..676dde1d8920
+index 0000000000000..676dde1d8920a
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/camSV/inc/cam_regs.h
@@ -0,0 +1,149 @@
@@ -29613,7 +29613,7 @@
+
diff --git a/drivers/media/platform/mtk-isp/isp_50/camSV/inc/camerasv_isp.h b/drivers/media/platform/mtk-isp/isp_50/camSV/inc/camerasv_isp.h
new file mode 100644
-index 000000000000..ac67284ca920
+index 0000000000000..ac67284ca920f
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/camSV/inc/camerasv_isp.h
@@ -0,0 +1,1256 @@
@@ -30875,7 +30875,7 @@
+
diff --git a/drivers/media/platform/mtk-isp/isp_50/dip/Makefile b/drivers/media/platform/mtk-isp/isp_50/dip/Makefile
new file mode 100644
-index 000000000000..9a08c62f1434
+index 0000000000000..9a08c62f14341
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/dip/Makefile
@@ -0,0 +1,35 @@
@@ -30916,7 +30916,7 @@
+obj-y += mtk_dip_util.o
diff --git a/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-core.h b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-core.h
new file mode 100644
-index 000000000000..f80acf49ed5b
+index 0000000000000..f80acf49ed5bd
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-core.h
@@ -0,0 +1,190 @@
@@ -31112,7 +31112,7 @@
+
diff --git a/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-ctrl.c b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-ctrl.c
new file mode 100644
-index 000000000000..9b6be120d911
+index 0000000000000..9b6be120d9116
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-ctrl.c
@@ -0,0 +1,172 @@
@@ -31290,7 +31290,7 @@
+EXPORT_SYMBOL_GPL(mtk_dip_ctrl_init);
diff --git a/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-ctrl.h b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-ctrl.h
new file mode 100644
-index 000000000000..1095d4733aa2
+index 0000000000000..1095d4733aa2e
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-ctrl.h
@@ -0,0 +1,42 @@
@@ -31338,7 +31338,7 @@
+#endif /*__MTK_DIP_CTRL_H__*/
diff --git a/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-ctx.h b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-ctx.h
new file mode 100644
-index 000000000000..2dd014e86dc1
+index 0000000000000..2dd014e86dc1c
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-ctx.h
@@ -0,0 +1,319 @@
@@ -31663,7 +31663,7 @@
+#endif /*__MTK_DIP_CTX_H__*/
diff --git a/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev-ctx-core.c b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev-ctx-core.c
new file mode 100644
-index 000000000000..46a638ab2ca5
+index 0000000000000..46a638ab2ca5c
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev-ctx-core.c
@@ -0,0 +1,1643 @@
@@ -33312,7 +33312,7 @@
+
diff --git a/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c
new file mode 100644
-index 000000000000..b7db1199f033
+index 0000000000000..b7db1199f033a
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.c
@@ -0,0 +1,374 @@
@@ -33692,7 +33692,7 @@
+
diff --git a/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.h b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.h
new file mode 100644
-index 000000000000..95a39071dd6b
+index 0000000000000..95a39071dd6b2
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-dev.h
@@ -0,0 +1,191 @@
@@ -33889,7 +33889,7 @@
+#endif /* __MTK_DIP_DEV_H__ */
diff --git a/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-smem-drv.c b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-smem-drv.c
new file mode 100644
-index 000000000000..0c754cc458d0
+index 0000000000000..0c754cc458d0d
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-smem-drv.c
@@ -0,0 +1,454 @@
@@ -34349,7 +34349,7 @@
+MODULE_DESCRIPTION("Mediatek DIP shared memory driver");
diff --git a/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-smem.h b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-smem.h
new file mode 100644
-index 000000000000..6098181a1e9d
+index 0000000000000..6098181a1e9d5
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-smem.h
@@ -0,0 +1,24 @@
@@ -34379,7 +34379,7 @@
+
diff --git a/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2-util.c b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2-util.c
new file mode 100644
-index 000000000000..62a6f1c881f1
+index 0000000000000..62a6f1c881f18
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2-util.c
@@ -0,0 +1,1002 @@
@@ -35387,7 +35387,7 @@
+EXPORT_SYMBOL_GPL(mtk_dip_v4l2_buffer_done);
diff --git a/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2-util.h b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2-util.h
new file mode 100644
-index 000000000000..0d0deabcb77e
+index 0000000000000..0d0deabcb77ef
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2-util.h
@@ -0,0 +1,38 @@
@@ -35431,7 +35431,7 @@
+#endif /* __MTK_DIP_DEV_V4L2_H__ */
diff --git a/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
new file mode 100644
-index 000000000000..0318c4043309
+index 0000000000000..0318c40433097
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.c
@@ -0,0 +1,360 @@
@@ -35797,7 +35797,7 @@
+EXPORT_SYMBOL_GPL(mtk_dip_ctx_dip_reprocess_init);
diff --git a/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.h b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.h
new file mode 100644
-index 000000000000..f66c599a8ad4
+index 0000000000000..f66c599a8ad46
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip-v4l2.h
@@ -0,0 +1,64 @@
@@ -35867,7 +35867,7 @@
+#endif /*__MTK_DIP_V4L2__*/
diff --git a/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip.c b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip.c
new file mode 100644
-index 000000000000..975177051541
+index 0000000000000..975177051541e
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip.c
@@ -0,0 +1,1420 @@
@@ -37293,7 +37293,7 @@
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip.h b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip.h
new file mode 100644
-index 000000000000..6650c4ae98f6
+index 0000000000000..6650c4ae98f6c
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/dip/mtk_dip.h
@@ -0,0 +1,93 @@
@@ -37392,7 +37392,7 @@
+
diff --git a/drivers/media/platform/mtk-isp/isp_50/seninf/Makefile b/drivers/media/platform/mtk-isp/isp_50/seninf/Makefile
new file mode 100755
-index 000000000000..f1b2e2d2be3b
+index 0000000000000..f1b2e2d2be3bd
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/seninf/Makefile
@@ -0,0 +1,4 @@
@@ -37402,7 +37402,7 @@
+obj-$(CONFIG_MTK_SENINF) += mtk_seninf.o
diff --git a/drivers/media/platform/mtk-isp/isp_50/seninf/mtk_seninf.c b/drivers/media/platform/mtk-isp/isp_50/seninf/mtk_seninf.c
new file mode 100644
-index 000000000000..7ac8a4a259c0
+index 0000000000000..7ac8a4a259c09
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/seninf/mtk_seninf.c
@@ -0,0 +1,1339 @@
@@ -38747,7 +38747,7 @@
+MODULE_ALIAS("MTK:mtk_seninf");
diff --git a/drivers/media/platform/mtk-isp/isp_50/seninf/seninf_drv_def.h b/drivers/media/platform/mtk-isp/isp_50/seninf/seninf_drv_def.h
new file mode 100644
-index 000000000000..6280ae49a97d
+index 0000000000000..6280ae49a97d8
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/seninf/seninf_drv_def.h
@@ -0,0 +1,201 @@
@@ -38954,7 +38954,7 @@
+#endif /*__SENINF_DRV_DEF_H__ */
diff --git a/drivers/media/platform/mtk-isp/isp_50/seninf/seninf_reg.h b/drivers/media/platform/mtk-isp/isp_50/seninf/seninf_reg.h
new file mode 100644
-index 000000000000..7402630ab7b6
+index 0000000000000..7402630ab7b68
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/seninf/seninf_reg.h
@@ -0,0 +1,992 @@
@@ -39952,7 +39952,7 @@
+#endif /* _SENINF_REG_H_ */
diff --git a/drivers/media/platform/mtk-mdp3/Makefile b/drivers/media/platform/mtk-mdp3/Makefile
new file mode 100644
-index 000000000000..cd1de4ef7f42
+index 0000000000000..cd1de4ef7f426
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/Makefile
@@ -0,0 +1,15 @@
@@ -39973,7 +39973,7 @@
+
diff --git a/drivers/media/platform/mtk-mdp3/isp_reg.h b/drivers/media/platform/mtk-mdp3/isp_reg.h
new file mode 100644
-index 000000000000..93552943c323
+index 0000000000000..93552943c3232
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/isp_reg.h
@@ -0,0 +1,38 @@
@@ -40017,7 +40017,7 @@
+#endif // __ISP_REG_H__
diff --git a/drivers/media/platform/mtk-mdp3/mdp-platform.h b/drivers/media/platform/mtk-mdp3/mdp-platform.h
new file mode 100644
-index 000000000000..6926c3a754fa
+index 0000000000000..6926c3a754fa3
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mdp-platform.h
@@ -0,0 +1,67 @@
@@ -40090,7 +40090,7 @@
+
diff --git a/drivers/media/platform/mtk-mdp3/mdp_reg_ccorr.h b/drivers/media/platform/mtk-mdp3/mdp_reg_ccorr.h
new file mode 100644
-index 000000000000..e3340726e6d4
+index 0000000000000..e3340726e6d43
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mdp_reg_ccorr.h
@@ -0,0 +1,76 @@
@@ -40172,7 +40172,7 @@
+#endif // __MDP_REG_CCORR_H__
diff --git a/drivers/media/platform/mtk-mdp3/mdp_reg_rdma.h b/drivers/media/platform/mtk-mdp3/mdp_reg_rdma.h
new file mode 100644
-index 000000000000..5625d9f7810d
+index 0000000000000..5625d9f7810d6
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mdp_reg_rdma.h
@@ -0,0 +1,207 @@
@@ -40385,7 +40385,7 @@
+#endif // __MDP_REG_RDMA_H__
diff --git a/drivers/media/platform/mtk-mdp3/mdp_reg_rsz.h b/drivers/media/platform/mtk-mdp3/mdp_reg_rsz.h
new file mode 100644
-index 000000000000..407b7691e9d1
+index 0000000000000..407b7691e9d15
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mdp_reg_rsz.h
@@ -0,0 +1,110 @@
@@ -40501,7 +40501,7 @@
+#endif // __MDP_REG_RSZ_H__
diff --git a/drivers/media/platform/mtk-mdp3/mdp_reg_wdma.h b/drivers/media/platform/mtk-mdp3/mdp_reg_wdma.h
new file mode 100644
-index 000000000000..7a3b857953e2
+index 0000000000000..7a3b857953e23
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mdp_reg_wdma.h
@@ -0,0 +1,126 @@
@@ -40633,7 +40633,7 @@
+#endif // __MDP_REG_WDMA_H__
diff --git a/drivers/media/platform/mtk-mdp3/mdp_reg_wrot.h b/drivers/media/platform/mtk-mdp3/mdp_reg_wrot.h
new file mode 100644
-index 000000000000..376bc85c7703
+index 0000000000000..376bc85c77034
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mdp_reg_wrot.h
@@ -0,0 +1,116 @@
@@ -40755,7 +40755,7 @@
+#endif // __MDP_REG_WROT_H__
diff --git a/drivers/media/platform/mtk-mdp3/mmsys_config.h b/drivers/media/platform/mtk-mdp3/mmsys_config.h
new file mode 100644
-index 000000000000..d1328840bbf2
+index 0000000000000..d1328840bbf22
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mmsys_config.h
@@ -0,0 +1,189 @@
@@ -40950,7 +40950,7 @@
+#endif // __MMSYS_CONFIG_H__
diff --git a/drivers/media/platform/mtk-mdp3/mmsys_mutex.h b/drivers/media/platform/mtk-mdp3/mmsys_mutex.h
new file mode 100644
-index 000000000000..9ff382cc37c8
+index 0000000000000..9ff382cc37c86
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mmsys_mutex.h
@@ -0,0 +1,36 @@
@@ -40992,7 +40992,7 @@
+#endif // __MMSYS_MUTEX_H__
diff --git a/drivers/media/platform/mtk-mdp3/mmsys_reg_base.h b/drivers/media/platform/mtk-mdp3/mmsys_reg_base.h
new file mode 100644
-index 000000000000..441cb56fcbba
+index 0000000000000..441cb56fcbba4
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mmsys_reg_base.h
@@ -0,0 +1,39 @@
@@ -41037,7 +41037,7 @@
+#endif // __MM_REG_BASE_H__
diff --git a/drivers/media/platform/mtk-mdp3/mtk-img-ipi.h b/drivers/media/platform/mtk-mdp3/mtk-img-ipi.h
new file mode 100644
-index 000000000000..681732b2316a
+index 0000000000000..681732b2316ac
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mtk-img-ipi.h
@@ -0,0 +1,282 @@
@@ -41325,7 +41325,7 @@
+
diff --git a/drivers/media/platform/mtk-mdp3/mtk-mdp3-cmdq.c b/drivers/media/platform/mtk-mdp3/mtk-mdp3-cmdq.c
new file mode 100644
-index 000000000000..707f967efa91
+index 0000000000000..707f967efa913
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mtk-mdp3-cmdq.c
@@ -0,0 +1,458 @@
@@ -41789,7 +41789,7 @@
+
diff --git a/drivers/media/platform/mtk-mdp3/mtk-mdp3-cmdq.h b/drivers/media/platform/mtk-mdp3/mtk-mdp3-cmdq.h
new file mode 100644
-index 000000000000..b61ab1ac4325
+index 0000000000000..b61ab1ac43259
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mtk-mdp3-cmdq.h
@@ -0,0 +1,57 @@
@@ -41852,7 +41852,7 @@
+
diff --git a/drivers/media/platform/mtk-mdp3/mtk-mdp3-comp.c b/drivers/media/platform/mtk-mdp3/mtk-mdp3-comp.c
new file mode 100644
-index 000000000000..0d172f6b5f2b
+index 0000000000000..0d172f6b5f2bf
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mtk-mdp3-comp.c
@@ -0,0 +1,1325 @@
@@ -43183,7 +43183,7 @@
+
diff --git a/drivers/media/platform/mtk-mdp3/mtk-mdp3-comp.h b/drivers/media/platform/mtk-mdp3/mtk-mdp3-comp.h
new file mode 100644
-index 000000000000..0c65214ef695
+index 0000000000000..0c65214ef6952
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mtk-mdp3-comp.h
@@ -0,0 +1,177 @@
@@ -43366,7 +43366,7 @@
+
diff --git a/drivers/media/platform/mtk-mdp3/mtk-mdp3-core.c b/drivers/media/platform/mtk-mdp3/mtk-mdp3-core.c
new file mode 100644
-index 000000000000..426f1a3aa94a
+index 0000000000000..426f1a3aa94a6
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mtk-mdp3-core.c
@@ -0,0 +1,283 @@
@@ -43655,7 +43655,7 @@
+
diff --git a/drivers/media/platform/mtk-mdp3/mtk-mdp3-core.h b/drivers/media/platform/mtk-mdp3/mtk-mdp3-core.h
new file mode 100644
-index 000000000000..bc3b168a4d5a
+index 0000000000000..bc3b168a4d5a2
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mtk-mdp3-core.h
@@ -0,0 +1,88 @@
@@ -43749,7 +43749,7 @@
+
diff --git a/drivers/media/platform/mtk-mdp3/mtk-mdp3-debug.c b/drivers/media/platform/mtk-mdp3/mtk-mdp3-debug.c
new file mode 100644
-index 000000000000..0a97836aa71a
+index 0000000000000..0a97836aa71ad
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mtk-mdp3-debug.c
@@ -0,0 +1,1102 @@
@@ -44857,7 +44857,7 @@
+
diff --git a/drivers/media/platform/mtk-mdp3/mtk-mdp3-debug.h b/drivers/media/platform/mtk-mdp3/mtk-mdp3-debug.h
new file mode 100644
-index 000000000000..537602f42209
+index 0000000000000..537602f422094
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mtk-mdp3-debug.h
@@ -0,0 +1,40 @@
@@ -44903,7 +44903,7 @@
+
diff --git a/drivers/media/platform/mtk-mdp3/mtk-mdp3-m2m.c b/drivers/media/platform/mtk-mdp3/mtk-mdp3-m2m.c
new file mode 100644
-index 000000000000..d5efd42c252c
+index 0000000000000..d5efd42c252ce
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mtk-mdp3-m2m.c
@@ -0,0 +1,787 @@
@@ -45696,7 +45696,7 @@
+
diff --git a/drivers/media/platform/mtk-mdp3/mtk-mdp3-m2m.h b/drivers/media/platform/mtk-mdp3/mtk-mdp3-m2m.h
new file mode 100644
-index 000000000000..1f681b48c2ad
+index 0000000000000..1f681b48c2adb
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mtk-mdp3-m2m.h
@@ -0,0 +1,52 @@
@@ -45754,7 +45754,7 @@
+
diff --git a/drivers/media/platform/mtk-mdp3/mtk-mdp3-regs.c b/drivers/media/platform/mtk-mdp3/mtk-mdp3-regs.c
new file mode 100644
-index 000000000000..9ac79286216c
+index 0000000000000..9ac79286216c6
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mtk-mdp3-regs.c
@@ -0,0 +1,778 @@
@@ -46538,7 +46538,7 @@
+
diff --git a/drivers/media/platform/mtk-mdp3/mtk-mdp3-regs.h b/drivers/media/platform/mtk-mdp3/mtk-mdp3-regs.h
new file mode 100644
-index 000000000000..daf2a4d2a935
+index 0000000000000..daf2a4d2a935d
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mtk-mdp3-regs.h
@@ -0,0 +1,388 @@
@@ -46932,7 +46932,7 @@
+
diff --git a/drivers/media/platform/mtk-mdp3/mtk-mdp3-ut.c b/drivers/media/platform/mtk-mdp3/mtk-mdp3-ut.c
new file mode 100644
-index 000000000000..e259aeca54fb
+index 0000000000000..e259aeca54fbb
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mtk-mdp3-ut.c
@@ -0,0 +1,663 @@
@@ -47601,7 +47601,7 @@
+
diff --git a/drivers/media/platform/mtk-mdp3/mtk-mdp3-vpu.c b/drivers/media/platform/mtk-mdp3/mtk-mdp3-vpu.c
new file mode 100644
-index 000000000000..e6189991331d
+index 0000000000000..e6189991331da
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mtk-mdp3-vpu.c
@@ -0,0 +1,277 @@
@@ -47884,7 +47884,7 @@
+
diff --git a/drivers/media/platform/mtk-mdp3/mtk-mdp3-vpu.h b/drivers/media/platform/mtk-mdp3/mtk-mdp3-vpu.h
new file mode 100644
-index 000000000000..f6551d774902
+index 0000000000000..f6551d774902a
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp3/mtk-mdp3-vpu.h
@@ -0,0 +1,89 @@
@@ -47978,7 +47978,7 @@
+#endif /* __MTK_MDP3_VPU_H__ */
+
diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mtk-vpu/mtk_vpu.c
-index 01cab05e7b81..3c87c315e948 100644
+index 01cab05e7b818..3c87c315e9489 100644
--- a/drivers/media/platform/mtk-vpu/mtk_vpu.c
+++ b/drivers/media/platform/mtk-vpu/mtk_vpu.c
@@ -595,8 +595,26 @@ static struct vpu_reserve_mblock vpu_reserve_mblock[] = {
@@ -48010,7 +48010,7 @@
int vpu_reserve_mem_of_init(struct reserved_mem *rmem)
diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.h b/drivers/media/platform/mtk-vpu/mtk_vpu.h
-index ca09de70ceda..9c4cd0f53292 100644
+index ca09de70cedae..9c4cd0f532926 100644
--- a/drivers/media/platform/mtk-vpu/mtk_vpu.h
+++ b/drivers/media/platform/mtk-vpu/mtk_vpu.h
@@ -66,6 +66,13 @@ enum ipi_id {
@@ -48038,7 +48038,7 @@
};
diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
-index f4325329fbd6..fe4577a46869 100644
+index f4325329fbd6f..fe4577a46869d 100644
--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
@@ -323,6 +323,7 @@ static int __get_v4l2_format32(struct v4l2_format __user *p64,
@@ -48058,7 +48058,7 @@
sizeof(p64->fmt.meta)) ? -EFAULT : 0;
default:
diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
-index feb749aaaa42..fcd355e06518 100644
+index feb749aaaa42f..fcd355e065188 100644
--- a/drivers/media/v4l2-core/v4l2-dev.c
+++ b/drivers/media/v4l2-core/v4l2-dev.c
@@ -597,7 +597,8 @@ static void determine_valid_ioctls(struct video_device *vdev)
@@ -48102,7 +48102,7 @@
SET_VALID_IOCTL(ops, VIDIOC_OVERLAY, vidioc_overlay);
SET_VALID_IOCTL(ops, VIDIOC_G_FBUF, vidioc_g_fbuf);
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
-index beb0d0722385..a65cdb039702 100644
+index beb0d07223859..a65cdb0397023 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -194,6 +194,7 @@ const char *v4l2_type_names[] = {
@@ -48179,7 +48179,7 @@
}
diff --git a/drivers/memory/mtk-emi.c b/drivers/memory/mtk-emi.c
new file mode 100644
-index 000000000000..cb6a988c4d70
+index 0000000000000..cb6a988c4d709
--- /dev/null
+++ b/drivers/memory/mtk-emi.c
@@ -0,0 +1,405 @@
@@ -48590,7 +48590,7 @@
+
diff --git a/drivers/mmc/host/mtk-sdio-proc.c b/drivers/mmc/host/mtk-sdio-proc.c
new file mode 100644
-index 000000000000..6f4c3cd96d42
+index 0000000000000..6f4c3cd96d429
--- /dev/null
+++ b/drivers/mmc/host/mtk-sdio-proc.c
@@ -0,0 +1,342 @@
@@ -48938,7 +48938,7 @@
+}
diff --git a/drivers/mmc/host/mtk-sdio-proc.h b/drivers/mmc/host/mtk-sdio-proc.h
new file mode 100644
-index 000000000000..33659ba69be3
+index 0000000000000..33659ba69be32
--- /dev/null
+++ b/drivers/mmc/host/mtk-sdio-proc.h
@@ -0,0 +1,48 @@
@@ -48992,7 +48992,7 @@
+};
diff --git a/drivers/remoteproc/mtk_common.h b/drivers/remoteproc/mtk_common.h
new file mode 100644
-index 000000000000..19a907810271
+index 0000000000000..19a9078102712
--- /dev/null
+++ b/drivers/remoteproc/mtk_common.h
@@ -0,0 +1,77 @@
@@ -49075,7 +49075,7 @@
+#endif
diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
new file mode 100644
-index 000000000000..167991b29161
+index 0000000000000..167991b29161f
--- /dev/null
+++ b/drivers/remoteproc/mtk_scp.c
@@ -0,0 +1,699 @@
@@ -49780,7 +49780,7 @@
+MODULE_DESCRIPTION("MediaTek SCP control driver");
diff --git a/drivers/remoteproc/mtk_scp_ipi.c b/drivers/remoteproc/mtk_scp_ipi.c
new file mode 100644
-index 000000000000..10b0cbda7aee
+index 0000000000000..10b0cbda7aee3
--- /dev/null
+++ b/drivers/remoteproc/mtk_scp_ipi.c
@@ -0,0 +1,163 @@
@@ -49949,7 +49949,7 @@
+MODULE_DESCRIPTION("MediaTek scp IPI interface");
diff --git a/drivers/rpmsg/mtk_rpmsg.c b/drivers/rpmsg/mtk_rpmsg.c
new file mode 100644
-index 000000000000..e5e988941ea6
+index 0000000000000..e5e988941ea67
--- /dev/null
+++ b/drivers/rpmsg/mtk_rpmsg.c
@@ -0,0 +1,396 @@
@@ -50351,7 +50351,7 @@
+MODULE_DESCRIPTION("MediaTek scp rpmsg driver");
diff --git a/include/dt-bindings/gce/mt8183-gce.h b/include/dt-bindings/gce/mt8183-gce.h
new file mode 100644
-index 000000000000..aeb95154fac2
+index 0000000000000..aeb95154fac28
--- /dev/null
+++ b/include/dt-bindings/gce/mt8183-gce.h
@@ -0,0 +1,177 @@
@@ -50534,7 +50534,7 @@
+#endif
diff --git a/include/dt-bindings/reset-controller/mt8183-resets.h b/include/dt-bindings/reset-controller/mt8183-resets.h
new file mode 100644
-index 000000000000..f0d92af29f3f
+index 0000000000000..f0d92af29f3fa
--- /dev/null
+++ b/include/dt-bindings/reset-controller/mt8183-resets.h
@@ -0,0 +1,89 @@
@@ -50629,7 +50629,7 @@
+#endif /* _DT_BINDINGS_RESET_CONTROLLER_MT8183 */
diff --git a/include/linux/platform_data/mtk_scp.h b/include/linux/platform_data/mtk_scp.h
new file mode 100644
-index 000000000000..90f91431c5f4
+index 0000000000000..90f91431c5f44
--- /dev/null
+++ b/include/linux/platform_data/mtk_scp.h
@@ -0,0 +1,166 @@
@@ -50801,7 +50801,7 @@
+#endif /* _MTK_SCP_H */
diff --git a/include/linux/rpmsg/mtk_rpmsg.h b/include/linux/rpmsg/mtk_rpmsg.h
new file mode 100644
-index 000000000000..90f848696161
+index 0000000000000..90f848696161f
--- /dev/null
+++ b/include/linux/rpmsg/mtk_rpmsg.h
@@ -0,0 +1,30 @@
@@ -50836,7 +50836,7 @@
+
+#endif
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
-index 5848d92c30da..8f6c497e3b7b 100644
+index 5848d92c30da3..8f6c497e3b7b4 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -318,6 +318,8 @@ struct v4l2_ioctl_ops {
@@ -50877,7 +50877,7 @@
int (*vidioc_reqbufs)(struct file *file, void *fh,
diff --git a/include/soc/mediatek/emi.h b/include/soc/mediatek/emi.h
new file mode 100644
-index 000000000000..83bdaeb6840b
+index 0000000000000..83bdaeb6840b8
--- /dev/null
+++ b/include/soc/mediatek/emi.h
@@ -0,0 +1,116 @@
@@ -50998,7 +50998,7 @@
+
+#endif
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
-index e4ee10ee917d..c561ac7fdbe3 100644
+index e4ee10ee917de..c561ac7fdbe31 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -190,6 +190,10 @@ enum v4l2_colorfx {
@@ -51013,7 +51013,7 @@
/* The MPEG controls are applicable to all codec controls
* and the 'MPEG' part of the define is historical */
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index fb0b74b698d0..a58a503ce5c3 100644
+index fb0b74b698d0f..a58a503ce5c30 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -145,6 +145,7 @@ enum v4l2_buf_type {
@@ -51069,5 +51069,5 @@
#define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafe
--
-2.21.0.1020.gf2820cf01a-goog
+2.22.0.rc1.257.g3120a18244-goog
diff --git a/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0004-TEST-ONLY-Bringup-Giant-sensor-OV02A10.patch b/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0004-TEST-ONLY-Bringup-Giant-sensor-OV02A10.patch
index 9487a1a..13c6a00 100644
--- a/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0004-TEST-ONLY-Bringup-Giant-sensor-OV02A10.patch
+++ b/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0004-TEST-ONLY-Bringup-Giant-sensor-OV02A10.patch
@@ -1,13 +1,9 @@
-From 9e8f15e4951e6204582db864c06bb50daeff1272 Mon Sep 17 00:00:00 2001
-From: Dongchun Zhu <dongchun.zhu@mediatek.com>
-Date: Tue, 26 Mar 2019 14:27:17 +0800
-Subject: [PATCH 4/7] TEST-ONLY: Bringup Giant sensor OV02A10
+From 4f6a8b06a3292fd7d21ac233e74ce3b57156de4a Mon Sep 17 00:00:00 2001
+From: YH Lin <yueherngl@google.com>
+Date: Wed, 22 May 2019 08:02:12 -0700
+Subject: [PATCH 4/8] TEST-ONLY: Bringup Giant sensor OV02A10
-1. Add ov02a10 driver
-2. Update board device tree for HW change
-
-Change-Id: I3109722c70147bfd3140623a472aac595010a890
-Signed-off-by: Dongchun Zhu <dongchun.zhu@mediatek.com>
+Change-Id: I8674e0aca6dafb88246bc9181acbc68312f14b8b
---
.../arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 20 +-
.../arm64/chromiumos-arm64.flavour.config | 2 +-
@@ -19,7 +15,7 @@
create mode 100644 drivers/media/i2c/ov02a10.c
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
-index b2fd77e04164..fc61d7d25af5 100644
+index b2fd77e04164c..fc61d7d25af5f 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
@@ -228,7 +228,7 @@
@@ -92,7 +88,7 @@
};
diff --git a/chromeos/config/arm64/chromiumos-arm64.flavour.config b/chromeos/config/arm64/chromiumos-arm64.flavour.config
-index 4a054df0d6cb..065254f44892 100644
+index 4a054df0d6cb1..065254f448922 100644
--- a/chromeos/config/arm64/chromiumos-arm64.flavour.config
+++ b/chromeos/config/arm64/chromiumos-arm64.flavour.config
@@ -1013,8 +1013,8 @@ CONFIG_VIDEO_MEDIATEK_MDP3=y
@@ -106,7 +102,7 @@
# CONFIG_VIDEO_PVRUSB2 is not set
# CONFIG_VIDEO_QCOM_CAMSS is not set
diff --git a/chromeos/config/arm64/chromiumos-mediatek.flavour.config b/chromeos/config/arm64/chromiumos-mediatek.flavour.config
-index 74855922e1c7..1dec1fdc2932 100644
+index 74855922e1c74..1dec1fdc29321 100644
--- a/chromeos/config/arm64/chromiumos-mediatek.flavour.config
+++ b/chromeos/config/arm64/chromiumos-mediatek.flavour.config
@@ -284,8 +284,8 @@ CONFIG_VIDEO_MEDIATEK_MDP3=y
@@ -120,7 +116,7 @@
# CONFIG_VIDEO_STK1160_COMMON is not set
# CONFIG_VIDEO_TM6000 is not set
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
-index 7f6e4d35d985..3719036912b7 100644
+index 7f6e4d35d9851..3719036912b7e 100644
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -43,6 +43,18 @@ config VIDEO_OV5695
@@ -143,7 +139,7 @@
# Encoder / Decoder module configuration
#
diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
-index a94eb03d10d4..e2673e0e73d8 100644
+index a94eb03d10d4e..e2673e0e73d82 100644
--- a/drivers/media/i2c/Makefile
+++ b/drivers/media/i2c/Makefile
@@ -72,6 +72,7 @@ obj-$(CONFIG_VIDEO_OV5645) += ov5645.o
@@ -156,7 +152,7 @@
obj-$(CONFIG_VIDEO_OV7640) += ov7640.o
diff --git a/drivers/media/i2c/ov02a10.c b/drivers/media/i2c/ov02a10.c
new file mode 100644
-index 000000000000..e1cd303e8a21
+index 0000000000000..e1cd303e8a21d
--- /dev/null
+++ b/drivers/media/i2c/ov02a10.c
@@ -0,0 +1,1055 @@
@@ -1216,5 +1212,5 @@
+MODULE_LICENSE("GPL v2");
+
--
-2.21.0.1020.gf2820cf01a-goog
+2.22.0.rc1.257.g3120a18244-goog
diff --git a/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0005-Squash-HQ-ToT-37-against-Kukui-ISP-ToT-139.patch b/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0005-Squash-HQ-ToT-37-against-Kukui-ISP-ToT-139.patch
index e00a4fb..4b1dec8 100644
--- a/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0005-Squash-HQ-ToT-37-against-Kukui-ISP-ToT-139.patch
+++ b/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0005-Squash-HQ-ToT-37-against-Kukui-ISP-ToT-139.patch
@@ -1,7 +1,7 @@
From 4c7c1cce738efaa21c02cb1e8eb04ac7761b7bea Mon Sep 17 00:00:00 2001
From: YH Lin <yueherngl@google.com>
Date: Wed, 22 May 2019 08:42:37 -0700
-Subject: [PATCH 5/9] Squash HQ ToT #37 against Kukui ISP ToT #139.
+Subject: [PATCH 5/8] Squash HQ ToT #37 against Kukui ISP ToT #139.
Change-Id: I119c34f6d51c2454780019a7b8b08349e626c298
---
@@ -7549,5 +7549,5 @@
{
.name = "da7219.5-001a",
--
-2.21.0.1020.gf2820cf01a-goog
+2.22.0.rc1.257.g3120a18244-goog
diff --git a/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0006-FROMLIST-ath10k-remove-mmc_hw_reset-while-hif-power-.patch b/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0006-FROMLIST-ath10k-remove-mmc_hw_reset-while-hif-power-.patch
deleted file mode 100644
index 28468a2..0000000
--- a/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0006-FROMLIST-ath10k-remove-mmc_hw_reset-while-hif-power-.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 6a85f7dec3af91687c4254e0dad7e1a0acdf316e Mon Sep 17 00:00:00 2001
-From: Wen Gong <wgong@codeaurora.org>
-Date: Fri, 26 Apr 2019 16:26:33 +0800
-Subject: [PATCH 6/7] FROMLIST: ath10k: remove mmc_hw_reset while hif power
- down
-
-For sdio 3.0 chip, the clock will drop from 200M Hz to 50M Hz after load
-ath10k driver, it is because mmc_hw_reset will reset the sdio's power,
-then mmc will consider it as sdio 2.0 and drop the clock.
-
-Remove mmc_hw_reset will avoid the drop of clock.
-
-Tested with QCA6174 SDIO with firmware
-WLAN.RMH.4.4.1-00007-QCARMSWP-1.
-
-Signed-off-by: Wen Gong <wgong@codeaurora.org>
-
-(am from https://patchwork.kernel.org/patch/10920563/)
-
-BUG=b:131043339
-TEST=Connect and ping success
-
-Change-Id: Ie3cfdf6aba09295c06ee84379cdb3dbf1cd12688
-Signed-off-by: Wen Gong <wgong@codeaurora.org>
-Signed-off-by: Claire Chang <tientzu@chromium.org>
----
- drivers/net/wireless/ath/ath10k/sdio.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c
-index 88eca876c716..e41b072a1fb8 100644
---- a/drivers/net/wireless/ath/ath10k/sdio.c
-+++ b/drivers/net/wireless/ath/ath10k/sdio.c
-@@ -1443,10 +1443,6 @@ static void ath10k_sdio_hif_power_down(struct ath10k *ar)
- return;
- }
-
-- ret = mmc_hw_reset(ar_sdio->func->card->host);
-- if (ret)
-- ath10k_warn(ar, "unable to reset sdio: %d\n", ret);
--
- sdio_release_host(ar_sdio->func);
-
- ar_sdio->is_disabled = true;
---
-2.21.0.1020.gf2820cf01a-goog
-
diff --git a/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0006-FROMLIST-ath10k-remove-mmc_hw_reset-while-hif-power.patch b/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0006-FROMLIST-ath10k-remove-mmc_hw_reset-while-hif-power.patch
new file mode 100644
index 0000000..1df6e1d
--- /dev/null
+++ b/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0006-FROMLIST-ath10k-remove-mmc_hw_reset-while-hif-power.patch
@@ -0,0 +1,28 @@
+From dec1a665e063cf4bf1bd29a0a11e7aae3f8d41c7 Mon Sep 17 00:00:00 2001
+From: YH Lin <yueherngl@google.com>
+Date: Wed, 22 May 2019 08:44:10 -0700
+Subject: [PATCH 6/8] FROMLIST: ath10k: remove mmc_hw_reset while hif power
+
+Change-Id: I1a0d99ca9a941401c003e9faeee066b6ebff850f
+---
+ drivers/net/wireless/ath/ath10k/sdio.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c
+index 938685a6d594b..1bf4c82068f28 100644
+--- a/drivers/net/wireless/ath/ath10k/sdio.c
++++ b/drivers/net/wireless/ath/ath10k/sdio.c
+@@ -1443,10 +1443,6 @@ static void ath10k_sdio_hif_power_down(struct ath10k *ar)
+ return;
+ }
+
+- ret = mmc_hw_reset(ar_sdio->func->card->host);
+- if (ret)
+- ath10k_warn(ar, "unable to reset sdio: %d\n", ret);
+-
+ sdio_release_host(ar_sdio->func);
+
+ ar_sdio->is_disabled = true;
+--
+2.22.0.rc1.257.g3120a18244-goog
+
diff --git a/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0007-CHROMIUM-arm64-dts-mt8183-kukui-add-wifi-power-contr.patch b/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0007-CHROMIUM-arm64-dts-mt8183-kukui-add-wifi-power-contr.patch
index 7ca9b7c..eaf4e16 100644
--- a/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0007-CHROMIUM-arm64-dts-mt8183-kukui-add-wifi-power-contr.patch
+++ b/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0007-CHROMIUM-arm64-dts-mt8183-kukui-add-wifi-power-contr.patch
@@ -1,32 +1,19 @@
-From a887a1577f6ca6003141a75084f5d6c2c8019200 Mon Sep 17 00:00:00 2001
-From: jjian zhou <jjian.zhou@mediatek.com>
-Date: Fri, 26 Apr 2019 11:12:06 +0800
-Subject: [PATCH 7/7] CHROMIUM: arm64: dts: mt8183-kukui: add wifi power
+From 314a000a040c368f5a15b32cf936b0425b0f31b1 Mon Sep 17 00:00:00 2001
+From: YH Lin <yueherngl@google.com>
+Date: Wed, 22 May 2019 08:45:25 -0700
+Subject: [PATCH 7/8] CHROMIUM: arm64: dts: mt8183-kukui: add wifi power
controller
-To comply with schematic design, remove gpio119 from
-mmc1_fixed_power and add it back as wlan_en pin in
-mmc1default. msdcpll is only for mmc module. Assign
-msdcpll to mmc1 clk for avoiding unexpected changes.
-
-BUG=b:131043339
-TEST=Cherry-pick and update kernel with
- https://crrev.com/c/1585667. Make sure SDIO clk
- is running at 200MHz correctly by checking
- /sys/kernel/debug/mmc1/ios
-
-Change-Id: I325df93ae939e929618f7234f18c674cce4e4138
-Signed-off-by: jjian zhou <jjian.zhou@mediatek.com>
-Signed-off-by: Ayo Wu <ayowu@chromium.org>
+Change-Id: Ie8ce1132c29a2026ede186d4f5e0ee97714e477b
---
.../arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 22 ++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
-index 0bf7b3c081bf..21f30d0e00b5 100644
+index c0ae93c5aac83..ae21a9a0f7098 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
-@@ -68,6 +68,20 @@
+@@ -82,6 +82,20 @@
enable-active-high;
};
@@ -47,7 +34,7 @@
reserved_memory: reserved-memory {
#address-cells = <2>;
#size-cells = <2>;
-@@ -392,8 +406,8 @@
+@@ -407,8 +421,8 @@
pinctrl-names = "default", "state_uhs";
pinctrl-0 = <&mmc1_pins_default>;
pinctrl-1 = <&mmc1_pins_uhs>;
@@ -58,7 +45,7 @@
bus-width = <4>;
max-frequency = <200000000>;
drv-type = <2>;
-@@ -406,6 +420,8 @@
+@@ -421,6 +435,8 @@
non-removable;
no-mmc;
no-sd;
@@ -67,7 +54,7 @@
};
&mt6358_vdram2_reg {
-@@ -716,7 +732,7 @@
+@@ -754,7 +770,7 @@
mediatek,pull-down-adv = <10>;
};
@@ -77,5 +64,5 @@
output-high;
};
--
-2.21.0.1020.gf2820cf01a-goog
+2.22.0.rc1.257.g3120a18244-goog
diff --git a/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0008-FROMGIT-ASoC-Mediatek-MT8183-enable-IIR-filter.patch b/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0008-FROMGIT-ASoC-Mediatek-MT8183-enable-IIR-filter.patch
new file mode 100644
index 0000000..0a25b94
--- /dev/null
+++ b/overlay-flapjack/sys-kernel/chromeos-kernel-4_19/files/0008-FROMGIT-ASoC-Mediatek-MT8183-enable-IIR-filter.patch
@@ -0,0 +1,63 @@
+From 3168b6192bdaf0eb4e2d13fee8be5719d379ba5b Mon Sep 17 00:00:00 2001
+From: Shunli Wang <shunli.wang@mediatek.com>
+Date: Mon, 20 May 2019 16:24:20 +0800
+Subject: [PATCH 8/8] FROMGIT: ASoC: Mediatek: MT8183: enable IIR filter
+
+IIR fileter can remove DC offset. It must be enabled when
+dmic or amic connected to pmic is used.
+
+Signed-off-by: Shunli Wang <shunli.wang@mediatek.com>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+(cherry picked from commit 326b18176353d26df54dbc8b4b75ed4332898f61
+ git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next)
+
+BUG=b:123616335
+TEST=build and boot to shell
+
+Change-Id: Ib3f3fa3f52c1afa6b6c8649acbae462e54b86a35
+Signed-off-by: Tzung-Bi Shih <tzungbi@chromium.org>
+Reviewed-on: https://chromium-review.googlesource.com/1565759
+Commit-Ready: Nicolas Boichat <drinkcat@chromium.org>
+Tested-by: Nicolas Boichat <drinkcat@chromium.org>
+Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
+Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
+Reviewed-by: Sean Paul <seanpaul@chromium.org>
+---
+ sound/soc/mediatek/mt8183/mt8183-dai-adda.c | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/sound/soc/mediatek/mt8183/mt8183-dai-adda.c b/sound/soc/mediatek/mt8183/mt8183-dai-adda.c
+index 017d7d1d9148a..2b758a18c2ea5 100644
+--- a/sound/soc/mediatek/mt8183/mt8183-dai-adda.c
++++ b/sound/soc/mediatek/mt8183/mt8183-dai-adda.c
+@@ -176,9 +176,6 @@ static int mtk_adda_ul_event(struct snd_soc_dapm_widget *w,
+ case SND_SOC_DAPM_POST_PMD:
+ /* should delayed 1/fs(smallest is 8k) = 125us before afe off */
+ usleep_range(125, 135);
+-
+- /* reset dmic */
+- afe_priv->mtkaif_dmic = 0;
+ break;
+ default:
+ break;
+@@ -426,6 +423,17 @@ static int mtk_dai_adda_hw_params(struct snd_pcm_substream *substream,
+
+ ul_src_con0 |= (voice_mode << 17) & (0x7 << 17);
+
++ /* enable iir */
++ ul_src_con0 |= (1 << UL_IIR_ON_TMP_CTL_SFT) &
++ UL_IIR_ON_TMP_CTL_MASK_SFT;
++
++ /* 35Hz @ 48k */
++ regmap_write(afe->regmap, AFE_ADDA_IIR_COEF_02_01, 0x00000000);
++ regmap_write(afe->regmap, AFE_ADDA_IIR_COEF_04_03, 0x00003FB8);
++ regmap_write(afe->regmap, AFE_ADDA_IIR_COEF_06_05, 0x3FB80000);
++ regmap_write(afe->regmap, AFE_ADDA_IIR_COEF_08_07, 0x3FB80000);
++ regmap_write(afe->regmap, AFE_ADDA_IIR_COEF_10_09, 0x0000C048);
++
+ regmap_write(afe->regmap, AFE_ADDA_UL_SRC_CON0, ul_src_con0);
+
+ /* mtkaif_rxif_data_mode = 0, amic */
+--
+2.22.0.rc1.257.g3120a18244-goog
+
