From ba46b645d12a7c3fef332b281ef0fdea47a75463 Mon Sep 17 00:00:00 2001 From: Tengda Wu Date: Wed, 18 Jun 2025 11:02:37 +0800 Subject: [PATCH] bpf: Fix patch conflicts for bpf syscall Address the patch conflict with recent CVE remediation updates. Signed-off-by: Tengda Wu --- linux-5.10/rk3568_patch/kernel.patch | 6207 +++++++++++++------------- 1 file changed, 3019 insertions(+), 3188 deletions(-) diff --git a/linux-5.10/rk3568_patch/kernel.patch b/linux-5.10/rk3568_patch/kernel.patch index d6c5192..8cdb9df 100755 --- a/linux-5.10/rk3568_patch/kernel.patch +++ b/linux-5.10/rk3568_patch/kernel.patch @@ -879,7 +879,7 @@ index 26661c7b736b..a2386c005926 100644 +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nvr-demo-v12-linux.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nvr-demo-v12-linux-spi-nand.dtb diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-d6-anx6345.dts b/arch/arm64/boot/dts/rockchip/px30-ad-d6-anx6345.dts -new file mode 100755 +new file mode 100644 index 000000000000..2f258286286a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-d6-anx6345.dts @@ -1644,7 +1644,7 @@ index 000000000000..2f258286286a + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-dual-lvds.dts b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-dual-lvds.dts -new file mode 100755 +new file mode 100644 index 000000000000..09fc265a8d7a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-dual-lvds.dts @@ -1797,7 +1797,7 @@ index 000000000000..09fc265a8d7a + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi-lvds.dts b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi-lvds.dts -new file mode 100755 +new file mode 100644 index 000000000000..d4f202189250 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi-lvds.dts @@ -2044,7 +2044,7 @@ index 000000000000..d4f202189250 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi.dts b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi.dts -new file mode 100755 +new file mode 100644 index 000000000000..0ea056682e57 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi.dts @@ -2155,7 +2155,7 @@ index 000000000000..0ea056682e57 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-lvds.dts b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-lvds.dts -new file mode 100755 +new file mode 100644 index 000000000000..8b54a9a18fcc --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-lvds.dts @@ -2307,7 +2307,7 @@ index 000000000000..8b54a9a18fcc + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb.dtsi b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..bbcd18959dc4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb.dtsi @@ -3136,7 +3136,7 @@ index 000000000000..bbcd18959dc4 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-android.dtsi b/arch/arm64/boot/dts/rockchip/px30-android.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..aecb6344f01f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-android.dtsi @@ -3273,7 +3273,7 @@ index 000000000000..aecb6344f01f + support-multi-area; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ddr4p416dd6-timing.dtsi b/arch/arm64/boot/dts/rockchip/px30-ddr4p416dd6-timing.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..fde5895db94a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ddr4p416dd6-timing.dtsi @@ -3495,7 +3495,7 @@ index 000000000000..fde5895db94a + cs1_dqs3n_tx_de-skew = <10>; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/px30-dram-default-timing.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..c75c5ef4ef2a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-dram-default-timing.dtsi @@ -3795,7 +3795,7 @@ index 000000000000..c75c5ef4ef2a + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..eb60e71b77f3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts @@ -4490,7 +4490,7 @@ index 000000000000..eb60e71b77f3 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-avb.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-avb.dts -new file mode 100755 +new file mode 100644 index 000000000000..fca982485b16 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-avb.dts @@ -4605,7 +4605,7 @@ index 000000000000..fca982485b16 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..ff24bdd46aea --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts @@ -5550,7 +5550,7 @@ index 000000000000..ff24bdd46aea +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ + diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..317b53b2a1eb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts @@ -6183,7 +6183,7 @@ index 000000000000..317b53b2a1eb +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..81f44c36686c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts @@ -6816,7 +6816,7 @@ index 000000000000..81f44c36686c +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..b814812edbe9 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts @@ -6949,7 +6949,7 @@ index 000000000000..b814812edbe9 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..3d8e81009bef --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi @@ -7770,7 +7770,7 @@ index 000000000000..3d8e81009bef + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-avb.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-avb.dts -new file mode 100755 +new file mode 100644 index 000000000000..f2659a7f524e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-avb.dts @@ -8052,7 +8052,7 @@ index 000000000000..f2659a7f524e + +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..54a4c19d11b3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-linux.dts @@ -8354,7 +8354,7 @@ index 000000000000..54a4c19d11b3 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11.dts -new file mode 100755 +new file mode 100644 index 000000000000..2e59a09d3c5c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11.dts @@ -8653,7 +8653,7 @@ index 000000000000..2e59a09d3c5c + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..7bfe640d32de --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts @@ -9512,7 +9512,7 @@ index 000000000000..7bfe640d32de +}; + diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618-avb.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618-avb.dts -new file mode 100755 +new file mode 100644 index 000000000000..ea44da5066af --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618-avb.dts @@ -9529,7 +9529,7 @@ index 000000000000..ea44da5066af + compatible = "rockchip,px30-evb-ext-rk618-avb", "rockchip,px30"; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dts -new file mode 100755 +new file mode 100644 index 000000000000..69f44b4d115c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dts @@ -9568,7 +9568,7 @@ index 000000000000..69f44b4d115c + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dtsi b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..0eac63181407 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dtsi @@ -9776,7 +9776,7 @@ index 000000000000..0eac63181407 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-robot-no-gpu.dtsi b/arch/arm64/boot/dts/rockchip/px30-robot-no-gpu.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..e3f4274b2309 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-robot-no-gpu.dtsi @@ -9839,7 +9839,7 @@ index 000000000000..e3f4274b2309 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-robot.dtsi b/arch/arm64/boot/dts/rockchip/px30-robot.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..f48a753e6453 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-robot.dtsi @@ -9938,7 +9938,7 @@ index 000000000000..f48a753e6453 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-z7-a0-rk618-dsi.dts b/arch/arm64/boot/dts/rockchip/px30-z7-a0-rk618-dsi.dts -new file mode 100755 +new file mode 100644 index 000000000000..1657151c988f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-z7-a0-rk618-dsi.dts @@ -10973,7 +10973,7 @@ index 0d6761074b11..237c0d9af325 100644 #pwm-cells = <3>; status = "disabled"; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk1808-dram-default-timing.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..0fa79e2f05c0 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-dram-default-timing.dtsi @@ -11281,7 +11281,7 @@ index 000000000000..0fa79e2f05c0 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..a09824816188 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts @@ -11592,7 +11592,7 @@ index 000000000000..a09824816188 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb-x4-second.dts b/arch/arm64/boot/dts/rockchip/rk1808-evb-x4-second.dts -new file mode 100755 +new file mode 100644 index 000000000000..413d4f6fa29d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb-x4-second.dts @@ -11870,7 +11870,7 @@ index 000000000000..413d4f6fa29d + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb-x4.dts b/arch/arm64/boot/dts/rockchip/rk1808-evb-x4.dts -new file mode 100755 +new file mode 100644 index 000000000000..17993d1ff44a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb-x4.dts @@ -12147,7 +12147,7 @@ index 000000000000..17993d1ff44a + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..3b9c88660701 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi @@ -12870,7 +12870,7 @@ index 000000000000..3b9c88660701 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-fpga.dts b/arch/arm64/boot/dts/rockchip/rk1808-fpga.dts -new file mode 100755 +new file mode 100644 index 000000000000..d021918cacd1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-fpga.dts @@ -12934,7 +12934,7 @@ index 000000000000..d021918cacd1 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808.dtsi b/arch/arm64/boot/dts/rockchip/rk1808.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..3469abac4f34 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808.dtsi @@ -15980,7 +15980,7 @@ index 000000000000..3469abac4f34 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808k.dtsi b/arch/arm64/boot/dts/rockchip/rk1808k.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..78bd92e4c2c6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808k.dtsi @@ -16037,7 +16037,7 @@ index 000000000000..78bd92e4c2c6 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..c77d2e963266 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts @@ -16724,7 +16724,7 @@ index 000000000000..c77d2e963266 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..557daa856132 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v10.dts @@ -16785,7 +16785,7 @@ index 000000000000..557daa856132 + #sound-dai-cells = <0>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts -new file mode 100755 +new file mode 100644 index 000000000000..90a29a903545 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts @@ -16847,7 +16847,7 @@ index 000000000000..90a29a903545 + #sound-dai-cells = <0>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..88c1e9c6c8ac --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v10.dts @@ -16954,7 +16954,7 @@ index 000000000000..88c1e9c6c8ac + #sound-dai-cells = <0>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v11.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v11.dts -new file mode 100755 +new file mode 100644 index 000000000000..364f74a40d9d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v11.dts @@ -17037,7 +17037,7 @@ index 000000000000..364f74a40d9d + #sound-dai-cells = <0>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..e2891ce1092c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v10.dts @@ -17131,7 +17131,7 @@ index 000000000000..e2891ce1092c + #sound-dai-cells = <0>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v11.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v11.dts -new file mode 100755 +new file mode 100644 index 000000000000..c4a7178f1dc8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v11.dts @@ -17229,7 +17229,7 @@ index 000000000000..c4a7178f1dc8 + #sound-dai-cells = <0>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-ext-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-ext-v10.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..1c0e66384c16 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-ext-v10.dtsi @@ -17470,7 +17470,7 @@ index 000000000000..1c0e66384c16 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..3d052d0da477 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi @@ -18256,7 +18256,7 @@ index 000000000000..3d052d0da477 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..7b692a810333 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi @@ -19097,7 +19097,7 @@ index 000000000000..7b692a810333 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-fpga.dts b/arch/arm64/boot/dts/rockchip/rk3308-fpga.dts -new file mode 100755 +new file mode 100644 index 000000000000..225aca323f4d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-fpga.dts @@ -19169,7 +19169,7 @@ index 213c0759c4b8..b89eaf1075ab 100644 }; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-voice-module-board-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-voice-module-board-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..2586d9905072 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-voice-module-board-v10.dts @@ -19336,7 +19336,7 @@ index 2560b98771ca..cc86c0880cec 100644 #pwm-cells = <3>; status = "disabled"; diff --git a/arch/arm64/boot/dts/rockchip/rk3308b-evb-amic-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308b-evb-amic-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..d5e2d9ebd4aa --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308b-evb-amic-v10.dts @@ -19404,7 +19404,7 @@ index 000000000000..d5e2d9ebd4aa + #sound-dai-cells = <0>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308b-evb-ext-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308b-evb-ext-v10.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..e2414b67f0d1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308b-evb-ext-v10.dtsi @@ -19534,7 +19534,7 @@ index 000000000000..e2414b67f0d1 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..902ae3544235 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi @@ -20324,7 +20324,7 @@ index 000000000000..902ae3544235 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308k.dtsi b/arch/arm64/boot/dts/rockchip/rk3308k.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..ffd53fd158c5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308k.dtsi @@ -20376,7 +20376,7 @@ index 000000000000..ffd53fd158c5 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-cif-sensor.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-863-cif-sensor.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..c01f4d014a1b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-cif-sensor.dtsi @@ -20436,7 +20436,7 @@ index 000000000000..c01f4d014a1b +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-avb.dts b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-avb.dts -new file mode 100755 +new file mode 100644 index 000000000000..174d05e37ccb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-avb.dts @@ -20554,7 +20554,7 @@ index 000000000000..174d05e37ccb + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-rkisp1.dts b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-rkisp1.dts -new file mode 100755 +new file mode 100644 index 000000000000..d80dad694c1d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-rkisp1.dts @@ -20663,7 +20663,7 @@ index 000000000000..d80dad694c1d + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..7a399b3356ac --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dts @@ -20711,7 +20711,7 @@ index 000000000000..7a399b3356ac + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..6e6e3be2f104 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi @@ -21550,7 +21550,7 @@ index 000000000000..6e6e3be2f104 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-86v-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-86v-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..86d048c0d731 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-86v-v10.dts @@ -22396,7 +22396,7 @@ index 000000000000..86d048c0d731 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..02308ebae99e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts @@ -23710,7 +23710,7 @@ index 000000000000..02308ebae99e + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts -new file mode 100755 +new file mode 100644 index 000000000000..0af03d1ec2a8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts @@ -25046,7 +25046,7 @@ index 000000000000..0af03d1ec2a8 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts -new file mode 100755 +new file mode 100644 index 000000000000..fa8b7cff619f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts @@ -26369,7 +26369,7 @@ index 000000000000..fa8b7cff619f + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts -new file mode 100755 +new file mode 100644 index 000000000000..9669993499e0 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts @@ -27692,7 +27692,7 @@ index 000000000000..9669993499e0 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts -new file mode 100755 +new file mode 100644 index 000000000000..4c12a79f814b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts @@ -27789,7 +27789,7 @@ index 000000000000..4c12a79f814b + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..67c131c9618a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts @@ -28819,7 +28819,7 @@ index 000000000000..67c131c9618a +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..6966806150f5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts @@ -29573,7 +29573,7 @@ index 000000000000..6966806150f5 +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..b3b9efec92e4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts @@ -30307,7 +30307,7 @@ index 000000000000..b3b9efec92e4 +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..58bbfdafb489 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts @@ -30350,7 +30350,7 @@ index 000000000000..58bbfdafb489 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..940c05df8304 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi @@ -31243,7 +31243,7 @@ index 000000000000..940c05df8304 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11-avb.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11-avb.dts -new file mode 100755 +new file mode 100644 index 000000000000..2f0c3fc3a38d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11-avb.dts @@ -31600,7 +31600,7 @@ index 000000000000..2f0c3fc3a38d + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11.dts -new file mode 100755 +new file mode 100644 index 000000000000..139efd9d1332 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11.dts @@ -31903,7 +31903,7 @@ index 000000000000..139efd9d1332 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..a386cd291cf3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi @@ -32029,7 +32029,7 @@ index 000000000000..a386cd291cf3 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-android.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..809b6501b78f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-android.dtsi @@ -32123,7 +32123,7 @@ index 000000000000..809b6501b78f + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-box-liantong-avb.dts b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong-avb.dts -new file mode 100755 +new file mode 100644 index 000000000000..ee04d8988fbb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong-avb.dts @@ -32142,7 +32142,7 @@ index 000000000000..ee04d8988fbb + compatible = "rockchip,rk3328-box-liantong-avb", "rockchip,rk3328"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dts b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dts -new file mode 100755 +new file mode 100644 index 000000000000..dcff87208d39 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dts @@ -32182,7 +32182,7 @@ index 000000000000..dcff87208d39 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..ad7ef6be49fa --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi @@ -32861,7 +32861,7 @@ index 000000000000..ad7ef6be49fa + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-box-plus-dram-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-box-plus-dram-timing.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..0ea270539a23 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-box-plus-dram-timing.dtsi @@ -33088,7 +33088,7 @@ index 000000000000..0ea270539a23 + cs1_dqs3n_tx_de-skew = <9>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-dram-2layer-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-dram-2layer-timing.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..940024920b5d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-dram-2layer-timing.dtsi @@ -33351,7 +33351,7 @@ index 000000000000..940024920b5d + cs1_dqs3n_tx_de-skew = <8>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-dram-default-timing.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..a3f5ff4bdc47 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-dram-default-timing.dtsi @@ -33668,7 +33668,7 @@ index 000000000000..a3f5ff4bdc47 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb-android-avb.dts b/arch/arm64/boot/dts/rockchip/rk3328-evb-android-avb.dts -new file mode 100755 +new file mode 100644 index 000000000000..0d72e05e2d59 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb-android-avb.dts @@ -33687,7 +33687,7 @@ index 000000000000..0d72e05e2d59 + compatible = "rockchip,rk3328-evb-avb", "rockchip,rk3328"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dts b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dts -new file mode 100755 +new file mode 100644 index 000000000000..6d50444a5a1d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dts @@ -33727,7 +33727,7 @@ index 000000000000..6d50444a5a1d + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..e050047420a6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi @@ -34525,7 +34525,7 @@ index 22ab5e1d7319..a0c4d321cc0b 100644 regulator-type = "voltage"; regulator-min-microvolt = <1800000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64-android-avb.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android-avb.dts -new file mode 100755 +new file mode 100644 index 000000000000..adc1dd7cd4da --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android-avb.dts @@ -34563,7 +34563,7 @@ index 000000000000..adc1dd7cd4da + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dts -new file mode 100755 +new file mode 100644 index 000000000000..66e83916c728 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dts @@ -34603,7 +34603,7 @@ index 000000000000..66e83916c728 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..3dad4f4fafcb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi @@ -35364,7 +35364,7 @@ index 72112fe05a5c..a3fcf36f8ecc 100644 compatible = "arm,gic-400"; #interrupt-cells = <3>; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-808-evb.dts b/arch/arm64/boot/dts/rockchip/rk3368-808-evb.dts -new file mode 100755 +new file mode 100644 index 000000000000..7e803a8ed30c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-808-evb.dts @@ -35559,7 +35559,7 @@ index 000000000000..7e803a8ed30c + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-808.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-808.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..fdea0c73932e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-808.dtsi @@ -36547,7 +36547,7 @@ index 000000000000..fdea0c73932e +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..a3e0bbaaf7c5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi @@ -36910,7 +36910,7 @@ index 000000000000..a3e0bbaaf7c5 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-cif-sensor.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-cif-sensor.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..7d2aac22c020 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-cif-sensor.dtsi @@ -36951,7 +36951,7 @@ index 000000000000..7d2aac22c020 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-dram-default-timing.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..10bfbebda989 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-dram-default-timing.dtsi @@ -37023,7 +37023,7 @@ index 000000000000..10bfbebda989 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-p9-avb.dts b/arch/arm64/boot/dts/rockchip/rk3368-p9-avb.dts -new file mode 100755 +new file mode 100644 index 000000000000..6a971781032a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-p9-avb.dts @@ -37064,7 +37064,7 @@ index 000000000000..6a971781032a + bootargs = "earlycon=uart8250,mmio32,0xff690000 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 androidboot.selinux=permissive init=/init kpti=0"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-p9.dts b/arch/arm64/boot/dts/rockchip/rk3368-p9.dts -new file mode 100755 +new file mode 100644 index 000000000000..29658be08696 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-p9.dts @@ -37104,7 +37104,7 @@ index 000000000000..29658be08696 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..7eeb9db4f13b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi @@ -37951,7 +37951,7 @@ index 000000000000..7eeb9db4f13b +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts -new file mode 100755 +new file mode 100644 index 000000000000..1d50d3fa549f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts @@ -38950,7 +38950,7 @@ index 000000000000..1d50d3fa549f + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts -new file mode 100755 +new file mode 100644 index 000000000000..4a755f1207c1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts @@ -39632,7 +39632,7 @@ index 000000000000..4a755f1207c1 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-sheep-lvds.dts b/arch/arm64/boot/dts/rockchip/rk3368-sheep-lvds.dts -new file mode 100755 +new file mode 100644 index 000000000000..b7b11f895cab --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-sheep-lvds.dts @@ -40300,7 +40300,7 @@ index 000000000000..b7b11f895cab + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts b/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts -new file mode 100755 +new file mode 100644 index 000000000000..b9b6b24ff37b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts @@ -41052,7 +41052,7 @@ index 000000000000..b9b6b24ff37b + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-sziauto-rk618.dts b/arch/arm64/boot/dts/rockchip/rk3368-sziauto-rk618.dts -new file mode 100755 +new file mode 100644 index 000000000000..eff7c2fed990 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-sziauto-rk618.dts @@ -41866,7 +41866,7 @@ index 000000000000..eff7c2fed990 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3368-tablet.dts -new file mode 100755 +new file mode 100644 index 000000000000..d7dc6d67e242 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-tablet.dts @@ -42942,7 +42942,7 @@ index 000000000000..d7dc6d67e242 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3368-xikp-avb.dts b/arch/arm64/boot/dts/rockchip/rk3368-xikp-avb.dts -new file mode 100755 +new file mode 100644 index 000000000000..b455e32c3e29 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-xikp-avb.dts @@ -43087,7 +43087,7 @@ index 000000000000..b455e32c3e29 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-xikp.dts b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dts -new file mode 100755 +new file mode 100644 index 000000000000..bc320ffdc3b7 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dts @@ -43127,7 +43127,7 @@ index 000000000000..bc320ffdc3b7 +}; \ No newline at end of file diff --git a/arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..aa73096aff9d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi @@ -44092,7 +44092,7 @@ index 3746f23dc3df..e962c7962789 100644 }; diff --git a/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts -new file mode 100755 +new file mode 100644 index 000000000000..0a489bf8fc84 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts @@ -45172,7 +45172,7 @@ index 000000000000..0a489bf8fc84 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts -new file mode 100755 +new file mode 100644 index 000000000000..31f25e44504d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts @@ -46511,7 +46511,7 @@ index 000000000000..31f25e44504d +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..ffaa92b7a89e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi @@ -46856,7 +46856,7 @@ index 000000000000..ffaa92b7a89e +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-rev1.dts b/arch/arm64/boot/dts/rockchip/rk3399-box-rev1.dts -new file mode 100755 +new file mode 100644 index 000000000000..c4572da2ec87 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-box-rev1.dts @@ -46996,7 +46996,7 @@ index 000000000000..c4572da2ec87 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts b/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts -new file mode 100755 +new file mode 100644 index 000000000000..1c9b884736b1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts @@ -47160,7 +47160,7 @@ index 000000000000..1c9b884736b1 + <000000000 0x0000 0x0000 0x0000>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..704e0df4e122 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi @@ -48057,7 +48057,7 @@ index 000000000000..704e0df4e122 + assigned-clock-parents = <&cru PLL_CPLL>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-dram-default-timing.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..981777b82329 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-dram-default-timing.dtsi @@ -48143,7 +48143,7 @@ index 000000000000..981777b82329 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-early-opp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-early-opp.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..2a675ec7c342 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-early-opp.dtsi @@ -48276,7 +48276,7 @@ index 000000000000..2a675ec7c342 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..4cac4981b267 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi @@ -48463,7 +48463,7 @@ index 000000000000..4cac4981b267 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts -new file mode 100755 +new file mode 100644 index 000000000000..343a9fc389e1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts @@ -48858,7 +48858,7 @@ index 000000000000..343a9fc389e1 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android.dts -new file mode 100755 +new file mode 100644 index 000000000000..72aa97affa99 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android.dts @@ -49021,7 +49021,7 @@ index 000000000000..72aa97affa99 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..5b6b7131fdd1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts @@ -49348,7 +49348,7 @@ index 000000000000..5b6b7131fdd1 +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-v13-android-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-v13-android-avb.dts -new file mode 100755 +new file mode 100644 index 000000000000..8439d91dd125 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-v13-android-avb.dts @@ -49779,7 +49779,7 @@ index 000000000000..8439d91dd125 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..dc821a2d45c4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi @@ -51215,7 +51215,7 @@ index 000000000000..dc821a2d45c4 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts -new file mode 100755 +new file mode 100644 index 000000000000..bb7ddac77f23 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts @@ -51366,7 +51366,7 @@ index 000000000000..bb7ddac77f23 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts -new file mode 100755 +new file mode 100644 index 000000000000..bf27556295ec --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts @@ -51423,7 +51423,7 @@ index 000000000000..bf27556295ec + compatible = "google,rk3399evb-rev1", "rockchip,rk3399-evb-rev1", "rockchip,rk3399"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..f35d6ee56072 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1.dtsi @@ -51781,7 +51781,7 @@ index 000000000000..f35d6ee56072 + rockchip,utmi-avalid; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts -new file mode 100755 +new file mode 100644 index 000000000000..b15fb8a9d088 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts @@ -51943,7 +51943,7 @@ index 000000000000..b15fb8a9d088 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts -new file mode 100755 +new file mode 100644 index 000000000000..2daf9f1235f3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts @@ -52000,7 +52000,7 @@ index 000000000000..2daf9f1235f3 + compatible = "google,rk3399evb-rev2", "rockchip,rk3399-evb-rev2", "rockchip,rk3399"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..4b23c1fcadd8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi @@ -52372,7 +52372,7 @@ index 000000000000..4b23c1fcadd8 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp.dts -new file mode 100755 +new file mode 100644 index 000000000000..7f730f5633dd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp.dts @@ -52504,7 +52504,7 @@ index 000000000000..7f730f5633dd + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-lp4.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-lp4.dts -new file mode 100755 +new file mode 100644 index 000000000000..85f4356a0030 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-lp4.dts @@ -52743,7 +52743,7 @@ index 000000000000..85f4356a0030 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-mipi-edp.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-mipi-edp.dts -new file mode 100755 +new file mode 100644 index 000000000000..fffd92f00ff4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-mipi-edp.dts @@ -53049,7 +53049,7 @@ index 000000000000..fffd92f00ff4 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts -new file mode 100755 +new file mode 100644 index 000000000000..9ba1b0381fed --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts @@ -53231,7 +53231,7 @@ index 000000000000..9ba1b0381fed + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-cros.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-cros.dts -new file mode 100755 +new file mode 100644 index 000000000000..e1bb5f129680 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-cros.dts @@ -53288,7 +53288,7 @@ index 000000000000..e1bb5f129680 + compatible = "google,rk3399evb-rev3", "rockchip,rk3399-evb-rev3", "rockchip,rk3399"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..e34379ded3a5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3.dtsi @@ -53647,7 +53647,7 @@ index 000000000000..e34379ded3a5 + pinctrl-0 = <&pwm2_pin_pull_down>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..aa8ea436ae9b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi @@ -54299,7 +54299,7 @@ index 000000000000..aa8ea436ae9b +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..adbda6ba4e0d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi @@ -54629,7 +54629,7 @@ index 000000000000..adbda6ba4e0d + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts -new file mode 100755 +new file mode 100644 index 000000000000..c372ade536f2 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts @@ -55737,7 +55737,7 @@ index 000000000000..c372ade536f2 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..5a023389a033 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts @@ -56817,7 +56817,7 @@ index 000000000000..5a023389a033 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-fpga.dts b/arch/arm64/boot/dts/rockchip/rk3399-fpga.dts -new file mode 100755 +new file mode 100644 index 000000000000..1192dfa42940 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-fpga.dts @@ -56887,7 +56887,7 @@ index 000000000000..1192dfa42940 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts -new file mode 100755 +new file mode 100644 index 000000000000..e8d771e2b90e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts @@ -57058,7 +57058,7 @@ index 000000000000..e8d771e2b90e +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts -new file mode 100755 +new file mode 100644 index 000000000000..7a1c36e981d5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts @@ -57182,7 +57182,7 @@ index 000000000000..7a1c36e981d5 + rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts -new file mode 100755 +new file mode 100644 index 000000000000..44b04e1606fc --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts @@ -57301,7 +57301,7 @@ index fb0a13cad6c9..1ce91e36aa49 100644 regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3000000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..0549701d615e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi @@ -57613,7 +57613,7 @@ index 000000000000..0549701d615e + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts -new file mode 100755 +new file mode 100644 index 000000000000..8610539ef284 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts @@ -59159,7 +59159,7 @@ index 35b7ab3bf10c..20309076dbac 100644 regulator-state-mem { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts -new file mode 100755 +new file mode 100644 index 000000000000..86e45dc0074d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts @@ -60324,7 +60324,7 @@ index c88295782e7b..1a23e8f3cdf6 100644 dr_mode = "otg"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts -new file mode 100755 +new file mode 100644 index 000000000000..3106512b87cd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts @@ -60511,7 +60511,7 @@ index 000000000000..3106512b87cd + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts -new file mode 100755 +new file mode 100644 index 000000000000..3e9ef7b0773b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts @@ -60645,7 +60645,7 @@ index 000000000000..3e9ef7b0773b +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts -new file mode 100755 +new file mode 100644 index 000000000000..c2f8673198d5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts @@ -60733,7 +60733,7 @@ index 000000000000..c2f8673198d5 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..8156e5f7c795 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi @@ -61227,7 +61227,7 @@ index 000000000000..8156e5f7c795 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts -new file mode 100755 +new file mode 100644 index 000000000000..e1e482938481 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts @@ -61720,7 +61720,7 @@ index 000000000000..e1e482938481 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..9f370a7bff1c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts @@ -62178,7 +62178,7 @@ index 000000000000..9f370a7bff1c + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-lp4-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-lp4-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..da471a636103 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-lp4-linux.dts @@ -62694,7 +62694,7 @@ index 701a567d7638..3d9e27750139 100644 &saradc { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sched-energy.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sched-energy.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..373a776b9207 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sched-energy.dtsi @@ -62821,7 +62821,7 @@ index 000000000000..373a776b9207 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts -new file mode 100755 +new file mode 100644 index 000000000000..eeca9cf54373 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts @@ -62997,7 +62997,7 @@ index 000000000000..eeca9cf54373 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dts -new file mode 100755 +new file mode 100644 index 000000000000..28f81ee8f7f5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dts @@ -63045,7 +63045,7 @@ index 000000000000..28f81ee8f7f5 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..fb700431e356 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi @@ -64090,7 +64090,7 @@ index 000000000000..fb700431e356 + assigned-clock-parents = <&cru PLL_VPLL>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts -new file mode 100755 +new file mode 100644 index 000000000000..ac9d28db5b76 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts @@ -65275,7 +65275,7 @@ index 000000000000..ac9d28db5b76 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..10ba2048483d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts @@ -65574,7 +65574,7 @@ index 000000000000..10ba2048483d + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-vop-clk-set.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-vop-clk-set.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..5ed8dac6cf7d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-vop-clk-set.dtsi @@ -65761,7 +65761,7 @@ index 000000000000..5ed8dac6cf7d +#endif + diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -index c5f3d4f8f4d2..7f4a812f4337 100644 +index 3180f576ed02..b6217e336221 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -9,8 +9,13 @@ @@ -65957,8 +65957,8 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 + pd_vdu@RK3399_PD_VDU { reg = ; clocks = <&cru ACLK_VDU>, - <&cru HCLK_VDU>; -@@ -1028,94 +1029,94 @@ power-domain@RK3399_PD_VDU { + <&cru HCLK_VDU>, +@@ -1030,94 +1031,94 @@ power-domain@RK3399_PD_VDU { }; /* These power domains are grouped by VD_GPU */ @@ -66069,7 +66069,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 reg = ; clocks = <&cru ACLK_VOP1>, <&cru HCLK_VOP1>; -@@ -1134,6 +1135,33 @@ pmu_io_domains: io-domains { +@@ -1136,6 +1137,33 @@ pmu_io_domains: io-domains { compatible = "rockchip,rk3399-pmu-io-voltage-domain"; status = "disabled"; }; @@ -66103,7 +66103,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 }; spi3: spi@ff350000 { -@@ -1211,7 +1239,7 @@ pwm0: pwm@ff420000 { +@@ -1213,7 +1241,7 @@ pwm0: pwm@ff420000 { compatible = "rockchip,rk3399-pwm", "rockchip,rk3288-pwm"; reg = <0x0 0xff420000 0x0 0x10>; #pwm-cells = <3>; @@ -66112,7 +66112,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 pinctrl-0 = <&pwm0_pin>; clocks = <&pmucru PCLK_RKPWM_PMU>; clock-names = "pwm"; -@@ -1222,7 +1250,7 @@ pwm1: pwm@ff420010 { +@@ -1224,7 +1252,7 @@ pwm1: pwm@ff420010 { compatible = "rockchip,rk3399-pwm", "rockchip,rk3288-pwm"; reg = <0x0 0xff420010 0x0 0x10>; #pwm-cells = <3>; @@ -66121,7 +66121,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 pinctrl-0 = <&pwm1_pin>; clocks = <&pmucru PCLK_RKPWM_PMU>; clock-names = "pwm"; -@@ -1233,7 +1261,7 @@ pwm2: pwm@ff420020 { +@@ -1235,7 +1263,7 @@ pwm2: pwm@ff420020 { compatible = "rockchip,rk3399-pwm", "rockchip,rk3288-pwm"; reg = <0x0 0xff420020 0x0 0x10>; #pwm-cells = <3>; @@ -66130,7 +66130,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 pinctrl-0 = <&pwm2_pin>; clocks = <&pmucru PCLK_RKPWM_PMU>; clock-names = "pwm"; -@@ -1244,13 +1272,32 @@ pwm3: pwm@ff420030 { +@@ -1246,13 +1274,32 @@ pwm3: pwm@ff420030 { compatible = "rockchip,rk3399-pwm", "rockchip,rk3288-pwm"; reg = <0x0 0xff420030 0x0 0x10>; #pwm-cells = <3>; @@ -66164,7 +66164,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 vpu: video-codec@ff650000 { compatible = "rockchip,rk3399-vpu"; reg = <0x0 0xff650000 0x0 0x800>; -@@ -1296,6 +1343,20 @@ vdec_mmu: iommu@ff660480 { +@@ -1298,6 +1345,20 @@ vdec_mmu: iommu@ff660480 { #iommu-cells = <0>; }; @@ -66185,7 +66185,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 iep_mmu: iommu@ff670800 { compatible = "rockchip,iommu"; reg = <0x0 0xff670800 0x0 0x40>; -@@ -1327,6 +1388,10 @@ efuse0: efuse@ff690000 { +@@ -1329,6 +1390,10 @@ efuse0: efuse@ff690000 { clock-names = "pclk_efuse"; /* Data cells */ @@ -66196,7 +66196,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 cpu_id: cpu-id@7 { reg = <0x07 0x10>; }; -@@ -1348,6 +1413,10 @@ logic_leakage: logic-leakage@1b { +@@ -1350,6 +1415,10 @@ logic_leakage: logic-leakage@1b { wafer_info: wafer-info@1c { reg = <0x1c 0x1>; }; @@ -66207,7 +66207,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 }; pmucru: pmu-clock-controller@ff750000 { -@@ -1485,6 +1554,42 @@ pcie_phy: pcie-phy { +@@ -1487,6 +1556,42 @@ pcie_phy: pcie-phy { reset-names = "phy"; status = "disabled"; }; @@ -66250,7 +66250,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 }; tcphy0: phy@ff7c0000 { -@@ -1611,6 +1716,16 @@ i2s2: i2s@ff8a0000 { +@@ -1613,6 +1718,16 @@ i2s2: i2s@ff8a0000 { status = "disabled"; }; @@ -66267,7 +66267,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 vopl: vop@ff8f0000 { compatible = "rockchip,rk3399-vop-lit"; reg = <0x0 0xff8f0000 0x0 0x3efc>; -@@ -1656,6 +1771,17 @@ vopl_out_dp: endpoint@4 { +@@ -1658,6 +1773,17 @@ vopl_out_dp: endpoint@4 { }; }; @@ -66285,7 +66285,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 vopl_mmu: iommu@ff8f3f00 { compatible = "rockchip,iommu"; reg = <0x0 0xff8f3f00 0x0 0x100>; -@@ -1713,6 +1839,17 @@ vopb_out_dp: endpoint@4 { +@@ -1715,6 +1841,17 @@ vopb_out_dp: endpoint@4 { }; }; @@ -66303,7 +66303,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 vopb_mmu: iommu@ff903f00 { compatible = "rockchip,iommu"; reg = <0x0 0xff903f00 0x0 0x100>; -@@ -1915,7 +2052,95 @@ gpu: gpu@ff9a0000 { +@@ -1917,7 +2054,95 @@ gpu: gpu@ff9a0000 { clocks = <&cru ACLK_GPU>; #cooling-cells = <2>; power-domains = <&power RK3399_PD_GPU>; @@ -66399,7 +66399,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 }; pinctrl: pinctrl { -@@ -2179,6 +2404,13 @@ i2c3_xfer: i2c3-xfer { +@@ -2181,6 +2406,13 @@ i2c3_xfer: i2c3-xfer { <4 RK_PC1 1 &pcfg_pull_none>, <4 RK_PC0 1 &pcfg_pull_none>; }; @@ -66413,7 +66413,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 }; i2c4 { -@@ -2342,7 +2574,7 @@ sdmmc_wp: sdmmc-wp { +@@ -2344,7 +2576,7 @@ sdmmc_wp: sdmmc-wp { }; }; @@ -66422,7 +66422,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 ap_pwroff: ap-pwroff { rockchip,pins = <1 RK_PA5 1 &pcfg_pull_none>; }; -@@ -2644,6 +2876,11 @@ pwm3a_pin: pwm3a-pin { +@@ -2646,6 +2878,11 @@ pwm3a_pin: pwm3a-pin { rockchip,pins = <0 RK_PA6 1 &pcfg_pull_none>; }; @@ -66434,7 +66434,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 }; pwm3b { -@@ -2651,6 +2888,11 @@ pwm3b_pin: pwm3b-pin { +@@ -2653,6 +2890,11 @@ pwm3b_pin: pwm3b-pin { rockchip,pins = <1 RK_PB6 1 &pcfg_pull_none>; }; @@ -66446,7 +66446,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 }; hdmi { -@@ -2679,4 +2921,27 @@ pcie_clkreqnb_cpm: pci-clkreqnb-cpm { +@@ -2681,4 +2923,27 @@ pcie_clkreqnb_cpm: pci-clkreqnb-cpm { }; }; @@ -66475,7 +66475,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 + }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399k-opp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399k-opp.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..59f200e0b9cb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399k-opp.dtsi @@ -66505,7 +66505,7 @@ index 000000000000..59f200e0b9cb + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..f975f47b76d6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts @@ -67804,7 +67804,7 @@ index 000000000000..f975f47b76d6 +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..08ac2a477852 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts @@ -69013,7 +69013,7 @@ index 000000000000..08ac2a477852 +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..398f962114cf --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts @@ -70080,7 +70080,7 @@ index 000000000000..398f962114cf + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..c3faaa1ba4d3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts @@ -71309,7 +71309,7 @@ index 000000000000..c3faaa1ba4d3 +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts -new file mode 100755 +new file mode 100644 index 000000000000..7d118a783353 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts @@ -72360,7 +72360,7 @@ index 000000000000..7d118a783353 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v14-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v14-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..4f8546eb80bf --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v14-linux.dts @@ -72613,7 +72613,7 @@ index 000000000000..4f8546eb80bf + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..96a3fb56cfe5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts @@ -72759,7 +72759,7 @@ index 000000000000..96a3fb56cfe5 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..3f176b3bc94f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi @@ -73591,7 +73591,7 @@ index 000000000000..3f176b3bc94f + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..1bd285bfc695 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dts @@ -73612,7 +73612,7 @@ index 000000000000..1bd285bfc695 + compatible = "rockchip,rk3566-box-demo-v10", "rockchip,rk3566"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..41ac0af11188 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dtsi @@ -74146,7 +74146,7 @@ index 000000000000..41ac0af11188 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..f0feae6730e3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi @@ -74588,7 +74588,7 @@ index 000000000000..f0feae6730e3 + + diff --git a/arch/arm64/boot/dts/rockchip/rk3566-eink.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-eink.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..09791eb16abf --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-eink.dtsi @@ -74694,7 +74694,7 @@ index 000000000000..09791eb16abf +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..3f215884a070 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dts @@ -74707,7 +74707,7 @@ index 000000000000..3f215884a070 +#include "rk3566-evb-mipitest-v10.dtsi" +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..227bc4e39d99 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi @@ -75220,7 +75220,7 @@ index 000000000000..227bc4e39d99 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..d1aa123cd347 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb.dtsi @@ -75233,7 +75233,7 @@ index 000000000000..d1aa123cd347 + +#include "rk3568-evb.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..a22cc8cec6af --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-linux.dts @@ -75252,7 +75252,7 @@ index 000000000000..a22cc8cec6af + compatible = "rockchip,rk3566-evb1-ddr4-v10-linux", "rockchip,rk3566"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-lvds.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-lvds.dts -new file mode 100755 +new file mode 100644 index 000000000000..98a384041b8b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-lvds.dts @@ -75357,7 +75357,7 @@ index 000000000000..98a384041b8b + connect = <&vp1_out_lvds>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..f602ed98d7ce --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dts @@ -75370,7 +75370,7 @@ index 000000000000..f602ed98d7ce +#include "rk3566-evb1-ddr4-v10.dtsi" +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..385933be9f45 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi @@ -75865,7 +75865,7 @@ index 000000000000..385933be9f45 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-eink.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-eink.dts -new file mode 100755 +new file mode 100644 index 000000000000..83546eef6529 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-eink.dts @@ -76216,7 +76216,7 @@ index 000000000000..83546eef6529 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-i2s-mic-array.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-i2s-mic-array.dts -new file mode 100755 +new file mode 100644 index 000000000000..5ba1318bcee1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-i2s-mic-array.dts @@ -76324,7 +76324,7 @@ index 000000000000..5ba1318bcee1 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..957a99b168bb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-linux.dts @@ -76338,7 +76338,7 @@ index 000000000000..957a99b168bb +#include "rk3566-evb2-lp4x-v10.dtsi" +#include "rk3568-linux.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-pdm-mic-array.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-pdm-mic-array.dts -new file mode 100755 +new file mode 100644 index 000000000000..55e9679194cb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-pdm-mic-array.dts @@ -76455,7 +76455,7 @@ index 000000000000..55e9679194cb +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..3b36bdba12b6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dts @@ -76469,7 +76469,7 @@ index 000000000000..3b36bdba12b6 +#include "rk3566-evb2-lp4x-v10.dtsi" +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..4a6bec70f33e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi @@ -77074,7 +77074,7 @@ index 000000000000..4a6bec70f33e + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..e292b0dd1846 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10-linux.dts @@ -77088,7 +77088,7 @@ index 000000000000..e292b0dd1846 +#include "rk3566-evb3-ddr3-v10.dtsi" +#include "rk3568-linux.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..09f5260fb375 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dts @@ -77102,7 +77102,7 @@ index 000000000000..09f5260fb375 +#include "rk3566-evb3-ddr3-v10.dtsi" +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..f936cc186cfb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi @@ -77607,7 +77607,7 @@ index 000000000000..f936cc186cfb + gpios = <&gpio0 RK_PD3 GPIO_ACTIVE_HIGH>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..600fc3c39586 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dts @@ -77620,7 +77620,7 @@ index 000000000000..600fc3c39586 +#include "rk3566-evb5-lp4x-v10.dtsi" +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..83586659530d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi @@ -77943,7 +77943,7 @@ index 000000000000..83586659530d + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts -new file mode 100755 +new file mode 100644 index 000000000000..3f559fca27f8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts @@ -79064,7 +79064,7 @@ index 000000000000..3f559fca27f8 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts -new file mode 100755 +new file mode 100644 index 000000000000..2e6d3160aa16 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts @@ -80038,7 +80038,7 @@ index 000000000000..2e6d3160aa16 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts -new file mode 100755 +new file mode 100644 index 000000000000..50412b44bb71 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts @@ -81001,7 +81001,7 @@ index 000000000000..50412b44bb71 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts -new file mode 100755 +new file mode 100644 index 000000000000..f6f4534aad50 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts @@ -82314,7 +82314,7 @@ index 000000000000..f6f4534aad50 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts -new file mode 100755 +new file mode 100644 index 000000000000..8102da0270fa --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts @@ -83500,7 +83500,7 @@ index 000000000000..8102da0270fa + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..1d4a0484473a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts @@ -84714,7 +84714,7 @@ index 000000000000..1d4a0484473a + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts -new file mode 100755 +new file mode 100644 index 000000000000..40022eb6c646 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts @@ -85933,7 +85933,7 @@ index 000000000000..40022eb6c646 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566.dtsi b/arch/arm64/boot/dts/rockchip/rk3566.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..01b6499b678d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566.dtsi @@ -85992,7 +85992,7 @@ index 000000000000..01b6499b678d +/delete-node/ &qos_sata0; +/delete-node/ &sata0; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-android.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..01cd37c04e1a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-android.dtsi @@ -86072,7 +86072,7 @@ index 000000000000..01cd37c04e1a + support-multi-area; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-dram-default-timing.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..43f978809c02 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-dram-default-timing.dtsi @@ -86159,7 +86159,7 @@ index 000000000000..43f978809c02 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..2ca4a18314d2 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi @@ -87972,7 +87972,7 @@ index 000000000000..2ca4a18314d2 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux-spi-nor.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux-spi-nor.dts -new file mode 100755 +new file mode 100644 index 000000000000..259b483af0f4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux-spi-nor.dts @@ -87996,7 +87996,7 @@ index 000000000000..259b483af0f4 + +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..55c255998473 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts @@ -88010,7 +88010,7 @@ index 000000000000..55c255998473 +#include "rk3568-evb1-ddr4-v10.dtsi" +#include "rk3568-linux.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..00c28f39269b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dts @@ -88024,7 +88024,7 @@ index 000000000000..00c28f39269b +#include "rk3568-evb1-ddr4-v10.dtsi" +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..64881d20183f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi @@ -88520,7 +88520,7 @@ index 000000000000..64881d20183f + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10-bt1120-to-hdmi.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10-bt1120-to-hdmi.dts -new file mode 100755 +new file mode 100644 index 000000000000..7a5a7feb52a7 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10-bt1120-to-hdmi.dts @@ -88605,7 +88605,7 @@ index 000000000000..7a5a7feb52a7 + enable-active-high; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..23f5f036c4b2 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dts @@ -88619,7 +88619,7 @@ index 000000000000..23f5f036c4b2 +#include "rk3568-evb2-lp4x-v10.dtsi" +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..c2d0b697a9bd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi @@ -89118,7 +89118,7 @@ index 000000000000..c2d0b697a9bd + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb4-lp3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb4-lp3-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..5884da41f121 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb4-lp3-v10.dts @@ -89136,7 +89136,7 @@ index 000000000000..5884da41f121 + compatible = "rockchip,rk3568-evb4-lp3-v10", "rockchip,rk3568"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..e9eb333079a2 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dts @@ -89150,7 +89150,7 @@ index 000000000000..e9eb333079a2 +#include "rk3568-evb5-ddr4-v10.dtsi" +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..e8a00fc85483 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi @@ -89695,7 +89695,7 @@ index 000000000000..e8a00fc85483 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..a11975fc7d53 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-linux.dts @@ -89709,7 +89709,7 @@ index 000000000000..a11975fc7d53 +#include "rk3568-evb6-ddr3-v10.dtsi" +#include "rk3568-linux.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts -new file mode 100755 +new file mode 100644 index 000000000000..0c5ea5eb32ba --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts @@ -89842,7 +89842,7 @@ index 000000000000..0c5ea5eb32ba + enable-active-high; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts -new file mode 100755 +new file mode 100644 index 000000000000..597fa0b0b089 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts @@ -89944,7 +89944,7 @@ index 000000000000..597fa0b0b089 + enable-active-high; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk630-bt656-to-cvbs.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk630-bt656-to-cvbs.dts -new file mode 100755 +new file mode 100644 index 000000000000..24c4debec4f3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk630-bt656-to-cvbs.dts @@ -90020,7 +90020,7 @@ index 000000000000..24c4debec4f3 + enable-active-high; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..6e34fa48abc4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dts @@ -90034,7 +90034,7 @@ index 000000000000..6e34fa48abc4 +#include "rk3568-evb6-ddr3-v10.dtsi" +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..2f3b5d74e1cf --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi @@ -90530,7 +90530,7 @@ index 000000000000..2f3b5d74e1cf + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb7-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb7-ddr4-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..ecb96832c292 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb7-ddr4-v10.dts @@ -90548,7 +90548,7 @@ index 000000000000..ecb96832c292 + compatible = "rockchip,rk3568-evb7-ddr4-v10", "rockchip,rk3568"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..d832a40d37e9 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10-linux.dts @@ -90623,7 +90623,7 @@ index 000000000000..d832a40d37e9 + +/delete-node/ &display_subsystem; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..489967f1318f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10.dts @@ -90676,7 +90676,7 @@ index 000000000000..489967f1318f + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..838606964e15 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi @@ -90742,7 +90742,7 @@ index 000000000000..838606964e15 + disable-afbc-win; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux-spi-nand.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux-spi-nand.dts -new file mode 100755 +new file mode 100644 index 000000000000..50bd024528df --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux-spi-nand.dts @@ -90779,7 +90779,7 @@ index 000000000000..50bd024528df + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..3317db6ee671 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux.dts @@ -90812,7 +90812,7 @@ index 000000000000..3317db6ee671 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dts -new file mode 100755 +new file mode 100644 index 000000000000..053d20259e93 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dts @@ -90845,7 +90845,7 @@ index 000000000000..053d20259e93 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..40a2096bc58b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi @@ -91293,7 +91293,7 @@ index 000000000000..40a2096bc58b + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux-spi-nand.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux-spi-nand.dts -new file mode 100755 +new file mode 100644 index 000000000000..de8c1a1e734f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux-spi-nand.dts @@ -91319,7 +91319,7 @@ index 000000000000..de8c1a1e734f +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..b605c3d57d26 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux.dts @@ -91341,7 +91341,7 @@ index 000000000000..b605c3d57d26 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..6bb50368a73b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12.dtsi @@ -91386,7 +91386,7 @@ index 000000000000..6bb50368a73b + regulator-max-microvolt = <1100000>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nvr-linux.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..f9908b61cb41 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-linux.dtsi @@ -91447,7 +91447,7 @@ index 000000000000..f9908b61cb41 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..e1ec294b2c82 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi @@ -91963,7 +91963,7 @@ index 000000000000..e1ec294b2c82 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..30d8cedfbdc7 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi @@ -95088,7 +95088,7 @@ index 000000000000..30d8cedfbdc7 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-base.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-base.dts -new file mode 100755 +new file mode 100644 index 000000000000..0ef442123d05 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-base.dts @@ -95108,7 +95108,7 @@ index 000000000000..0ef442123d05 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-edp.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-edp.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..459fc3b6d6a0 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-edp.dtsi @@ -95255,7 +95255,7 @@ index 000000000000..459fc3b6d6a0 + enable-active-high; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0-beiqicloud.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0-beiqicloud.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..25889a206778 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0-beiqicloud.dtsi @@ -95656,7 +95656,7 @@ index 000000000000..25889a206778 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..bd32a4246df3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0.dtsi @@ -95753,7 +95753,7 @@ index 000000000000..bd32a4246df3 + enable-active-high; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx1.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx1.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..70fc8ffc3e41 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx1.dtsi @@ -95856,7 +95856,7 @@ index 000000000000..70fc8ffc3e41 + enable-active-high; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-android.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-android.dts -new file mode 100755 +new file mode 100644 index 000000000000..ccfd369d0cd3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-android.dts @@ -95875,7 +95875,7 @@ index 000000000000..ccfd369d0cd3 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux-factory.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux-factory.dts -new file mode 100755 +new file mode 100644 index 000000000000..3107e3a9937a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux-factory.dts @@ -96036,7 +96036,7 @@ index 000000000000..3107e3a9937a +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..67e95ebf496b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux.dts @@ -96063,7 +96063,7 @@ index 000000000000..67e95ebf496b + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..b6ec191b0107 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi @@ -96937,7 +96937,7 @@ index 000000000000..b6ec191b0107 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10-linux.dts -new file mode 100755 +new file mode 100644 index 000000000000..8dd494ce3a1f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10-linux.dts @@ -96956,7 +96956,7 @@ index 000000000000..8dd494ce3a1f + compatible = "rockchip,rk3568-toybrick-dev-linux-x0","rockchip,rk3568"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..7c1919d7d258 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10.dtsi @@ -97778,8 +97778,8 @@ index 000000000000..7c1919d7d258 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi -new file mode 100755 -index 000000000000..8be2d36f38c0 +new file mode 100644 +index 000000000000..a36ada7adb8d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi @@ -0,0 +1,1891 @@ @@ -99675,7 +99675,7 @@ index 000000000000..8be2d36f38c0 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..372617fee467 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi @@ -103130,7 +103130,7 @@ index 000000000000..372617fee467 + +#include "rk3568-pinctrl.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi b/arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi -new file mode 100755 +new file mode 100644 index 000000000000..fc0145333257 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi @@ -103518,7 +103518,7 @@ index 000000000000..fc0145333257 +}; + diff --git a/arch/arm64/include/asm/system_info.h b/arch/arm64/include/asm/system_info.h -new file mode 100755 +new file mode 100644 index 000000000000..a82fe791b2f6 --- /dev/null +++ b/arch/arm64/include/asm/system_info.h @@ -103593,10 +103593,10 @@ index d0ff4fdb0dfb..a1b4ece467b2 100644 +obj-$(CONFIG_TZDRIVER) += tzdriver/ +obj-$(CONFIG_RK_NAND) += rk_nand/ diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c -index 9a7ea4c18366..92e61f980460 100644 +index d8fe3b62b544..5ee7c86c0b90 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c -@@ -2400,12 +2400,6 @@ static int nbd_genl_status(struct sk_buff *skb, struct genl_info *info) +@@ -2401,12 +2401,6 @@ static int nbd_genl_status(struct sk_buff *skb, struct genl_info *info) } dev_list = nla_nest_start_noflag(reply, NBD_ATTR_DEVICE_LIST); @@ -103609,8 +103609,37 @@ index 9a7ea4c18366..92e61f980460 100644 if (index == -1) { ret = idr_for_each(&nbd_index_idr, &status_cb, reply); if (ret) { +diff --git a/drivers/char/mem.c b/drivers/char/mem.c +index 7d483c332348..9b839d619250 100644 +--- a/drivers/char/mem.c ++++ b/drivers/char/mem.c +@@ -1066,6 +1066,12 @@ static int devmem_init_inode(void) + return 0; + } + ++static int do_wait_for_random_bytes(void * data) ++{ ++ wait_for_random_bytes(); ++ return 0; ++} ++ + static int __init chr_dev_init(void) + { + int minor; +@@ -1094,6 +1100,11 @@ static int __init chr_dev_init(void) + NULL, devlist[minor].name); + } + ++ struct task_struct *thread; ++ thread = kthread_run(do_wait_for_random_bytes,NULL,"wait_for_random_bytes_thread"); ++ if (IS_ERR(thread)){ ++ printk("wait_for_random_bytes_thread thread create fail"); ++ } + return tty_init(); + } + diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig -index 4ae49eae4586..b64457abdec3 100644 +index df739665f206..1422352d7f47 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -38,6 +38,13 @@ menuconfig COMMON_CLK @@ -103628,10 +103657,10 @@ index 4ae49eae4586..b64457abdec3 100644 tristate "Clock driver for WM831x/2x PMICs" depends on MFD_WM831X diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c -index 3575afe16a57..d2f0c049b837 100644 +index a0927c7f83d6..a0c8b190dd9b 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c -@@ -1324,7 +1324,7 @@ static int __init clk_disable_unused(void) +@@ -1417,7 +1417,7 @@ static int __init clk_disable_unused(void) return 0; } @@ -104350,7 +104379,7 @@ index 0dc478a19451..365d4ec3057a 100644 + return ERR_PTR(ret); +} diff --git a/drivers/clk/rockchip/clk-dclk-divider.c b/drivers/clk/rockchip/clk-dclk-divider.c -new file mode 100755 +new file mode 100644 index 000000000000..88cf7ab82a57 --- /dev/null +++ b/drivers/clk/rockchip/clk-dclk-divider.c @@ -106651,7 +106680,7 @@ index d0bd513ff3c3..89ecdd0f7ad6 100644 +#endif /* CONFIG_DEBUG_FS */ +#endif /* CONFIG_ROCKCHIP_CLK_BOOST */ diff --git a/drivers/clk/rockchip/clk-pvtm.c b/drivers/clk/rockchip/clk-pvtm.c -new file mode 100755 +new file mode 100644 index 000000000000..c748589dd922 --- /dev/null +++ b/drivers/clk/rockchip/clk-pvtm.c @@ -107489,7 +107518,7 @@ index 6fb9c98b7d24..3294ce8eaf32 100644 +MODULE_LICENSE("GPL"); +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rk1808.c b/drivers/clk/rockchip/clk-rk1808.c -new file mode 100755 +new file mode 100644 index 000000000000..e177a3dd634c --- /dev/null +++ b/drivers/clk/rockchip/clk-rk1808.c @@ -109058,7 +109087,7 @@ index 6a46f85ad837..ed05eb6c51f3 100644 +MODULE_DESCRIPTION("Rockchip RK3036 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3128.c b/drivers/clk/rockchip/clk-rk3128.c -index 4b1122e98e16..1b1111e88089 100644 +index ddfe1c402e80..1b1111e88089 100644 --- a/drivers/clk/rockchip/clk-rk3128.c +++ b/drivers/clk/rockchip/clk-rk3128.c @@ -6,8 +6,11 @@ @@ -115306,7 +115335,7 @@ index 000000000000..3c6f78fecfa0 +MODULE_ALIAS("platform:clk-rk3562"); +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rk3568.c b/drivers/clk/rockchip/clk-rk3568.c -new file mode 100755 +new file mode 100644 index 000000000000..0f5ed13a4c9f --- /dev/null +++ b/drivers/clk/rockchip/clk-rk3568.c @@ -121152,7 +121181,7 @@ index 5947d3192866..0a93b93338ba 100644 +MODULE_DESCRIPTION("Rockchip RV1108 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rv1126.c b/drivers/clk/rockchip/clk-rv1126.c -new file mode 100755 +new file mode 100644 index 000000000000..d3fc9380c359 --- /dev/null +++ b/drivers/clk/rockchip/clk-rv1126.c @@ -123865,7 +123894,7 @@ index 2271a84124b0..3d2b8d96aefb 100644 +#endif #endif diff --git a/drivers/clk/rockchip/regmap/Kconfig b/drivers/clk/rockchip/regmap/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..65f691bc4141 --- /dev/null +++ b/drivers/clk/rockchip/regmap/Kconfig @@ -123887,7 +123916,7 @@ index 000000000000..65f691bc4141 + default MFD_RK628 + select COMMON_CLK_ROCKCHIP_REGMAP diff --git a/drivers/clk/rockchip/regmap/Makefile b/drivers/clk/rockchip/regmap/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..18d075d093d9 --- /dev/null +++ b/drivers/clk/rockchip/regmap/Makefile @@ -123906,7 +123935,7 @@ index 000000000000..18d075d093d9 +obj-$(CONFIG_CLK_RK618) += clk-rk618.o +obj-$(CONFIG_CLK_RK628) += clk-rk628.o diff --git a/drivers/clk/rockchip/regmap/clk-regmap-composite.c b/drivers/clk/rockchip/regmap/clk-regmap-composite.c -new file mode 100755 +new file mode 100644 index 000000000000..43d2b9a45aca --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-composite.c @@ -124312,7 +124341,7 @@ index 000000000000..43d2b9a45aca +} +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_composite); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-divider.c b/drivers/clk/rockchip/regmap/clk-regmap-divider.c -new file mode 100755 +new file mode 100644 index 000000000000..d57f2c7f8350 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-divider.c @@ -124435,7 +124464,7 @@ index 000000000000..d57f2c7f8350 +} +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_divider); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-fractional-divider.c b/drivers/clk/rockchip/regmap/clk-regmap-fractional-divider.c -new file mode 100755 +new file mode 100644 index 000000000000..1acbc16e7aae --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-fractional-divider.c @@ -124608,7 +124637,7 @@ index 000000000000..1acbc16e7aae +} +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_fractional_divider); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-gate.c b/drivers/clk/rockchip/regmap/clk-regmap-gate.c -new file mode 100755 +new file mode 100644 index 000000000000..36549b912fa2 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-gate.c @@ -124696,7 +124725,7 @@ index 000000000000..36549b912fa2 +} +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_gate); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-mux.c b/drivers/clk/rockchip/regmap/clk-regmap-mux.c -new file mode 100755 +new file mode 100644 index 000000000000..eb37b5f9503c --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-mux.c @@ -124783,7 +124812,7 @@ index 000000000000..eb37b5f9503c + +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-pll.c b/drivers/clk/rockchip/regmap/clk-regmap-pll.c -new file mode 100755 +new file mode 100644 index 000000000000..24ad7eda9d94 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-pll.c @@ -125152,7 +125181,7 @@ index 000000000000..24ad7eda9d94 +} +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_pll); diff --git a/drivers/clk/rockchip/regmap/clk-regmap.h b/drivers/clk/rockchip/regmap/clk-regmap.h -new file mode 100755 +new file mode 100644 index 000000000000..4626e1982beb --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap.h @@ -125466,7 +125495,7 @@ index 000000000000..4626e1982beb + +#endif diff --git a/drivers/clk/rockchip/regmap/clk-rk618.c b/drivers/clk/rockchip/regmap/clk-rk618.c -new file mode 100755 +new file mode 100644 index 000000000000..c780f502b354 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-rk618.c @@ -125880,7 +125909,7 @@ index 000000000000..c780f502b354 +MODULE_DESCRIPTION("Rockchip rk618 CRU driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/clk/rockchip/regmap/clk-rk628.c b/drivers/clk/rockchip/regmap/clk-rk628.c -new file mode 100755 +new file mode 100644 index 000000000000..7f501db660e0 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-rk628.c @@ -126637,7 +126666,7 @@ index f1b7e3dd6e5d..2e0e827afd21 100644 obj-$(CONFIG_ARM_S3C2412_CPUFREQ) += s3c2412-cpufreq.o obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c -index aea285651fba..1840409d520d 100644 +index e1dcdb0ea1c4..7f8d1b71b781 100644 --- a/drivers/cpufreq/cpufreq-dt-platdev.c +++ b/drivers/cpufreq/cpufreq-dt-platdev.c @@ -66,21 +66,6 @@ static const struct of_device_id whitelist[] __initconst = { @@ -126982,10 +127011,10 @@ index e363ae04aac6..f1327e7fe361 100644 list_del(&priv->node); } diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c -index 58342390966b..ae35ef771900 100644 +index 5b4bca71f201..13cbf441c3d0 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c -@@ -688,8 +688,12 @@ static ssize_t show_##file_name \ +@@ -690,8 +690,12 @@ static ssize_t show_##file_name \ return sprintf(buf, "%u\n", policy->object); \ } @@ -126999,7 +127028,7 @@ index 58342390966b..ae35ef771900 100644 show_one(cpuinfo_transition_latency, cpuinfo.transition_latency); show_one(scaling_min_freq, min); show_one(scaling_max_freq, max); -@@ -2535,6 +2539,7 @@ static int cpufreq_set_policy(struct cpufreq_policy *policy, +@@ -2537,6 +2541,7 @@ static int cpufreq_set_policy(struct cpufreq_policy *policy, return ret; } @@ -127035,7 +127064,7 @@ index 50a4d7846580..1f001d281718 100644 } diff --git a/drivers/cpufreq/rockchip-cpufreq.c b/drivers/cpufreq/rockchip-cpufreq.c -new file mode 100755 +new file mode 100644 index 000000000000..27c6d92edfb7 --- /dev/null +++ b/drivers/cpufreq/rockchip-cpufreq.c @@ -128066,7 +128095,7 @@ index 000000000000..27c6d92edfb7 +MODULE_DESCRIPTION("Rockchip cpufreq driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/cpufreq/rockchip-cpufreq.h b/drivers/cpufreq/rockchip-cpufreq.h -new file mode 100755 +new file mode 100644 index 000000000000..3b3dbcf73449 --- /dev/null +++ b/drivers/cpufreq/rockchip-cpufreq.h @@ -128165,10 +128194,10 @@ index 3ca1ad0ecb97..abea7adbc7da 100644 obj-$(CONFIG_ARM_TEGRA20_DEVFREQ) += tegra20-devfreq.o diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c -index c6f460550f5e..db0fe99c8d61 100644 +index 93df6cef4f5a..8182968b9aa5 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c -@@ -1761,6 +1761,40 @@ static ssize_t timer_store(struct device *dev, struct device_attribute *attr, +@@ -1803,6 +1803,40 @@ static ssize_t timer_store(struct device *dev, struct device_attribute *attr, } static DEVICE_ATTR_RW(timer); @@ -128209,7 +128238,7 @@ index c6f460550f5e..db0fe99c8d61 100644 static struct attribute *devfreq_attrs[] = { &dev_attr_name.attr, &dev_attr_governor.attr, -@@ -1773,6 +1807,7 @@ static struct attribute *devfreq_attrs[] = { +@@ -1815,6 +1849,7 @@ static struct attribute *devfreq_attrs[] = { &dev_attr_max_freq.attr, &dev_attr_trans_stat.attr, &dev_attr_timer.attr, @@ -128243,7 +128272,7 @@ index 3c847e5d5a35..03d67f06c22e 100644 obj-$(CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI) += rockchip-dfi.o +obj-$(CONFIG_DEVFREQ_EVENT_ROCKCHIP_NOCP) += rockchip-nocp.o diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c -index 9a88faaf8b27..9fd6a82f79d6 100644 +index 4dafdf23197b..0d92c3bf1832 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -20,23 +20,70 @@ @@ -128907,7 +128936,7 @@ index 9a88faaf8b27..9fd6a82f79d6 100644 platform_set_drvdata(pdev, data); diff --git a/drivers/devfreq/event/rockchip-nocp.c b/drivers/devfreq/event/rockchip-nocp.c -new file mode 100755 +new file mode 100644 index 000000000000..957b84ee3290 --- /dev/null +++ b/drivers/devfreq/event/rockchip-nocp.c @@ -129079,10 +129108,9 @@ index 000000000000..957b84ee3290 +MODULE_AUTHOR("Finley Xiao "); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c -deleted file mode 100644 -index 7e52375d9818..000000000000 +index 7e52375d9818..e69de29bb2d1 100644 --- a/drivers/devfreq/rk3399_dmc.c -+++ /dev/null ++++ b/drivers/devfreq/rk3399_dmc.c @@ -1,518 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* @@ -129603,7 +129631,7 @@ index 7e52375d9818..000000000000 -MODULE_AUTHOR("Lin Huang "); -MODULE_DESCRIPTION("RK3399 dmcfreq driver with devfreq framework"); diff --git a/drivers/devfreq/rockchip_bus.c b/drivers/devfreq/rockchip_bus.c -new file mode 100755 +new file mode 100644 index 000000000000..7032b4815c5a --- /dev/null +++ b/drivers/devfreq/rockchip_bus.c @@ -130109,7 +130137,7 @@ index 000000000000..7032b4815c5a +MODULE_AUTHOR("Tony Xie "); +MODULE_DESCRIPTION("rockchip busfreq driver with devfreq framework"); diff --git a/drivers/devfreq/rockchip_dmc.c b/drivers/devfreq/rockchip_dmc.c -new file mode 100755 +new file mode 100644 index 000000000000..e3d39bd8cea0 --- /dev/null +++ b/drivers/devfreq/rockchip_dmc.c @@ -133673,7 +133701,7 @@ index 000000000000..e3d39bd8cea0 +MODULE_DESCRIPTION("rockchip dmcfreq driver with devfreq framework"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/devfreq/rockchip_dmc_common.c b/drivers/devfreq/rockchip_dmc_common.c -new file mode 100755 +new file mode 100644 index 000000000000..cacc7d02f6fc --- /dev/null +++ b/drivers/devfreq/rockchip_dmc_common.c @@ -133847,7 +133875,7 @@ index 000000000000..cacc7d02f6fc +MODULE_DESCRIPTION("rockchip dmcfreq driver with devfreq framework"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/devfreq/rockchip_dmc_dbg.c b/drivers/devfreq/rockchip_dmc_dbg.c -new file mode 100755 +new file mode 100644 index 000000000000..80b25e9046d1 --- /dev/null +++ b/drivers/devfreq/rockchip_dmc_dbg.c @@ -134914,7 +134942,7 @@ index 000000000000..80b25e9046d1 +MODULE_AUTHOR("YouMin Chen "); +MODULE_DESCRIPTION("rockchip dmc debug driver with devfreq framework"); diff --git a/drivers/devfreq/rockchip_dmc_timing.h b/drivers/devfreq/rockchip_dmc_timing.h -new file mode 100755 +new file mode 100644 index 000000000000..8f2e2c02bb90 --- /dev/null +++ b/drivers/devfreq/rockchip_dmc_timing.h @@ -137341,7 +137369,7 @@ index e55384dc115b..4931578df815 100644 static const struct dma_heap_ops cma_heap_ops = { diff --git a/drivers/dma-buf/heaps/deferred-free-helper.c b/drivers/dma-buf/heaps/deferred-free-helper.c -new file mode 100755 +new file mode 100644 index 000000000000..e19c8b68dfeb --- /dev/null +++ b/drivers/dma-buf/heaps/deferred-free-helper.c @@ -137485,7 +137513,7 @@ index 000000000000..e19c8b68dfeb +MODULE_LICENSE("GPL v2"); + diff --git a/drivers/dma-buf/heaps/deferred-free-helper.h b/drivers/dma-buf/heaps/deferred-free-helper.h -new file mode 100755 +new file mode 100644 index 000000000000..11940328ce3f --- /dev/null +++ b/drivers/dma-buf/heaps/deferred-free-helper.h @@ -137546,10 +137574,9 @@ index 000000000000..11940328ce3f + size_t nr_pages); +#endif diff --git a/drivers/dma-buf/heaps/heap-helpers.c b/drivers/dma-buf/heaps/heap-helpers.c -deleted file mode 100644 -index 35aa65bbf0a7..000000000000 +index 35aa65bbf0a7..e69de29bb2d1 100644 --- a/drivers/dma-buf/heaps/heap-helpers.c -+++ /dev/null ++++ b/drivers/dma-buf/heaps/heap-helpers.c @@ -1,271 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include @@ -137823,10 +137850,9 @@ index 35aa65bbf0a7..000000000000 - .vunmap = dma_heap_dma_buf_vunmap, -}; diff --git a/drivers/dma-buf/heaps/heap-helpers.h b/drivers/dma-buf/heaps/heap-helpers.h -deleted file mode 100644 -index 805d2df88024..000000000000 +index 805d2df88024..e69de29bb2d1 100644 --- a/drivers/dma-buf/heaps/heap-helpers.h -+++ /dev/null ++++ b/drivers/dma-buf/heaps/heap-helpers.h @@ -1,53 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* @@ -137882,7 +137908,7 @@ index 805d2df88024..000000000000 -extern const struct dma_buf_ops heap_helper_ops; -#endif /* _HEAP_HELPERS_H */ diff --git a/drivers/dma-buf/heaps/page_pool.c b/drivers/dma-buf/heaps/page_pool.c -new file mode 100755 +new file mode 100644 index 000000000000..7c34a1ba48bb --- /dev/null +++ b/drivers/dma-buf/heaps/page_pool.c @@ -138135,7 +138161,7 @@ index 000000000000..7c34a1ba48bb +module_init(dmabuf_page_pool_init_shrinker); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma-buf/heaps/page_pool.h b/drivers/dma-buf/heaps/page_pool.h -new file mode 100755 +new file mode 100644 index 000000000000..6b083b04f195 --- /dev/null +++ b/drivers/dma-buf/heaps/page_pool.h @@ -138837,7 +138863,7 @@ index 0bf688e3c023..15796bc4c033 100644 module_init(system_heap_create); MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma-buf/sw_sync.c b/drivers/dma-buf/sw_sync.c -index 348b3a9170fa..3daa6c76b8dd 100644 +index 7f5ed1aa7a9f..e403cde8aed1 100644 --- a/drivers/dma-buf/sw_sync.c +++ b/drivers/dma-buf/sw_sync.c @@ -7,6 +7,8 @@ @@ -138864,7 +138890,7 @@ index 348b3a9170fa..3daa6c76b8dd 100644 + +MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma-buf/sync_debug.c b/drivers/dma-buf/sync_debug.c -index 101394f16930..a2f906741ce0 100644 +index 237bce21d1e7..13125226f0c2 100644 --- a/drivers/dma-buf/sync_debug.c +++ b/drivers/dma-buf/sync_debug.c @@ -8,6 +8,7 @@ @@ -138904,7 +138930,7 @@ index 6176e52ba2d7..ee84997da6b4 100644 #endif /* _LINUX_SYNC_H */ diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig -index c08968c5ddf8..d9dbfda3c5f2 100644 +index 807c5320dc0f..77efc54c5cc4 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -9,7 +9,7 @@ menu "Firmware Drivers" @@ -138916,7 +138942,7 @@ index c08968c5ddf8..d9dbfda3c5f2 100644 help ARM System Control and Management Interface (SCMI) protocol is a set of operating system-independent software interfaces that are -@@ -251,6 +251,13 @@ config QCOM_SCM_DOWNLOAD_MODE_DEFAULT +@@ -252,6 +252,13 @@ config QCOM_SCM_DOWNLOAD_MODE_DEFAULT Say Y here to enable "download mode" by default. @@ -138943,7 +138969,7 @@ index 5e013b6a3692..850970fbacbc 100644 obj-$(CONFIG_QCOM_SCM) += qcom_scm.o qcom_scm-smc.o qcom_scm-legacy.o obj-$(CONFIG_TI_SCI_PROTOCOL) += ti_sci.o diff --git a/drivers/firmware/rockchip_sip.c b/drivers/firmware/rockchip_sip.c -new file mode 100755 +new file mode 100644 index 000000000000..e483899d79fe --- /dev/null +++ b/drivers/firmware/rockchip_sip.c @@ -139695,7 +139721,7 @@ index 09dada80ac34..ce6cafb6d3de 100644 obj-$(CONFIG_GPIO_SAMA5D2_PIOBU) += gpio-sama5d2-piobu.o obj-$(CONFIG_GPIO_SCH311X) += gpio-sch311x.o diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c -new file mode 100755 +new file mode 100644 index 000000000000..1d1e9a64cceb --- /dev/null +++ b/drivers/gpio/gpio-rockchip.c @@ -140501,7 +140527,7 @@ index 835c88318cec..b66e520ebbdd 100644 obj-$(CONFIG_IMX_IPUV3_CORE) += ipu-v3/ obj-$(CONFIG_TRACE_GPU_MEM) += trace/ diff --git a/drivers/gpu/arm/Kbuild b/drivers/gpu/arm/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..f747fc889b5b --- /dev/null +++ b/drivers/gpu/arm/Kbuild @@ -140532,7 +140558,7 @@ index 000000000000..f747fc889b5b + +obj-$(CONFIG_MALI_BIFROST) += bifrost/ diff --git a/drivers/gpu/arm/Kconfig b/drivers/gpu/arm/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..398a8e50a4cd --- /dev/null +++ b/drivers/gpu/arm/Kconfig @@ -140563,7 +140589,7 @@ index 000000000000..398a8e50a4cd + +source "drivers/gpu/arm/bifrost/Kconfig" diff --git a/drivers/gpu/arm/bifrost/Kbuild b/drivers/gpu/arm/bifrost/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..9cadda188fbc --- /dev/null +++ b/drivers/gpu/arm/bifrost/Kbuild @@ -140812,7 +140838,7 @@ index 000000000000..9cadda188fbc + include $(INCLUDE_SUBDIR) +endif diff --git a/drivers/gpu/arm/bifrost/Kconfig b/drivers/gpu/arm/bifrost/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..ca3da57cffd3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/Kconfig @@ -141207,7 +141233,7 @@ index 000000000000..ca3da57cffd3 + +endif diff --git a/drivers/gpu/arm/bifrost/Makefile b/drivers/gpu/arm/bifrost/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..39df298ff01c --- /dev/null +++ b/drivers/gpu/arm/bifrost/Makefile @@ -141492,7 +141518,7 @@ index 000000000000..39df298ff01c +clean: + $(MAKE) -C $(KDIR) M=$(CURDIR) $(MAKE_ARGS) clean diff --git a/drivers/gpu/arm/bifrost/arbiter/Kbuild b/drivers/gpu/arm/bifrost/arbiter/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..2e6b111441ca --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/Kbuild @@ -141521,7 +141547,7 @@ index 000000000000..2e6b111441ca + arbiter/mali_kbase_arbif.o \ + arbiter/mali_kbase_arbiter_pm.o diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.c b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.c -new file mode 100755 +new file mode 100644 index 000000000000..b5d3cd685ba5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.c @@ -141884,7 +141910,7 @@ index 000000000000..b5d3cd685ba5 + } +} diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.h b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.h -new file mode 100755 +new file mode 100644 index 000000000000..701ffd42f6f7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.h @@ -142011,7 +142037,7 @@ index 000000000000..701ffd42f6f7 + +#endif /* _MALI_KBASE_ARBIF_H_ */ diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_defs.h b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_defs.h -new file mode 100755 +new file mode 100644 index 000000000000..1c4901b3b4d9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_defs.h @@ -142093,7 +142119,7 @@ index 000000000000..1c4901b3b4d9 + +#endif /* _MALI_KBASE_ARBITER_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.c b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.c -new file mode 100755 +new file mode 100644 index 000000000000..667552c561fb --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.c @@ -143237,7 +143263,7 @@ index 000000000000..667552c561fb + .gpu_clk_notifier_unregister = arb_gpu_clk_notifier_unregister +}; diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.h b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.h -new file mode 100755 +new file mode 100644 index 000000000000..f863f88601e6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.h @@ -143439,7 +143465,7 @@ index 000000000000..f863f88601e6 + +#endif /*_MALI_KBASE_ARBITER_PM_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/Kbuild b/drivers/gpu/arm/bifrost/backend/gpu/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..efebc8a544d1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/Kbuild @@ -143503,7 +143529,7 @@ index 000000000000..efebc8a544d1 +bifrost_kbase-$(CONFIG_MALI_BIFROST_NO_MALI) += backend/gpu/mali_kbase_model_error_generator.o + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_backend_config.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_backend_config.h -new file mode 100755 +new file mode 100644 index 000000000000..6924fdb8a608 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_backend_config.h @@ -143539,7 +143565,7 @@ index 000000000000..6924fdb8a608 +#endif /* _KBASE_BACKEND_CONFIG_H_ */ + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.c -new file mode 100755 +new file mode 100644 index 000000000000..7c0abbaf860f --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.c @@ -143637,7 +143663,7 @@ index 000000000000..7c0abbaf860f + } +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.h -new file mode 100755 +new file mode 100644 index 000000000000..758e3be08c16 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.h @@ -143708,7 +143734,7 @@ index 000000000000..758e3be08c16 +void kbase_amba_set_invalidate_hint(struct kbase_device *kbdev, bool enable); +#endif /* _KBASE_CACHE_POLICY_BACKEND_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.c -new file mode 100755 +new file mode 100644 index 000000000000..ddd03ca23de6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.c @@ -144040,7 +144066,7 @@ index 000000000000..ddd03ca23de6 +} +KBASE_EXPORT_TEST_API(kbase_clk_rate_trace_manager_notify_all); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.h -new file mode 100755 +new file mode 100644 index 000000000000..35b3b8d06d96 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.h @@ -144200,7 +144226,7 @@ index 000000000000..35b3b8d06d96 +#endif /* _KBASE_CLK_RATE_TRACE_MGR_ */ + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_debug_job_fault_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_debug_job_fault_backend.c -new file mode 100755 +new file mode 100644 index 000000000000..e121b417f80d --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_debug_job_fault_backend.c @@ -144369,7 +144395,7 @@ index 000000000000..e121b417f80d + +#endif diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.c -new file mode 100755 +new file mode 100644 index 000000000000..02fb00da365c --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.c @@ -145270,7 +145296,7 @@ index 000000000000..02fb00da365c +#endif +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.h -new file mode 100755 +new file mode 100644 index 000000000000..123c58cb030f --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.h @@ -145339,7 +145365,7 @@ index 000000000000..123c58cb030f + u64 *core_mask, unsigned long *freqs, unsigned long *volts); +#endif /* _BASE_DEVFREQ_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_gpuprops_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_gpuprops_backend.c -new file mode 100755 +new file mode 100644 index 000000000000..10e92ec94d3a --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_gpuprops_backend.c @@ -145545,7 +145571,7 @@ index 000000000000..10e92ec94d3a + return 0; +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_backend.c -new file mode 100755 +new file mode 100644 index 000000000000..53578ded58b9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_backend.c @@ -146032,7 +146058,7 @@ index 000000000000..53578ded58b9 +} +#endif diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_defs.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_defs.h -new file mode 100755 +new file mode 100644 index 000000000000..bd2eb8a12047 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_defs.h @@ -146098,7 +146124,7 @@ index 000000000000..bd2eb8a12047 + +#endif /* _KBASE_INSTR_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_internal.h -new file mode 100755 +new file mode 100644 index 000000000000..332cc6944d94 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_internal.h @@ -146145,7 +146171,7 @@ index 000000000000..332cc6944d94 + +#endif /* _KBASE_INSTR_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_internal.h -new file mode 100755 +new file mode 100644 index 000000000000..66cda8c0b647 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_internal.h @@ -146198,7 +146224,7 @@ index 000000000000..66cda8c0b647 + +#endif /* _KBASE_IRQ_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_linux.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_linux.c -new file mode 100755 +new file mode 100644 index 000000000000..eb63b2c56c3d --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_linux.c @@ -146707,7 +146733,7 @@ index 000000000000..eb63b2c56c3d + +#endif /* IS_ENABLED(CONFIG_MALI_REAL_HW) */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_as.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_as.c -new file mode 100755 +new file mode 100644 index 000000000000..258dc6dac6c5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_as.c @@ -146954,7 +146980,7 @@ index 000000000000..258dc6dac6c5 + return true; +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_defs.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_defs.h -new file mode 100755 +new file mode 100644 index 000000000000..136aa526d41e --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_defs.h @@ -147095,7 +147121,7 @@ index 000000000000..136aa526d41e + +#endif /* _KBASE_HWACCESS_GPU_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_hw.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_hw.c -new file mode 100755 +new file mode 100644 index 000000000000..c7257117e98a --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_hw.c @@ -148614,7 +148640,7 @@ index 000000000000..c7257117e98a + return result; +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_internal.h -new file mode 100755 +new file mode 100644 index 000000000000..bfd55a6e2160 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_internal.h @@ -148768,7 +148794,7 @@ index 000000000000..bfd55a6e2160 + +#endif /* _KBASE_JM_HWACCESS_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.c -new file mode 100755 +new file mode 100644 index 000000000000..7db2b353b67a --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.c @@ -150647,7 +150673,7 @@ index 000000000000..7db2b353b67a + } +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.h -new file mode 100755 +new file mode 100644 index 000000000000..32be0bf44655 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.h @@ -150730,7 +150756,7 @@ index 000000000000..32be0bf44655 + +#endif /* _KBASE_HWACCESS_GPU_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_backend.c -new file mode 100755 +new file mode 100644 index 000000000000..cbc88f91a400 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_backend.c @@ -151113,7 +151139,7 @@ index 000000000000..cbc88f91a400 + backend->timeouts_updated = true; +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_internal.h -new file mode 100755 +new file mode 100644 index 000000000000..4f7c371a1f1a --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_internal.h @@ -151191,7 +151217,7 @@ index 000000000000..4f7c371a1f1a + +#endif /* _KBASE_JS_BACKEND_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.c -new file mode 100755 +new file mode 100644 index 000000000000..9ce50758c240 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.c @@ -151328,7 +151354,7 @@ index 000000000000..9ce50758c240 + return 0; +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.h -new file mode 100755 +new file mode 100644 index 000000000000..07014ad360d8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.h @@ -154431,7 +154457,7 @@ index 000000000000..8f09afe3d1cc + +#endif /* _KBASE_MODEL_LINUX_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.c -new file mode 100755 +new file mode 100644 index 000000000000..bbf629065877 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.c @@ -154510,7 +154536,7 @@ index 000000000000..bbf629065877 + +KBASE_EXPORT_TEST_API(kbase_pm_always_on_policy_ops); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.h -new file mode 100755 +new file mode 100644 index 000000000000..98d35dabec88 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.h @@ -154594,7 +154620,7 @@ index 000000000000..98d35dabec88 +#endif /* MALI_KBASE_PM_ALWAYS_ON_H */ + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_backend.c -new file mode 100755 +new file mode 100644 index 000000000000..5c71fdf154b9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_backend.c @@ -155838,7 +155864,7 @@ index 000000000000..5c71fdf154b9 +} +#endif diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.c -new file mode 100755 +new file mode 100644 index 000000000000..e2b0a919282e --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.c @@ -155994,7 +156020,7 @@ index 000000000000..e2b0a919282e +#endif +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.h -new file mode 100755 +new file mode 100644 index 000000000000..90dcaf5b67db --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.h @@ -156088,7 +156114,7 @@ index 000000000000..90dcaf5b67db + +#endif /* _KBASE_PM_CA_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca_devfreq.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca_devfreq.h -new file mode 100755 +new file mode 100644 index 000000000000..d1e4b5327f8f --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca_devfreq.h @@ -156153,7 +156179,7 @@ index 000000000000..d1e4b5327f8f +#endif /* MALI_KBASE_PM_CA_DEVFREQ_H */ + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.c -new file mode 100755 +new file mode 100644 index 000000000000..f40b753850df --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.c @@ -156226,7 +156252,7 @@ index 000000000000..f40b753850df + +KBASE_EXPORT_TEST_API(kbase_pm_coarse_demand_policy_ops); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.h -new file mode 100755 +new file mode 100644 index 000000000000..a947e8f55643 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.h @@ -156296,7 +156322,7 @@ index 000000000000..a947e8f55643 + +#endif /* MALI_KBASE_PM_COARSE_DEMAND_H */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_defs.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_defs.h -new file mode 100755 +new file mode 100644 index 000000000000..75d99a30efc0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_defs.h @@ -156951,7 +156977,7 @@ index 000000000000..75d99a30efc0 + +#endif /* _KBASE_PM_HWACCESS_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_driver.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_driver.c -new file mode 100755 +new file mode 100644 index 000000000000..5be8acd75d0a --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_driver.c @@ -160374,7 +160400,7 @@ index 000000000000..5be8acd75d0a + +KBASE_EXPORT_TEST_API(kbase_pm_release_gpu_cycle_counter); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_internal.h -new file mode 100755 +new file mode 100644 index 000000000000..e66ce57d3120 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_internal.h @@ -161401,7 +161427,7 @@ index 000000000000..e66ce57d3120 + +#endif /* _KBASE_BACKEND_PM_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_l2_states.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_l2_states.h -new file mode 100755 +new file mode 100644 index 000000000000..ef72f6083afd --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_l2_states.h @@ -161457,7 +161483,7 @@ index 000000000000..ef72f6083afd +KBASEP_L2_STATE(PEND_OFF) +KBASEP_L2_STATE(RESET_WAIT) diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_mcu_states.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_mcu_states.h -new file mode 100755 +new file mode 100644 index 000000000000..3b448e397e72 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_mcu_states.h @@ -161571,7 +161597,7 @@ index 000000000000..3b448e397e72 +KBASEP_MCU_STATE(CORESIGHT_ENABLE) +#endif /* IS_ENABLED(CONFIG_MALI_CORESIGHT) */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_metrics.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_metrics.c -new file mode 100755 +new file mode 100644 index 000000000000..865f526f61f2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_metrics.c @@ -162106,7 +162132,7 @@ index 000000000000..865f526f61f2 +} +#endif /* !MALI_USE_CSF */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.c -new file mode 100755 +new file mode 100644 index 000000000000..4788f04132c1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.c @@ -162538,7 +162564,7 @@ index 000000000000..4788f04132c1 + +KBASE_EXPORT_TEST_API(kbase_pm_set_policy); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.h -new file mode 100755 +new file mode 100644 index 000000000000..e8113659b92e --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.h @@ -162649,7 +162675,7 @@ index 000000000000..e8113659b92e + +#endif /* _KBASE_PM_POLICY_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_shader_states.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_shader_states.h -new file mode 100755 +new file mode 100644 index 000000000000..8622ef78d363 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_shader_states.h @@ -162734,7 +162760,7 @@ index 000000000000..8622ef78d363 +KBASEP_SHADER_STATE(OFF_CORESTACK_OFF_TIMER_PEND_OFF) +KBASEP_SHADER_STATE(RESET_WAIT) diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_time.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_time.c -new file mode 100755 +new file mode 100644 index 000000000000..1b33461796e2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_time.c @@ -163019,7 +163045,7 @@ index 000000000000..1b33461796e2 + return 0; +} diff --git a/drivers/gpu/arm/bifrost/build.bp b/drivers/gpu/arm/bifrost/build.bp -new file mode 100755 +new file mode 100644 index 000000000000..0a61a12d902a --- /dev/null +++ b/drivers/gpu/arm/bifrost/build.bp @@ -163338,7 +163364,7 @@ index 000000000000..156b46a12870 + bifrost_kbase-y += context/backend/mali_kbase_context_jm.o +endif diff --git a/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_csf.c b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_csf.c -new file mode 100755 +new file mode 100644 index 000000000000..07d277b947d2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_csf.c @@ -163551,7 +163577,7 @@ index 000000000000..07d277b947d2 +} +KBASE_EXPORT_SYMBOL(kbase_destroy_context); diff --git a/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_jm.c b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_jm.c -new file mode 100755 +new file mode 100644 index 000000000000..995a08e36f43 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_jm.c @@ -163828,7 +163854,7 @@ index 000000000000..995a08e36f43 +} +KBASE_EXPORT_SYMBOL(kbase_destroy_context); diff --git a/drivers/gpu/arm/bifrost/context/mali_kbase_context.c b/drivers/gpu/arm/bifrost/context/mali_kbase_context.c -new file mode 100755 +new file mode 100644 index 000000000000..88be6c2e7587 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/mali_kbase_context.c @@ -164226,7 +164252,7 @@ index 000000000000..88be6c2e7587 + kbase_gpu_vm_unlock(kctx); +} diff --git a/drivers/gpu/arm/bifrost/context/mali_kbase_context.h b/drivers/gpu/arm/bifrost/context/mali_kbase_context.h -new file mode 100755 +new file mode 100644 index 000000000000..7c90e2708fa3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/mali_kbase_context.h @@ -164373,7 +164399,7 @@ index 000000000000..7c90e2708fa3 +} +#endif /* _KBASE_CONTEXT_H_ */ diff --git a/drivers/gpu/arm/bifrost/context/mali_kbase_context_internal.h b/drivers/gpu/arm/bifrost/context/mali_kbase_context_internal.h -new file mode 100755 +new file mode 100644 index 000000000000..1cde7394c705 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/mali_kbase_context_internal.h @@ -164433,7 +164459,7 @@ index 000000000000..1cde7394c705 +int kbase_context_add_to_dev_list(struct kbase_context *kctx); +void kbase_context_remove_from_dev_list(struct kbase_context *kctx); diff --git a/drivers/gpu/arm/bifrost/csf/Kbuild b/drivers/gpu/arm/bifrost/csf/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..44217dba10c0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/Kbuild @@ -165871,7 +165897,7 @@ index 000000000000..69ff8973bac4 + +#endif /* _KBASE_CSF_IPA_CONTROL_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.c -new file mode 100755 +new file mode 100644 index 000000000000..7a939fc3382d --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.c @@ -169166,7 +169192,7 @@ index 000000000000..7a939fc3382d + return out_priority; +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.h -new file mode 100755 +new file mode 100644 index 000000000000..dd947dcbab1c --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.h @@ -169971,7 +169997,7 @@ index 000000000000..435a993955fe + u64 buffer, size_t buf_size); +#endif /* _KBASE_CSF_CPU_QUEUE_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.c -new file mode 100755 +new file mode 100644 index 000000000000..e96044ae6239 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.c @@ -170744,7 +170770,7 @@ index 000000000000..e96044ae6239 + +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.h -new file mode 100755 +new file mode 100644 index 000000000000..16a548bf8acb --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.h @@ -170804,7 +170830,7 @@ index 000000000000..16a548bf8acb + +#endif /* _KBASE_CSF_CSG_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_defs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_defs.h -new file mode 100755 +new file mode 100644 index 000000000000..6fa0e27d657f --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_defs.h @@ -172924,7 +172950,7 @@ index 000000000000..52122a9ef4d1 +bool kbase_csf_event_error_pending(struct kbase_context *kctx); +#endif /* _KBASE_CSF_EVENT_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.c -new file mode 100755 +new file mode 100644 index 000000000000..42bff1e91584 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.c @@ -176074,7 +176100,7 @@ index 000000000000..42bff1e91584 + kfree(csf_mapping->phys); +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.h -new file mode 100755 +new file mode 100644 index 000000000000..714a14001189 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.h @@ -176996,7 +177022,7 @@ index 000000000000..714a14001189 + +#endif diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.c -new file mode 100755 +new file mode 100644 index 000000000000..c895b080143a --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.c @@ -177356,7 +177382,7 @@ index 000000000000..c895b080143a +} +#endif /* CONFIG_SYSFS */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.h -new file mode 100755 +new file mode 100644 index 000000000000..b227cf158925 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.h @@ -178858,7 +178884,7 @@ index 000000000000..1008320464a9 + +#endif /* _KBASE_CSF_FIRMWARE_LOG_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_no_mali.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_no_mali.c -new file mode 100755 +new file mode 100644 index 000000000000..833947facce3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_no_mali.c @@ -180525,7 +180551,7 @@ index 000000000000..833947facce3 + kfree(csf_mapping->phys); +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.c -new file mode 100755 +new file mode 100644 index 000000000000..7c14b8eb554c --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.c @@ -180767,7 +180793,7 @@ index 000000000000..7c14b8eb554c + mutex_unlock(&ctx_alloc->lock); +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.h -new file mode 100755 +new file mode 100644 index 000000000000..9aab7abfb649 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.h @@ -180848,7 +180874,7 @@ index 000000000000..9aab7abfb649 + +#endif /* _KBASE_CSF_HEAP_CONTEXT_ALLOC_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.c -new file mode 100755 +new file mode 100644 index 000000000000..da8dde239972 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.c @@ -183449,7 +183475,7 @@ index 000000000000..da8dde239972 +} +KBASE_EXPORT_TEST_API(kbase_csf_kcpu_queue_new); diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.h -new file mode 100755 +new file mode 100644 index 000000000000..5cad8b200c93 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.h @@ -183839,7 +183865,7 @@ index 000000000000..5cad8b200c93 + +#endif /* _KBASE_CSF_KCPU_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.c -new file mode 100755 +new file mode 100644 index 000000000000..fa877778ca79 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.c @@ -184038,7 +184064,7 @@ index 000000000000..fa877778ca79 + +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.h -new file mode 100755 +new file mode 100644 index 000000000000..08f2fda034a2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.h @@ -185049,7 +185075,7 @@ index 000000000000..61943cbbf083 + +#endif /* _KBASE_CSF_MCU_SHARED_REG_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.c -new file mode 100755 +new file mode 100644 index 000000000000..bf1835b5be25 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.c @@ -185218,7 +185244,7 @@ index 000000000000..bf1835b5be25 + kfree(pma); +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.h -new file mode 100755 +new file mode 100644 index 000000000000..8c1aa919fbb0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.h @@ -186983,7 +187009,7 @@ index 000000000000..b5bf7bbbc056 + +#endif /* _KBASE_CSF_REGISTERS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_reset_gpu.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_reset_gpu.c -new file mode 100755 +new file mode 100644 index 000000000000..fe3b91a4845d --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_reset_gpu.c @@ -187626,7 +187652,7 @@ index 000000000000..fe3b91a4845d + destroy_workqueue(kbdev->csf.reset.workq); +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.c -new file mode 100755 +new file mode 100644 index 000000000000..edaa6d17e304 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.c @@ -194521,7 +194547,7 @@ index 000000000000..edaa6d17e304 + mutex_unlock(&scheduler->lock); +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.h -new file mode 100755 +new file mode 100644 index 000000000000..d22d7c8b9dce --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.h @@ -196045,7 +196071,7 @@ index 000000000000..177e15d85341 + +#endif /* _KBASE_CSF_SYNC_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.c -new file mode 100755 +new file mode 100644 index 000000000000..8072a8bd2c32 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.c @@ -197423,7 +197449,7 @@ index 000000000000..8072a8bd2c32 + return (u32)page_cnt; +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.h -new file mode 100755 +new file mode 100644 index 000000000000..1b5cb560894f --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.h @@ -197571,7 +197597,7 @@ index 000000000000..1b5cb560894f +u32 kbase_csf_tiler_heap_count_kctx_unused_pages(struct kbase_context *kctx); +#endif diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.c -new file mode 100755 +new file mode 100644 index 000000000000..96e0f2829854 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.c @@ -197739,7 +197765,7 @@ index 000000000000..96e0f2829854 +#endif /* CONFIG_DEBUG_FS */ + diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.h -new file mode 100755 +new file mode 100644 index 000000000000..4a1b413eff6d --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.h @@ -197789,7 +197815,7 @@ index 000000000000..4a1b413eff6d + +#endif /* _KBASE_CSF_TILER_HEAP_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_def.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_def.h -new file mode 100755 +new file mode 100644 index 000000000000..96f2b03d2d31 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_def.h @@ -198386,7 +198412,7 @@ index 000000000000..b6e580e48df6 + +#endif diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.c -new file mode 100755 +new file mode 100644 index 000000000000..ea6c11624157 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.c @@ -198569,7 +198595,7 @@ index 000000000000..ea6c11624157 + return atomic64_read(&kbdev->csf.progress_timeout); +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.h -new file mode 100755 +new file mode 100644 index 000000000000..b406eaad2d51 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.h @@ -198641,7 +198667,7 @@ index 000000000000..b406eaad2d51 + +#endif /* _KBASE_CSF_TIMEOUT_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.c -new file mode 100755 +new file mode 100644 index 000000000000..6859d65295c4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.c @@ -199088,7 +199114,7 @@ index 000000000000..6859d65295c4 + kbase_csf_tl_reader_flush_buffer(self); +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.h -new file mode 100755 +new file mode 100644 index 000000000000..12b285fd2929 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.h @@ -199240,7 +199266,7 @@ index 000000000000..12b285fd2929 + +#endif /* _KBASE_CSFFW_TL_READER_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.c -new file mode 100755 +new file mode 100644 index 000000000000..46872f937dbf --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.c @@ -199801,7 +199827,7 @@ index 000000000000..46872f937dbf + return err; +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.h -new file mode 100755 +new file mode 100644 index 000000000000..0389d093a904 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.h @@ -201493,7 +201519,7 @@ index 000000000000..06d62dc70182 + +#endif /* _KBASE_DEBUG_CORESIGHT_INTERNAL_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_csf.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_csf.h -new file mode 100755 +new file mode 100644 index 000000000000..41b2b00f18c8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_csf.h @@ -201821,7 +201847,7 @@ index 000000000000..41b2b00f18c8 + + /* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_jm.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_jm.h -new file mode 100755 +new file mode 100644 index 000000000000..6ba98b7c4a6c --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_jm.h @@ -202033,7 +202059,7 @@ index 000000000000..6ba98b7c4a6c + +/* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.c b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.c -new file mode 100755 +new file mode 100644 index 000000000000..cff6f8959c35 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.c @@ -202238,7 +202264,7 @@ index 000000000000..cff6f8959c35 + +#endif /* KBASE_KTRACE_TARGET_RBUF */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.h -new file mode 100755 +new file mode 100644 index 000000000000..e3d03730734d --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.h @@ -202447,7 +202473,7 @@ index 000000000000..e3d03730734d + +#endif /* _KBASE_DEBUG_KTRACE_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_csf.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_csf.h -new file mode 100755 +new file mode 100644 index 000000000000..1896e10ed4ab --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_csf.h @@ -202569,7 +202595,7 @@ index 000000000000..1896e10ed4ab +#endif /* KBASE_KTRACE_TARGET_RBUF */ +#endif /* _KBASE_DEBUG_KTRACE_DEFS_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_jm.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_jm.h -new file mode 100755 +new file mode 100644 index 000000000000..efa8ab05b1cd --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_jm.h @@ -202687,7 +202713,7 @@ index 000000000000..efa8ab05b1cd + +#endif /* _KBASE_DEBUG_KTRACE_DEFS_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.c b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.c -new file mode 100755 +new file mode 100644 index 000000000000..6597a15e5000 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.c @@ -202814,7 +202840,7 @@ index 000000000000..6597a15e5000 + +#endif /* KBASE_KTRACE_TARGET_RBUF */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.h -new file mode 100755 +new file mode 100644 index 000000000000..41be7a120dcc --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.h @@ -203129,7 +203155,7 @@ index 000000000000..41be7a120dcc + +#endif /* _KBASE_DEBUG_KTRACE_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_csf.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_csf.h -new file mode 100755 +new file mode 100644 index 000000000000..ddcac906c492 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_csf.h @@ -203402,7 +203428,7 @@ index 000000000000..ddcac906c492 + +#endif /* !defined(_KBASE_DEBUG_LINUX_KTRACE_CSF_H_) || defined(TRACE_HEADER_MULTI_READ) */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_jm.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_jm.h -new file mode 100755 +new file mode 100644 index 000000000000..8fa4e2a7c10b --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_jm.h @@ -203582,7 +203608,7 @@ index 000000000000..8fa4e2a7c10b + +#endif /* !defined(_KBASE_DEBUG_LINUX_KTRACE_JM_H_) || defined(TRACE_HEADER_MULTI_READ)*/ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.c b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.c -new file mode 100755 +new file mode 100644 index 000000000000..f521b47120fb --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.c @@ -203949,7 +203975,7 @@ index 000000000000..f521b47120fb +#endif /* CONFIG_DEBUG_FS */ +#endif /* KBASE_KTRACE_TARGET_RBUF */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.h -new file mode 100755 +new file mode 100644 index 000000000000..11f0b5c42c89 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.h @@ -204193,7 +204219,7 @@ index 000000000000..11f0b5c42c89 + +#endif /* _KBASE_DEBUG_KTRACE_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_codes.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_codes.h -new file mode 100755 +new file mode 100644 index 000000000000..6103c3ee04a8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_codes.h @@ -204380,7 +204406,7 @@ index 000000000000..6103c3ee04a8 + +/* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_defs.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_defs.h -new file mode 100755 +new file mode 100644 index 000000000000..a0fc9e51d274 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_defs.h @@ -204573,7 +204599,7 @@ index 000000000000..a0fc9e51d274 +#endif /* KBASE_KTRACE_TARGET_RBUF */ +#endif /* _KBASE_DEBUG_KTRACE_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_internal.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_internal.h -new file mode 100755 +new file mode 100644 index 000000000000..ba93f29fe5e6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_internal.h @@ -204669,7 +204695,7 @@ index 000000000000..ba93f29fe5e6 + +#endif /* _KBASE_DEBUG_KTRACE_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_linux_ktrace.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_linux_ktrace.h -new file mode 100755 +new file mode 100644 index 000000000000..6d96647161b4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_linux_ktrace.h @@ -204837,7 +204863,7 @@ index 000000000000..723ffd215696 + device/backend/mali_kbase_device_hw_jm.o +endif diff --git a/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_csf.c b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_csf.c -new file mode 100755 +new file mode 100644 index 000000000000..f7054f5b0090 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_csf.c @@ -205368,7 +205394,7 @@ index 000000000000..f7054f5b0090 +} +KBASE_EXPORT_TEST_API(kbase_device_firmware_init_once); diff --git a/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_csf.c b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_csf.c -new file mode 100755 +new file mode 100644 index 000000000000..2abd62aaa8b1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_csf.c @@ -205626,7 +205652,7 @@ index 000000000000..2abd62aaa8b1 +KBASE_EXPORT_TEST_API(kbase_reg_read); +#endif /* !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) */ diff --git a/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_jm.c b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_jm.c -new file mode 100755 +new file mode 100644 index 000000000000..38223af213d1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_jm.c @@ -205775,7 +205801,7 @@ index 000000000000..38223af213d1 +KBASE_EXPORT_TEST_API(kbase_reg_read); +#endif /* IS_ENABLED(CONFIG_MALI_REAL_HW) */ diff --git a/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_jm.c b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_jm.c -new file mode 100755 +new file mode 100644 index 000000000000..2d3672383630 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_jm.c @@ -206125,7 +206151,7 @@ index 000000000000..2d3672383630 + return ret; +} diff --git a/drivers/gpu/arm/bifrost/device/mali_kbase_device.c b/drivers/gpu/arm/bifrost/device/mali_kbase_device.c -new file mode 100755 +new file mode 100644 index 000000000000..b2b0cfd6cc97 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device.c @@ -206742,7 +206768,7 @@ index 000000000000..b2b0cfd6cc97 + kbasep_platform_device_late_term(kbdev); +} diff --git a/drivers/gpu/arm/bifrost/device/mali_kbase_device.h b/drivers/gpu/arm/bifrost/device/mali_kbase_device.h -new file mode 100755 +new file mode 100644 index 000000000000..f025011009d5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device.h @@ -206975,7 +207001,7 @@ index 000000000000..f025011009d5 + */ +void kbase_gpu_interrupt(struct kbase_device *kbdev, u32 val); diff --git a/drivers/gpu/arm/bifrost/device/mali_kbase_device_hw.c b/drivers/gpu/arm/bifrost/device/mali_kbase_device_hw.c -new file mode 100755 +new file mode 100644 index 000000000000..d55495045892 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device_hw.c @@ -207272,7 +207298,7 @@ index 000000000000..d55495045892 + return (remaining ? 0 : -ETIMEDOUT); +} diff --git a/drivers/gpu/arm/bifrost/device/mali_kbase_device_internal.h b/drivers/gpu/arm/bifrost/device/mali_kbase_device_internal.h -new file mode 100755 +new file mode 100644 index 000000000000..6f77592dfff2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device_internal.h @@ -207412,7 +207438,7 @@ index 000000000000..f3a48caf6b2c + bifrost_kbase-y += gpu/backend/mali_kbase_gpu_fault_jm.o +endif diff --git a/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_csf.c b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_csf.c -new file mode 100755 +new file mode 100644 index 000000000000..60ba9beab91c --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_csf.c @@ -207597,7 +207623,7 @@ index 000000000000..60ba9beab91c + return e; +} diff --git a/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_jm.c b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_jm.c -new file mode 100755 +new file mode 100644 index 000000000000..7f3743ca6432 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_jm.c @@ -207779,7 +207805,7 @@ index 000000000000..7f3743ca6432 + return e; +} diff --git a/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h -new file mode 100755 +new file mode 100644 index 000000000000..e7457ddb5534 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h @@ -208166,7 +208192,7 @@ index 000000000000..e7457ddb5534 + +#endif /* _KBASE_GPU_REGMAP_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h -new file mode 100755 +new file mode 100644 index 000000000000..f86f493c7f7e --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h @@ -208448,7 +208474,7 @@ index 000000000000..f86f493c7f7e + +#endif /* _KBASE_GPU_REGMAP_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.c b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.c -new file mode 100755 +new file mode 100644 index 000000000000..8a84ef54100a --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.c @@ -208495,7 +208521,7 @@ index 000000000000..8a84ef54100a + } +} diff --git a/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_fault.h b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_fault.h -new file mode 100755 +new file mode 100644 index 000000000000..6a937a5ed16d --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_fault.h @@ -208549,7 +208575,7 @@ index 000000000000..6a937a5ed16d + +#endif /* _KBASE_GPU_FAULT_H_ */ diff --git a/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h -new file mode 100755 +new file mode 100644 index 000000000000..6cef2bdd11e0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h @@ -220369,7 +220395,7 @@ index 000000000000..a545ad3e39e3 + +#endif /* _KBASE_HWCNT_WATCHDOG_IF_TIMER_H_ */ diff --git a/drivers/gpu/arm/bifrost/ipa/Kbuild b/drivers/gpu/arm/bifrost/ipa/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..0be664c47b54 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/Kbuild @@ -222492,7 +222518,7 @@ index 000000000000..2092db042dec + } +} diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.c b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.c -new file mode 100755 +new file mode 100644 index 000000000000..b2e6bc459f22 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.c @@ -223276,7 +223302,7 @@ index 000000000000..b2e6bc459f22 + mutex_unlock(&kbdev->ipa.lock); +} diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h -new file mode 100755 +new file mode 100644 index 000000000000..c875ffb4990e --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h @@ -223586,7 +223612,7 @@ index 000000000000..c875ffb4990e + +#endif diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.c b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.c -new file mode 100755 +new file mode 100644 index 000000000000..a0963bbb2068 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.c @@ -223916,7 +223942,7 @@ index 000000000000..a0963bbb2068 + mutex_unlock(&kbdev->ipa.lock); +} diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.h b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.h -new file mode 100755 +new file mode 100644 index 000000000000..f690367757c9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.h @@ -223992,7 +224018,7 @@ index 000000000000..f690367757c9 + +#endif /* _KBASE_IPA_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.c b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.c -new file mode 100755 +new file mode 100644 index 000000000000..8557fe8723cf --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.c @@ -224368,7 +224394,7 @@ index 000000000000..8557fe8723cf +}; +KBASE_EXPORT_TEST_API(kbase_simple_ipa_model_ops); diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.h b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.h -new file mode 100755 +new file mode 100644 index 000000000000..dd17786a51d9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.h @@ -224418,7 +224444,7 @@ index 000000000000..dd17786a51d9 + +#endif /* _KBASE_IPA_SIMPLE_H_ */ diff --git a/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_defs.h b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_defs.h -new file mode 100755 +new file mode 100644 index 000000000000..debc3ad25fd7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_defs.h @@ -225302,7 +225328,7 @@ index 000000000000..debc3ad25fd7 + +#endif /* _KBASE_JM_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_js.h b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_js.h -new file mode 100755 +new file mode 100644 index 000000000000..53819caaf616 --- /dev/null +++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_js.h @@ -226352,7 +226378,7 @@ index 000000000000..53819caaf616 + +#endif /* _KBASE_JM_JS_H_ */ diff --git a/drivers/gpu/arm/bifrost/jm/mali_kbase_js_defs.h b/drivers/gpu/arm/bifrost/jm/mali_kbase_js_defs.h -new file mode 100755 +new file mode 100644 index 000000000000..465cf7ec05bd --- /dev/null +++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_js_defs.h @@ -226805,7 +226831,7 @@ index 000000000000..465cf7ec05bd + +#endif /* _KBASE_JS_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_base_hwconfig_features.h b/drivers/gpu/arm/bifrost/mali_base_hwconfig_features.h -new file mode 100755 +new file mode 100644 index 000000000000..11aedef80109 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_base_hwconfig_features.h @@ -226996,7 +227022,7 @@ index 000000000000..11aedef80109 + +#endif /* _BASE_HWCONFIG_FEATURES_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_base_hwconfig_issues.h b/drivers/gpu/arm/bifrost/mali_base_hwconfig_issues.h -new file mode 100755 +new file mode 100644 index 000000000000..0fbdec0bb0b6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_base_hwconfig_issues.h @@ -227837,7 +227863,7 @@ index 000000000000..0fbdec0bb0b6 + +#endif /* _BASE_HWCONFIG_ISSUES_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase.h b/drivers/gpu/arm/bifrost/mali_kbase.h -new file mode 100755 +new file mode 100644 index 000000000000..542e8f63fb5b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase.h @@ -228595,7 +228621,7 @@ index 000000000000..542e8f63fb5b + +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.c -new file mode 100755 +new file mode 100644 index 000000000000..10dbeee02e40 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.c @@ -228710,7 +228736,7 @@ index 000000000000..10dbeee02e40 +#endif /* CONFIG_DEBUG_FS */ +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.h -new file mode 100755 +new file mode 100644 index 000000000000..59bbcf6f4ff7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.h @@ -228764,7 +228790,7 @@ index 000000000000..59bbcf6f4ff7 + +#endif /*_KBASE_AS_FAULT_DEBUG_FS_H*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_bits.h b/drivers/gpu/arm/bifrost/mali_kbase_bits.h -new file mode 100755 +new file mode 100644 index 000000000000..a085fd86c488 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_bits.h @@ -228801,7 +228827,7 @@ index 000000000000..a085fd86c488 + +#endif /* _KBASE_BITS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.c b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.c -new file mode 100755 +new file mode 100644 index 000000000000..af51ed8c2dec --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.c @@ -228872,7 +228898,7 @@ index 000000000000..af51ed8c2dec +} +KBASE_EXPORT_TEST_API(kbase_sync_single_for_cpu); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.h b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.h -new file mode 100755 +new file mode 100644 index 000000000000..598d245383fd --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.h @@ -228925,7 +228951,7 @@ index 000000000000..598d245383fd + +#endif /* _KBASE_CACHE_POLICY_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_caps.h b/drivers/gpu/arm/bifrost/mali_kbase_caps.h -new file mode 100755 +new file mode 100644 index 000000000000..6aa31f3d3a79 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_caps.h @@ -229001,7 +229027,7 @@ index 000000000000..6aa31f3d3a79 + +#endif /* __KBASE_CAPS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ccswe.c b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.c -new file mode 100755 +new file mode 100644 index 000000000000..6a1e7e4c5ff5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.c @@ -229107,7 +229133,7 @@ index 000000000000..6a1e7e4c5ff5 + spin_unlock_irqrestore(&self->access, flags); +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ccswe.h b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.h -new file mode 100755 +new file mode 100644 index 000000000000..f7fcf7780b35 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.h @@ -229208,7 +229234,7 @@ index 000000000000..f7fcf7780b35 + +#endif /* _KBASE_CCSWE_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_config.c b/drivers/gpu/arm/bifrost/mali_kbase_config.c -new file mode 100755 +new file mode 100644 index 000000000000..37dbca129f86 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_config.c @@ -229318,7 +229344,7 @@ index 000000000000..37dbca129f86 +} +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_config.h b/drivers/gpu/arm/bifrost/mali_kbase_config.h -new file mode 100755 +new file mode 100644 index 000000000000..ecfdb2876618 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_config.h @@ -229907,7 +229933,7 @@ index 000000000000..ecfdb2876618 + +#endif /* _KBASE_CONFIG_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_config_defaults.h b/drivers/gpu/arm/bifrost/mali_kbase_config_defaults.h -new file mode 100755 +new file mode 100644 index 000000000000..14493a77e1ea --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_config_defaults.h @@ -230191,7 +230217,7 @@ index 000000000000..14493a77e1ea +#define MMU_AS_INACTIVE_WAIT_TIMEOUT_CYCLES ((u64)50 * 1024 * 1024) +#endif /* _KBASE_CONFIG_DEFAULTS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_core_linux.c b/drivers/gpu/arm/bifrost/mali_kbase_core_linux.c -new file mode 100755 +new file mode 100644 index 000000000000..12d6cc8963a3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_core_linux.c @@ -236101,7 +236127,7 @@ index 000000000000..12d6cc8963a3 +} +#endif /* CONFIG_MALI_BIFROST_GATOR_SUPPORT */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_cs_experimental.h b/drivers/gpu/arm/bifrost/mali_kbase_cs_experimental.h -new file mode 100755 +new file mode 100644 index 000000000000..7e885ca46ce9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_cs_experimental.h @@ -236147,7 +236173,7 @@ index 000000000000..7e885ca46ce9 + + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.c b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.c -new file mode 100755 +new file mode 100644 index 000000000000..dc6feb95a391 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.c @@ -236586,7 +236612,7 @@ index 000000000000..dc6feb95a391 +} +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.h b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.h -new file mode 100755 +new file mode 100644 index 000000000000..5a8d17547b7b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.h @@ -236839,7 +236865,7 @@ index 000000000000..5a8d17547b7b + +#endif /* _KBASE_CTX_SCHED_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug.c b/drivers/gpu/arm/bifrost/mali_kbase_debug.c -new file mode 100755 +new file mode 100644 index 000000000000..6d3b1093b442 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug.c @@ -236886,7 +236912,7 @@ index 000000000000..6d3b1093b442 +KBASE_EXPORT_SYMBOL(kbasep_debug_assert_call_hook); + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug.h b/drivers/gpu/arm/bifrost/mali_kbase_debug.h -new file mode 100755 +new file mode 100644 index 000000000000..9d6ff73aa4e0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug.h @@ -237058,7 +237084,7 @@ index 000000000000..9d6ff73aa4e0 + +#endif /* _KBASE_DEBUG_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.c b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.c -new file mode 100755 +new file mode 100644 index 000000000000..d6518b476115 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.c @@ -237637,7 +237663,7 @@ index 000000000000..d6518b476115 + +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.h b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.h -new file mode 100755 +new file mode 100644 index 000000000000..059d9c4553bb --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.h @@ -237953,7 +237979,7 @@ index 000000000000..8cf69c2cbaf9 + +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.c b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.c -new file mode 100755 +new file mode 100644 index 000000000000..ce87a0070b72 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.c @@ -238369,7 +238395,7 @@ index 000000000000..ce87a0070b72 + +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.h b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.h -new file mode 100755 +new file mode 100644 index 000000000000..cb8050d9b32c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.h @@ -238581,7 +238607,7 @@ index 000000000000..acf349b608d5 + +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.c b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.c -new file mode 100755 +new file mode 100644 index 000000000000..c846491e78fb --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.c @@ -238835,7 +238861,7 @@ index 000000000000..c846491e78fb + return 0; +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.h b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.h -new file mode 100755 +new file mode 100644 index 000000000000..cbb24d6e0acf --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.h @@ -239003,7 +239029,7 @@ index 000000000000..cbb24d6e0acf +#endif /*_KBASE_DEBUGFS_HELPER_H_ */ + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_defs.h b/drivers/gpu/arm/bifrost/mali_kbase_defs.h -new file mode 100755 +new file mode 100644 index 000000000000..809e73000c4d --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_defs.h @@ -241114,7 +241140,7 @@ index 000000000000..809e73000c4d +#define KBASE_PRFCNT_ACTIVE_MAX_LOOPS 100000000 +#endif /* _KBASE_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_disjoint_events.c b/drivers/gpu/arm/bifrost/mali_kbase_disjoint_events.c -new file mode 100755 +new file mode 100644 index 000000000000..7d6e475585ae --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_disjoint_events.c @@ -241200,7 +241226,7 @@ index 000000000000..7d6e475585ae +} +KBASE_EXPORT_TEST_API(kbase_disjoint_event_get); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.c b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.c -new file mode 100755 +new file mode 100644 index 000000000000..0e0dab912145 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.c @@ -241658,7 +241684,7 @@ index 000000000000..0e0dab912145 + } +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.h b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.h -new file mode 100755 +new file mode 100644 index 000000000000..8713ba1eaa6f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.h @@ -241878,7 +241904,7 @@ index 000000000000..8334db7cc1ed + +#endif /* _KBASE_DVFS_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_event.c b/drivers/gpu/arm/bifrost/mali_kbase_event.c -new file mode 100755 +new file mode 100644 index 000000000000..910c51170ae8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_event.c @@ -242156,7 +242182,7 @@ index 000000000000..910c51170ae8 + +KBASE_EXPORT_TEST_API(kbase_event_cleanup); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence.c b/drivers/gpu/arm/bifrost/mali_kbase_fence.c -new file mode 100755 +new file mode 100644 index 000000000000..b16b27659e61 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence.c @@ -242223,7 +242249,7 @@ index 000000000000..b16b27659e61 +} + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence.h b/drivers/gpu/arm/bifrost/mali_kbase_fence.h -new file mode 100755 +new file mode 100644 index 000000000000..f4507ac4309b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence.h @@ -242488,7 +242514,7 @@ index 000000000000..f4507ac4309b + +#endif /* _KBASE_FENCE_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence_defs.h b/drivers/gpu/arm/bifrost/mali_kbase_fence_defs.h -new file mode 100755 +new file mode 100644 index 000000000000..7a150bdf2947 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence_defs.h @@ -242557,7 +242583,7 @@ index 000000000000..7a150bdf2947 + +#endif /* _KBASE_FENCE_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence_ops.c b/drivers/gpu/arm/bifrost/mali_kbase_fence_ops.c -new file mode 100755 +new file mode 100644 index 000000000000..25b4c9c03b53 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence_ops.c @@ -242674,7 +242700,7 @@ index 000000000000..25b4c9c03b53 +}; +KBASE_EXPORT_TEST_API(kbase_fence_ops); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gator.h b/drivers/gpu/arm/bifrost/mali_kbase_gator.h -new file mode 100755 +new file mode 100644 index 000000000000..dd7df874640a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gator.h @@ -242732,7 +242758,7 @@ index 000000000000..dd7df874640a + +#endif /* _KBASE_GATOR_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.c -new file mode 100755 +new file mode 100644 index 000000000000..bf5f259a0bb6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.c @@ -242850,7 +242876,7 @@ index 000000000000..bf5f259a0bb6 +void kbasep_gpu_memory_debugfs_init(struct kbase_device *kbdev) {} +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.h -new file mode 100755 +new file mode 100644 index 000000000000..6d5423f379d4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.h @@ -242906,7 +242932,7 @@ index 000000000000..6d5423f379d4 + +#endif /*_KBASE_GPU_MEMORY_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.c b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.c -new file mode 100755 +new file mode 100644 index 000000000000..7a7d17ea5f26 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.c @@ -243800,7 +243826,7 @@ index 000000000000..7a7d17ea5f26 + return 0; +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h -new file mode 100755 +new file mode 100644 index 000000000000..f0a97312c0dd --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h @@ -243960,7 +243986,7 @@ index 000000000000..f0a97312c0dd + +#endif /* _KBASE_GPUPROPS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpuprops_types.h b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops_types.h -new file mode 100755 +new file mode 100644 index 000000000000..45cb603fab82 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops_types.h @@ -244136,7 +244162,7 @@ index 000000000000..45cb603fab82 + +#endif /* _KBASE_GPUPROPS_TYPES_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gwt.c b/drivers/gpu/arm/bifrost/mali_kbase_gwt.c -new file mode 100755 +new file mode 100644 index 000000000000..0eba889e5b19 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gwt.c @@ -244417,7 +244443,7 @@ index 000000000000..0eba889e5b19 + return 0; +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gwt.h b/drivers/gpu/arm/bifrost/mali_kbase_gwt.h -new file mode 100755 +new file mode 100644 index 000000000000..9fdd68d62fb8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gwt.h @@ -244477,7 +244503,7 @@ index 000000000000..9fdd68d62fb8 + +#endif /* _KBASE_GWT_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hw.c b/drivers/gpu/arm/bifrost/mali_kbase_hw.c -new file mode 100755 +new file mode 100644 index 000000000000..b07327a55c0a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hw.c @@ -244920,7 +244946,7 @@ index 000000000000..b07327a55c0a + return 0; +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hw.h b/drivers/gpu/arm/bifrost/mali_kbase_hw.h -new file mode 100755 +new file mode 100644 index 000000000000..ddcddaaa429d --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hw.h @@ -244997,7 +245023,7 @@ index 000000000000..ddcddaaa429d + +#endif /* _KBASE_HW_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_backend.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_backend.h -new file mode 100755 +new file mode 100644 index 000000000000..0da4eb258a24 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_backend.h @@ -245046,7 +245072,7 @@ index 000000000000..0da4eb258a24 + +#endif /* _KBASE_HWACCESS_BACKEND_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_defs.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_defs.h -new file mode 100755 +new file mode 100644 index 000000000000..62a6ec51b17f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_defs.h @@ -245102,7 +245128,7 @@ index 000000000000..62a6ec51b17f + +#endif /* _KBASE_HWACCESS_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_gpuprops.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_gpuprops.h -new file mode 100755 +new file mode 100644 index 000000000000..f537b7f0ac90 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_gpuprops.h @@ -245196,7 +245222,7 @@ index 000000000000..f537b7f0ac90 + +#endif /* _KBASE_HWACCESS_GPUPROPS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_instr.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_instr.h -new file mode 100755 +new file mode 100644 index 000000000000..37663101a346 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_instr.h @@ -245372,7 +245398,7 @@ index 000000000000..37663101a346 + +#endif /* _KBASE_HWACCESS_INSTR_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_jm.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_jm.h -new file mode 100755 +new file mode 100644 index 000000000000..ca77c192deea --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_jm.h @@ -245696,7 +245722,7 @@ index 000000000000..ca77c192deea + +#endif /* _KBASE_HWACCESS_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_pm.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_pm.h -new file mode 100755 +new file mode 100644 index 000000000000..effb2ffeb349 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_pm.h @@ -245931,7 +245957,7 @@ index 000000000000..effb2ffeb349 + +#endif /* _KBASE_HWACCESS_PM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_time.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_time.h -new file mode 100755 +new file mode 100644 index 000000000000..ac2a26d28d89 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_time.h @@ -246063,7 +246089,7 @@ index 000000000000..ac2a26d28d89 + +#endif /* _KBASE_BACKEND_TIME_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jd.c b/drivers/gpu/arm/bifrost/mali_kbase_jd.c -new file mode 100755 +new file mode 100644 index 000000000000..f44426a736ca --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jd.c @@ -247729,7 +247755,7 @@ index 000000000000..f44426a736ca + +KBASE_EXPORT_TEST_API(kbase_jd_exit); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.c -new file mode 100755 +new file mode 100644 index 000000000000..6196c0985c7e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.c @@ -247934,7 +247960,7 @@ index 000000000000..6196c0985c7e + +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.h -new file mode 100755 +new file mode 100644 index 000000000000..8e6140c43538 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.h @@ -247983,7 +248009,7 @@ index 000000000000..8e6140c43538 + +#endif /*_KBASE_JD_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jm.c b/drivers/gpu/arm/bifrost/mali_kbase_jm.c -new file mode 100755 +new file mode 100644 index 000000000000..1ac5cd3eafff --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jm.c @@ -248142,7 +248168,7 @@ index 000000000000..1ac5cd3eafff +} +#endif /* !MALI_USE_CSF */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jm.h b/drivers/gpu/arm/bifrost/mali_kbase_jm.h -new file mode 100755 +new file mode 100644 index 000000000000..eeafcb6b1a77 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jm.h @@ -248265,7 +248291,7 @@ index 000000000000..eeafcb6b1a77 + +#endif /* _KBASE_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_js.c b/drivers/gpu/arm/bifrost/mali_kbase_js.c -new file mode 100755 +new file mode 100644 index 000000000000..8ce09212a57e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js.c @@ -252278,7 +252304,7 @@ index 000000000000..8ce09212a57e + return kbasep_js_sched_prio_to_atom_prio(kbdev, out_priority); +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_js.h b/drivers/gpu/arm/bifrost/mali_kbase_js.h -new file mode 100755 +new file mode 100644 index 000000000000..96974c8c6439 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js.h @@ -252320,7 +252346,7 @@ index 000000000000..96974c8c6439 + +#endif /* _KBASE_JS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.c b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.c -new file mode 100755 +new file mode 100644 index 000000000000..04ea06b2f381 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.c @@ -252624,7 +252650,7 @@ index 000000000000..04ea06b2f381 + return runpool_state_changed; +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.h b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.h -new file mode 100755 +new file mode 100644 index 000000000000..2dc640d5ab82 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.h @@ -252777,7 +252803,7 @@ index 000000000000..2dc640d5ab82 + +#endif /* _KBASE_JS_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.c b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.c -new file mode 100755 +new file mode 100644 index 000000000000..14a730dc5a12 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.c @@ -253679,7 +253705,7 @@ index 000000000000..14a730dc5a12 + kbase_kinstr_jm_atom_state_start(queued); +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.h b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.h -new file mode 100755 +new file mode 100644 index 000000000000..9451d4cd943d --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.h @@ -256180,7 +256206,7 @@ index 000000000000..bbe33796e62f + +#endif /* _KBASE_KINSTR_PRFCNT_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_linux.h b/drivers/gpu/arm/bifrost/mali_kbase_linux.h -new file mode 100755 +new file mode 100644 index 000000000000..e5c6f7a0b217 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_linux.h @@ -256230,7 +256256,7 @@ index 000000000000..e5c6f7a0b217 + +#endif /* _KBASE_LINUX_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem.c b/drivers/gpu/arm/bifrost/mali_kbase_mem.c -new file mode 100755 +new file mode 100644 index 000000000000..1c94e9c57b7f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem.c @@ -261777,7 +261803,7 @@ index 000000000000..1c94e9c57b7f + } +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem.h b/drivers/gpu/arm/bifrost/mali_kbase_mem.h -new file mode 100755 +new file mode 100644 index 000000000000..490ad3c9c2e2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem.h @@ -264353,7 +264379,7 @@ index 000000000000..490ad3c9c2e2 +} +#endif /* _KBASE_MEM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.c -new file mode 100755 +new file mode 100644 index 000000000000..f1251a4ed575 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.c @@ -268190,7 +268216,7 @@ index 000000000000..f1251a4ed575 + +#endif /* MALI_USE_CSF */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.h -new file mode 100755 +new file mode 100644 index 000000000000..6dda44b9f128 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.h @@ -268729,7 +268755,7 @@ index 000000000000..6dda44b9f128 + +#endif /* _KBASE_MEM_LINUX_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_lowlevel.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_lowlevel.h -new file mode 100755 +new file mode 100644 index 000000000000..5a1bb16cca01 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_lowlevel.h @@ -269675,7 +269701,7 @@ index 000000000000..76bbc999e110 + */ +void kbase_mem_migrate_term(struct kbase_device *kbdev); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool.c -new file mode 100755 +new file mode 100644 index 000000000000..fa8f34d86c24 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool.c @@ -270710,7 +270736,7 @@ index 000000000000..fa8f34d86c24 + pool_dbg(pool, "free_pages_locked(%zu) done\n", nr_pages); +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.c -new file mode 100755 +new file mode 100644 index 000000000000..3b1b2bae15c8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.c @@ -270900,7 +270926,7 @@ index 000000000000..3b1b2bae15c8 + &kctx->mem_pools.large, &kbase_mem_pool_debugfs_max_size_fops); +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.h -new file mode 100755 +new file mode 100644 index 000000000000..207b58536a58 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.h @@ -271028,7 +271054,7 @@ index 000000000000..207b58536a58 +#endif /*_KBASE_MEM_POOL_DEBUGFS_H_ */ + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.c -new file mode 100755 +new file mode 100644 index 000000000000..49c4b041e13a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.c @@ -271141,7 +271167,7 @@ index 000000000000..49c4b041e13a + } +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.h -new file mode 100755 +new file mode 100644 index 000000000000..fe8ce775258f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.h @@ -271261,7 +271287,7 @@ index 000000000000..fe8ce775258f + +#endif /* _KBASE_MEM_POOL_GROUP_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.c -new file mode 100755 +new file mode 100644 index 000000000000..9317023b71bb --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.c @@ -271398,7 +271424,7 @@ index 000000000000..9317023b71bb +} +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.h -new file mode 100755 +new file mode 100644 index 000000000000..c30fca6652dc --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.h @@ -271468,7 +271494,7 @@ index 000000000000..c30fca6652dc +#endif /*_KBASE_MEM_PROFILE_DEBUGFS_H*/ + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mipe_gen_header.h b/drivers/gpu/arm/bifrost/mali_kbase_mipe_gen_header.h -new file mode 100755 +new file mode 100644 index 000000000000..951079d11ab6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mipe_gen_header.h @@ -271703,7 +271729,7 @@ index 000000000000..951079d11ab6 + +/* clang-format on */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mipe_proto.h b/drivers/gpu/arm/bifrost/mali_kbase_mipe_proto.h -new file mode 100755 +new file mode 100644 index 000000000000..c35ee61ce5aa --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mipe_proto.h @@ -271835,7 +271861,7 @@ index 000000000000..c35ee61ce5aa + +/* clang-format on */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.c b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.c -new file mode 100755 +new file mode 100644 index 000000000000..10a7f506b1a4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.c @@ -272018,7 +272044,7 @@ index 000000000000..10a7f506b1a4 + .data = NULL +}; diff --git a/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.h b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.h -new file mode 100755 +new file mode 100644 index 000000000000..1eae2fcf98b6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.h @@ -272730,7 +272756,7 @@ index 000000000000..508ecdff9162 + +#endif /* _KBASE_PBHA_DEBUGFS_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_platform_fake.c b/drivers/gpu/arm/bifrost/mali_kbase_platform_fake.c -new file mode 100755 +new file mode 100644 index 000000000000..265c676f13fa --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_platform_fake.c @@ -272855,7 +272881,7 @@ index 000000000000..265c676f13fa + +#endif /* CONFIG_OF */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_pm.c b/drivers/gpu/arm/bifrost/mali_kbase_pm.c -new file mode 100755 +new file mode 100644 index 000000000000..62a132816a42 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pm.c @@ -273172,7 +273198,7 @@ index 000000000000..62a132816a42 +#endif /* CONFIG_MALI_ARBITER_SUPPORT */ +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_pm.h b/drivers/gpu/arm/bifrost/mali_kbase_pm.h -new file mode 100755 +new file mode 100644 index 000000000000..4bb90a4f6542 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pm.h @@ -273498,7 +273524,7 @@ index 000000000000..c517a2d2ab83 + +#endif /* _KBASE_REFCOUNT_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.c -new file mode 100755 +new file mode 100644 index 000000000000..147082c15fed --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.c @@ -273743,7 +273769,7 @@ index 000000000000..147082c15fed +} +#endif /* defined(CONFIG_DEBUG_FS) && !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.h -new file mode 100755 +new file mode 100644 index 000000000000..ae327dd799a4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.h @@ -273833,7 +273859,7 @@ index 000000000000..ae327dd799a4 + +#endif /*_KBASE_REGS_HISTORY_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_reset_gpu.h b/drivers/gpu/arm/bifrost/mali_kbase_reset_gpu.h -new file mode 100755 +new file mode 100644 index 000000000000..48ea9954b17c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_reset_gpu.h @@ -274116,7 +274142,7 @@ index 000000000000..48ea9954b17c + +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_smc.c b/drivers/gpu/arm/bifrost/mali_kbase_smc.c -new file mode 100755 +new file mode 100644 index 000000000000..abbe8d56d082 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_smc.c @@ -274212,7 +274238,7 @@ index 000000000000..abbe8d56d082 +#endif /* CONFIG_ARM64 */ + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_smc.h b/drivers/gpu/arm/bifrost/mali_kbase_smc.h -new file mode 100755 +new file mode 100644 index 000000000000..40a348388598 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_smc.h @@ -274287,7 +274313,7 @@ index 000000000000..40a348388598 + +#endif /* _KBASE_SMC_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_softjobs.c b/drivers/gpu/arm/bifrost/mali_kbase_softjobs.c -new file mode 100755 +new file mode 100644 index 000000000000..a9312a0c433e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_softjobs.c @@ -276063,7 +276089,7 @@ index 000000000000..a9312a0c433e +} +#endif /* !MALI_USE_CSF */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_strings.c b/drivers/gpu/arm/bifrost/mali_kbase_strings.c -new file mode 100755 +new file mode 100644 index 000000000000..84784be6f244 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_strings.c @@ -276097,7 +276123,7 @@ index 000000000000..84784be6f244 +const char kbase_drv_name[] = KBASE_DRV_NAME; +const char kbase_timeline_name[] = KBASE_TIMELINE_NAME; diff --git a/drivers/gpu/arm/bifrost/mali_kbase_strings.h b/drivers/gpu/arm/bifrost/mali_kbase_strings.h -new file mode 100755 +new file mode 100644 index 000000000000..c3f94f9267d5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_strings.h @@ -276126,7 +276152,7 @@ index 000000000000..c3f94f9267d5 +extern const char kbase_drv_name[]; +extern const char kbase_timeline_name[]; diff --git a/drivers/gpu/arm/bifrost/mali_kbase_sync.h b/drivers/gpu/arm/bifrost/mali_kbase_sync.h -new file mode 100755 +new file mode 100644 index 000000000000..3d2053bee08e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_sync.h @@ -276348,7 +276374,7 @@ index 000000000000..3d2053bee08e + +#endif /* MALI_KBASE_SYNC_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_sync_common.c b/drivers/gpu/arm/bifrost/mali_kbase_sync_common.c -new file mode 100755 +new file mode 100644 index 000000000000..5ee7fc3ce72b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_sync_common.c @@ -276404,7 +276430,7 @@ index 000000000000..5ee7fc3ce72b + return "error"; +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_sync_file.c b/drivers/gpu/arm/bifrost/mali_kbase_sync_file.c -new file mode 100755 +new file mode 100644 index 000000000000..9360324cfee6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_sync_file.c @@ -276819,7 +276845,7 @@ index 000000000000..9360324cfee6 +#endif +#endif /* !MALI_USE_CSF*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.c b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.c -new file mode 100755 +new file mode 100644 index 000000000000..7df7d79b6bc5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.c @@ -277050,7 +277076,7 @@ index 000000000000..7df7d79b6bc5 + mutex_unlock(&kbdev->dma_buf_lock); +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.h b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.h -new file mode 100755 +new file mode 100644 index 000000000000..fd871fcb352a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.h @@ -277156,7 +277182,7 @@ index 000000000000..fd871fcb352a + +#endif /* _KBASE_TRACE_GPU_MEM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_utility.h b/drivers/gpu/arm/bifrost/mali_kbase_utility.h -new file mode 100755 +new file mode 100644 index 000000000000..2dad49b59f52 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_utility.h @@ -277214,7 +277240,7 @@ index 000000000000..2dad49b59f52 + +#endif /* _KBASE_UTILITY_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_vinstr.c b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.c -new file mode 100755 +new file mode 100644 index 000000000000..d770913e9da5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.c @@ -278352,7 +278378,7 @@ index 000000000000..d770913e9da5 + return 0; +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_vinstr.h b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.h -new file mode 100755 +new file mode 100644 index 000000000000..6747ec70a406 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.h @@ -278448,7 +278474,7 @@ index 000000000000..6747ec70a406 + +#endif /* _KBASE_VINSTR_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_linux_trace.h b/drivers/gpu/arm/bifrost/mali_linux_trace.h -new file mode 100755 +new file mode 100644 index 000000000000..52f17390c853 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_linux_trace.h @@ -279001,7 +279027,7 @@ index 000000000000..52f17390c853 +/* This part must be outside protection */ +#include diff --git a/drivers/gpu/arm/bifrost/mali_malisw.h b/drivers/gpu/arm/bifrost/mali_malisw.h -new file mode 100755 +new file mode 100644 index 000000000000..d9db189e8684 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_malisw.h @@ -279115,7 +279141,7 @@ index 000000000000..d9db189e8684 + +#endif /* _MALISW_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.c b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.c -new file mode 100755 +new file mode 100644 index 000000000000..1db3abe2f9f6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.c @@ -279147,7 +279173,7 @@ index 000000000000..1db3abe2f9f6 +#include "mali_power_gpu_frequency_trace.h" +#endif diff --git a/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.h b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.h -new file mode 100755 +new file mode 100644 index 000000000000..f156650a40a3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.h @@ -279257,7 +279283,7 @@ index 000000000000..416432397b5c + bifrost_kbase-y += mmu/backend/mali_kbase_mmu_jm.o +endif diff --git a/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_csf.c b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_csf.c -new file mode 100755 +new file mode 100644 index 000000000000..4cac7876f5f7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_csf.c @@ -279835,7 +279861,7 @@ index 000000000000..4cac7876f5f7 + return 0; +} diff --git a/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_jm.c b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_jm.c -new file mode 100755 +new file mode 100644 index 000000000000..d716ce0068fd --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_jm.c @@ -280283,7 +280309,7 @@ index 000000000000..d716ce0068fd + return 0; +} diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.c b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.c -new file mode 100755 +new file mode 100644 index 000000000000..d6d3fcdee6e7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.c @@ -284178,7 +284204,7 @@ index 000000000000..d6d3fcdee6e7 + } +} diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.h b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.h -new file mode 100755 +new file mode 100644 index 000000000000..699b1f340482 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.h @@ -284525,7 +284551,7 @@ index 000000000000..699b1f340482 + +#endif /* _KBASE_MMU_H_ */ diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw.h b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw.h -new file mode 100755 +new file mode 100644 index 000000000000..50d2ea5d07c8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw.h @@ -284745,7 +284771,7 @@ index 000000000000..50d2ea5d07c8 + +#endif /* _KBASE_MMU_HW_H_ */ diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw_direct.c b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw_direct.c -new file mode 100755 +new file mode 100644 index 000000000000..3f6da35d80f2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw_direct.c @@ -285450,7 +285476,7 @@ index 000000000000..3f6da35d80f2 + spin_unlock_irqrestore(&kbdev->mmu_mask_change, flags); +} diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_internal.h b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_internal.h -new file mode 100755 +new file mode 100644 index 000000000000..9d7ce48568e4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_internal.h @@ -285528,7 +285554,7 @@ index 000000000000..9d7ce48568e4 + +#endif /* _KBASE_MMU_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_aarch64.c b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_aarch64.c -new file mode 100755 +new file mode 100644 index 000000000000..f2c627482c18 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_aarch64.c @@ -285753,7 +285779,7 @@ index 000000000000..f2c627482c18 + return &aarch64_mode; +} diff --git a/drivers/gpu/arm/bifrost/platform/Kconfig b/drivers/gpu/arm/bifrost/platform/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..3e1bd235b842 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/Kconfig @@ -285785,7 +285811,7 @@ index 000000000000..3e1bd235b842 +# Where xxx is the platform name is the name set in MALI_PLATFORM_NAME +# diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/Kbuild b/drivers/gpu/arm/bifrost/platform/devicetree/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..60a52d80fa8e --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/Kbuild @@ -285815,7 +285841,7 @@ index 000000000000..60a52d80fa8e + platform/$(MALI_PLATFORM_DIR)/mali_kbase_runtime_pm.o \ + platform/$(MALI_PLATFORM_DIR)/mali_kbase_clk_rate_trace.o diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_clk_rate_trace.c b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_clk_rate_trace.c -new file mode 100755 +new file mode 100644 index 000000000000..4bcd5854d3a3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_clk_rate_trace.c @@ -285926,7 +285952,7 @@ index 000000000000..4bcd5854d3a3 + .gpu_clk_notifier_unregister = gpu_clk_notifier_unregister, +}; diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_devicetree.c b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_devicetree.c -new file mode 100755 +new file mode 100644 index 000000000000..a0b4a434e2a7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_devicetree.c @@ -285985,7 +286011,7 @@ index 000000000000..a0b4a434e2a7 +} +#endif /* CONFIG_MALI_BIFROST_DVFS */ diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_platform.h -new file mode 100755 +new file mode 100644 index 000000000000..584a7217d300 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_platform.h @@ -286038,7 +286064,7 @@ index 000000000000..584a7217d300 + */ +#define AUTO_SUSPEND_DELAY (100) diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_runtime_pm.c b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_runtime_pm.c -new file mode 100755 +new file mode 100644 index 000000000000..2687bee96ec9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_runtime_pm.c @@ -286752,7 +286778,7 @@ index 000000000000..910d4b4fd3e1 +#endif /* KBASE_PM_RUNTIME */ +}; diff --git a/drivers/gpu/arm/bifrost/platform/rk/Kbuild b/drivers/gpu/arm/bifrost/platform/rk/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..a1e78cfc4ae7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/Kbuild @@ -286774,7 +286800,7 @@ index 000000000000..a1e78cfc4ae7 +bifrost_kbase-y += \ + platform/$(MALI_PLATFORM_DIR)/mali_kbase_config_rk.o diff --git a/drivers/gpu/arm/bifrost/platform/rk/custom_log.h b/drivers/gpu/arm/bifrost/platform/rk/custom_log.h -new file mode 100755 +new file mode 100644 index 000000000000..5de70ee13d25 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/custom_log.h @@ -286972,7 +286998,7 @@ index 000000000000..5de70ee13d25 + +#endif /* __CUSTOM_LOG_H__ */ diff --git a/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_platform.h -new file mode 100755 +new file mode 100644 index 000000000000..a2c93fa69e67 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_platform.h @@ -287071,7 +287097,7 @@ index 000000000000..a2c93fa69e67 +int kbase_platform_rk_init_opp_table(struct kbase_device *kbdev); +int kbase_platform_rk_enable_regulator(struct kbase_device *kbdev); diff --git a/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_rk.c b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_rk.c -new file mode 100755 +new file mode 100644 index 000000000000..c32526a86275 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_rk.c @@ -287769,7 +287795,7 @@ index 000000000000..c32526a86275 + .gpu_clk_notifier_unregister = gpu_clk_notifier_unregister, +}; diff --git a/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_rk.h b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_rk.h -new file mode 100755 +new file mode 100644 index 000000000000..0a42559df2bf --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_rk.h @@ -287842,7 +287868,7 @@ index 000000000000..0a42559df2bf +#endif /* _MALI_KBASE_RK_H_ */ + diff --git a/drivers/gpu/arm/bifrost/platform/vexpress/Kbuild b/drivers/gpu/arm/bifrost/platform/vexpress/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..e1398fde3976 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress/Kbuild @@ -287871,7 +287897,7 @@ index 000000000000..e1398fde3976 + platform/$(MALI_PLATFORM_DIR)/mali_kbase_config_vexpress.o \ + mali_kbase_platform_fake.o diff --git a/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_platform.h -new file mode 100755 +new file mode 100644 index 000000000000..28f453161358 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_platform.h @@ -287915,7 +287941,7 @@ index 000000000000..28f453161358 + +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_vexpress.c b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_vexpress.c -new file mode 100755 +new file mode 100644 index 000000000000..8add708d0f8a --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_vexpress.c @@ -288000,7 +288026,7 @@ index 000000000000..8add708d0f8a +} +#endif /* CONFIG_MALI_BIFROST_DVFS */ diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/Kbuild b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..e1398fde3976 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/Kbuild @@ -288029,7 +288055,7 @@ index 000000000000..e1398fde3976 + platform/$(MALI_PLATFORM_DIR)/mali_kbase_config_vexpress.o \ + mali_kbase_platform_fake.o diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h -new file mode 100755 +new file mode 100644 index 000000000000..28f453161358 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h @@ -288073,7 +288099,7 @@ index 000000000000..28f453161358 + +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c -new file mode 100755 +new file mode 100644 index 000000000000..835b7587cfbf --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c @@ -288156,7 +288182,7 @@ index 000000000000..835b7587cfbf +} +#endif /* CONFIG_MALI_BIFROST_DVFS */ diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/Kbuild b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..10f7dc8cf22c --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/Kbuild @@ -288186,7 +288212,7 @@ index 000000000000..10f7dc8cf22c + platform/$(MALI_PLATFORM_DIR)/mali_kbase_cpu_vexpress.o \ + mali_kbase_platform_fake.o diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h -new file mode 100755 +new file mode 100644 index 000000000000..28f453161358 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h @@ -288230,7 +288256,7 @@ index 000000000000..28f453161358 + +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c -new file mode 100755 +new file mode 100644 index 000000000000..8be30fb25bba --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c @@ -288313,7 +288339,7 @@ index 000000000000..8be30fb25bba +} +#endif /* CONFIG_MALI_BIFROST_DVFS */ diff --git a/drivers/gpu/arm/bifrost/protected_mode_switcher.h b/drivers/gpu/arm/bifrost/protected_mode_switcher.h -new file mode 100755 +new file mode 100644 index 000000000000..9dd9253c7e95 --- /dev/null +++ b/drivers/gpu/arm/bifrost/protected_mode_switcher.h @@ -288375,7 +288401,7 @@ index 000000000000..9dd9253c7e95 + +#endif /* _PROTECTED_MODE_SWITCH_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/Kbuild b/drivers/gpu/arm/bifrost/tests/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..38e4dd4d712a --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/Kbuild @@ -288412,7 +288438,7 @@ index 000000000000..38e4dd4d712a +obj-$(CONFIG_MALI_KUTF_MGM_INTEGRATION) += mali_kutf_mgm_integration_test/ + diff --git a/drivers/gpu/arm/bifrost/tests/Kconfig b/drivers/gpu/arm/bifrost/tests/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..e9fe22771416 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/Kconfig @@ -288539,7 +288565,7 @@ index 000000000000..5581ba934cd3 + srcs: [".*_unit_test/"], +} diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers.h -new file mode 100755 +new file mode 100644 index 000000000000..3f68efa4257d --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers.h @@ -288654,7 +288680,7 @@ index 000000000000..3f68efa4257d + +#endif /* _KERNEL_UTF_HELPERS_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers_user.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers_user.h -new file mode 100755 +new file mode 100644 index 000000000000..e147cbb90154 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers_user.h @@ -288844,7 +288870,7 @@ index 000000000000..e147cbb90154 + +#endif /* _KERNEL_UTF_HELPERS_USER_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_mem.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_mem.h -new file mode 100755 +new file mode 100644 index 000000000000..5d4d96ef39b1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_mem.h @@ -288922,7 +288948,7 @@ index 000000000000..5d4d96ef39b1 +void kutf_mempool_destroy(struct kutf_mempool *pool); +#endif /* _KERNEL_UTF_MEM_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_resultset.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_resultset.h -new file mode 100755 +new file mode 100644 index 000000000000..2fb1a47a59b4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_resultset.h @@ -289108,7 +289134,7 @@ index 000000000000..2fb1a47a59b4 + +#endif /* _KERNEL_UTF_RESULTSET_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_suite.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_suite.h -new file mode 100755 +new file mode 100644 index 000000000000..9e459c556013 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_suite.h @@ -289685,7 +289711,7 @@ index 000000000000..9e459c556013 + +#endif /* _KERNEL_UTF_SUITE_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_utils.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_utils.h -new file mode 100755 +new file mode 100644 index 000000000000..f6e758b80d98 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_utils.h @@ -289751,7 +289777,7 @@ index 000000000000..f6e758b80d98 + +#endif /* _KERNEL_UTF_UTILS_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/kutf/Kbuild b/drivers/gpu/arm/bifrost/tests/kutf/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..c4790bc66c23 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/Kbuild @@ -289788,7 +289814,7 @@ index 000000000000..c4790bc66c23 + kutf_helpers_user.o +endif diff --git a/drivers/gpu/arm/bifrost/tests/kutf/build.bp b/drivers/gpu/arm/bifrost/tests/kutf/build.bp -new file mode 100755 +new file mode 100644 index 000000000000..89edae9c5e6f --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/build.bp @@ -289836,7 +289862,7 @@ index 000000000000..89edae9c5e6f + }, +} diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers.c -new file mode 100755 +new file mode 100644 index 000000000000..42736195e071 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers.c @@ -289983,7 +290009,7 @@ index 000000000000..42736195e071 +} +EXPORT_SYMBOL(kutf_helper_stop_ignoring_dmesg); diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers_user.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers_user.c -new file mode 100755 +new file mode 100644 index 000000000000..c4e294325262 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers_user.c @@ -290463,7 +290489,7 @@ index 000000000000..c4e294325262 +} +EXPORT_SYMBOL(kutf_helper_output_named_val); diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_mem.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_mem.c -new file mode 100755 +new file mode 100644 index 000000000000..716970abb8c4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_mem.c @@ -290576,7 +290602,7 @@ index 000000000000..716970abb8c4 +} +EXPORT_SYMBOL(kutf_mempool_alloc); diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_resultset.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_resultset.c -new file mode 100755 +new file mode 100644 index 000000000000..3a7ade2831b3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_resultset.c @@ -290745,7 +290771,7 @@ index 000000000000..3a7ade2831b3 + spin_unlock(&kutf_result_lock); +} diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_suite.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_suite.c -new file mode 100755 +new file mode 100644 index 000000000000..4468066f1b27 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_suite.c @@ -291967,7 +291993,7 @@ index 000000000000..4468066f1b27 +module_init(init_kutf_core); +module_exit(exit_kutf_core); diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_utils.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_utils.c -new file mode 100755 +new file mode 100644 index 000000000000..21f5fadcc5f6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_utils.c @@ -292048,7 +292074,7 @@ index 000000000000..21f5fadcc5f6 +} +EXPORT_SYMBOL(kutf_dsprintf); diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Kbuild b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..027bc27c9d3c --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Kbuild @@ -292079,7 +292105,7 @@ index 000000000000..027bc27c9d3c +mali_kutf_clk_rate_trace_test_portal-y := mali_kutf_clk_rate_trace_test.o +endif diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/build.bp b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/build.bp -new file mode 100755 +new file mode 100644 index 000000000000..225ad69c5042 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/build.bp @@ -292128,7 +292154,7 @@ index 000000000000..225ad69c5042 + }, +} diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c -new file mode 100755 +new file mode 100644 index 000000000000..a6f54b61d4ad --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c @@ -293099,7 +293125,7 @@ index 000000000000..a6f54b61d4ad + +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/mali_kutf_clk_rate_trace_test.h b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/mali_kutf_clk_rate_trace_test.h -new file mode 100755 +new file mode 100644 index 000000000000..a716b9f70135 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/mali_kutf_clk_rate_trace_test.h @@ -293259,7 +293285,7 @@ index 000000000000..a716b9f70135 + +#endif /* _KUTF_CLK_RATE_TRACE_TEST_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Kbuild b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..213d6d5ea317 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Kbuild @@ -293290,7 +293316,7 @@ index 000000000000..213d6d5ea317 +mali_kutf_irq_test-y := mali_kutf_irq_test_main.o +endif diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/build.bp b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/build.bp -new file mode 100755 +new file mode 100644 index 000000000000..155875b9d5cc --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/build.bp @@ -293338,7 +293364,7 @@ index 000000000000..155875b9d5cc + }, +} diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c -new file mode 100755 +new file mode 100644 index 000000000000..f2a014d9b5ca --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c @@ -293948,7 +293974,7 @@ index 000000000000..558be077d483 + +bifrost_kbase-y += thirdparty/mali_kbase_mmap.o diff --git a/drivers/gpu/arm/bifrost/thirdparty/mali_kbase_mmap.c b/drivers/gpu/arm/bifrost/thirdparty/mali_kbase_mmap.c -new file mode 100755 +new file mode 100644 index 000000000000..1e636b9a7759 --- /dev/null +++ b/drivers/gpu/arm/bifrost/thirdparty/mali_kbase_mmap.c @@ -294412,7 +294438,7 @@ index 000000000000..1c684d489d6f + bifrost_kbase-y += tl/backend/mali_kbase_timeline_jm.o +endif diff --git a/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_csf.c b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_csf.c -new file mode 100755 +new file mode 100644 index 000000000000..a6062f170ff9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_csf.c @@ -294608,7 +294634,7 @@ index 000000000000..a6062f170ff9 + kbase_timeline_streams_flush(timeline); +} diff --git a/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_jm.c b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_jm.c -new file mode 100755 +new file mode 100644 index 000000000000..9ba89f59f03b --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_jm.c @@ -294710,7 +294736,7 @@ index 000000000000..9ba89f59f03b + kbase_timeline_streams_flush(timeline); +} diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.c b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.c -new file mode 100755 +new file mode 100644 index 000000000000..9ed59633c41b --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.c @@ -295128,7 +295154,7 @@ index 000000000000..9ed59633c41b +} +#endif /* MALI_UNIT_TEST */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.h -new file mode 100755 +new file mode 100644 index 000000000000..62be6c64c850 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.h @@ -295262,7 +295288,7 @@ index 000000000000..62be6c64c850 + +#endif /* _KBASE_TIMELINE_H */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_io.c b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_io.c -new file mode 100755 +new file mode 100644 index 000000000000..ae570064e7d0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_io.c @@ -295733,7 +295759,7 @@ index 000000000000..ae570064e7d0 + return kbase_timeline_streams_flush(filp->private_data); +} diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_priv.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_priv.h -new file mode 100755 +new file mode 100644 index 000000000000..de30bccc7cca --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_priv.h @@ -295842,7 +295868,7 @@ index 000000000000..de30bccc7cca + +#endif /* _KBASE_TIMELINE_PRIV_H */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tl_serialize.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_tl_serialize.h -new file mode 100755 +new file mode 100644 index 000000000000..b6aaadedc6b9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tl_serialize.h @@ -295971,7 +295997,7 @@ index 000000000000..b6aaadedc6b9 +} +#endif /* _KBASE_TL_SERIALIZE_H */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.c b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.c -new file mode 100755 +new file mode 100644 index 000000000000..47059deb4da2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.c @@ -296290,7 +296316,7 @@ index 000000000000..47059deb4da2 + return wb_size; +} diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.h -new file mode 100755 +new file mode 100644 index 000000000000..c1428495b11c --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.h @@ -296464,7 +296490,7 @@ index 000000000000..c1428495b11c + +#endif /* _KBASE_TLSTREAM_H */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.c b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.c -new file mode 100755 +new file mode 100644 index 000000000000..f62c75583566 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.c @@ -300693,7 +300719,7 @@ index 000000000000..f62c75583566 + +/* clang-format on */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.h -new file mode 100755 +new file mode 100644 index 000000000000..06e4ca4a6bc2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.h @@ -305081,14 +305107,14 @@ index 000000000000..06e4ca4a6bc2 +/* clang-format on */ +#endif diff --git a/drivers/gpu/arm/mali400/.gitignore b/drivers/gpu/arm/mali400/.gitignore -new file mode 100755 +new file mode 100644 index 000000000000..d91c8078a009 --- /dev/null +++ b/drivers/gpu/arm/mali400/.gitignore @@ -0,0 +1 @@ +./mali/__malidrv_build_info.c diff --git a/drivers/gpu/arm/mali400/Kbuild b/drivers/gpu/arm/mali400/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..dbb7ad3e5d85 --- /dev/null +++ b/drivers/gpu/arm/mali400/Kbuild @@ -305096,14 +305122,14 @@ index 000000000000..dbb7ad3e5d85 +# SPDX-License-Identifier: GPL-2.0 +obj-y += mali/ diff --git a/drivers/gpu/arm/mali400/mali/.gitignore b/drivers/gpu/arm/mali400/mali/.gitignore -new file mode 100755 +new file mode 100644 index 000000000000..6b1a3ed27a7f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/.gitignore @@ -0,0 +1 @@ +__malidrv_build_info.c diff --git a/drivers/gpu/arm/mali400/mali/Kbuild b/drivers/gpu/arm/mali400/mali/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..7390ab758f22 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/Kbuild @@ -305363,7 +305389,7 @@ index 000000000000..7390ab758f22 +$(src)/__malidrv_build_info.c: + @echo 'const char *__malidrv_build_info(void) { return "malidrv: $(VERSION_STRINGS)";}' > $(src)/__malidrv_build_info.c diff --git a/drivers/gpu/arm/mali400/mali/Kconfig b/drivers/gpu/arm/mali400/mali/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..082919d91825 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/Kconfig @@ -305488,7 +305514,7 @@ index 000000000000..082919d91825 + + If unsure, say N. diff --git a/drivers/gpu/arm/mali400/mali/Makefile b/drivers/gpu/arm/mali400/mali/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..0b91321a5af1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/Makefile @@ -305700,7 +305726,7 @@ index 000000000000..0b91321a5af1 + +export CONFIG KBUILD_EXTRA_SYMBOLS diff --git a/drivers/gpu/arm/mali400/mali/common/mali_broadcast.c b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.c -new file mode 100755 +new file mode 100644 index 000000000000..79a418c36ccb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.c @@ -305848,7 +305874,7 @@ index 000000000000..79a418c36ccb + 0x0); +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_broadcast.h b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.h -new file mode 100755 +new file mode 100644 index 000000000000..0475b7171d8d --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.h @@ -305911,7 +305937,7 @@ index 000000000000..0475b7171d8d + +#endif /* __MALI_BROADCAST_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_control_timer.c b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.c -new file mode 100755 +new file mode 100644 index 000000000000..5bed27a8c5c9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.c @@ -306056,7 +306082,7 @@ index 000000000000..5bed27a8c5c9 + } +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_control_timer.h b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.h -new file mode 100755 +new file mode 100644 index 000000000000..c9e6e058ea8e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.h @@ -306092,7 +306118,7 @@ index 000000000000..c9e6e058ea8e +#endif /* __MALI_CONTROL_TIMER_H__ */ + diff --git a/drivers/gpu/arm/mali400/mali/common/mali_dlbu.c b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.c -new file mode 100755 +new file mode 100644 index 000000000000..99b7f360768b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.c @@ -306311,7 +306337,7 @@ index 000000000000..99b7f360768b + +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_dlbu.h b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.h -new file mode 100755 +new file mode 100644 index 000000000000..a7ecf41471d8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.h @@ -306362,7 +306388,7 @@ index 000000000000..a7ecf41471d8 + +#endif /* __MALI_DLBU_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.c b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.c -new file mode 100755 +new file mode 100644 index 000000000000..55b21a410754 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.c @@ -306676,7 +306702,7 @@ index 000000000000..55b21a410754 +#endif + diff --git a/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.h b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.h -new file mode 100755 +new file mode 100644 index 000000000000..662348c4e6ac --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.h @@ -306716,7 +306742,7 @@ index 000000000000..662348c4e6ac + +#endif/* __MALI_DVFS_POLICY_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_executor.c b/drivers/gpu/arm/mali400/mali/common/mali_executor.c -new file mode 100755 +new file mode 100644 index 000000000000..0cf1ec0b0d02 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_executor.c @@ -309429,7 +309455,7 @@ index 000000000000..0cf1ec0b0d02 + mali_executor_unlock(); +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_executor.h b/drivers/gpu/arm/mali400/mali/common/mali_executor.h -new file mode 100755 +new file mode 100644 index 000000000000..4224d6a6cdc4 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_executor.h @@ -309537,7 +309563,7 @@ index 000000000000..4224d6a6cdc4 +void mali_executor_unlock(void); +#endif /* __MALI_EXECUTOR_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_gp.c b/drivers/gpu/arm/mali400/mali/common/mali_gp.c -new file mode 100755 +new file mode 100644 index 000000000000..7d3d4aff7c3f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp.c @@ -309900,7 +309926,7 @@ index 000000000000..7d3d4aff7c3f + } +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_gp.h b/drivers/gpu/arm/mali400/mali/common/mali_gp.h -new file mode 100755 +new file mode 100644 index 000000000000..3156310f21c7 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp.h @@ -310033,7 +310059,7 @@ index 000000000000..3156310f21c7 + +#endif /* __MALI_GP_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_gp_job.c b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.c -new file mode 100755 +new file mode 100644 index 000000000000..5d4d9f2530d3 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.c @@ -310345,7 +310371,7 @@ index 000000000000..5d4d9f2530d3 + return schedule_mask; +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_gp_job.h b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.h -new file mode 100755 +new file mode 100644 index 000000000000..b84333f9f810 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.h @@ -310675,7 +310701,7 @@ index 000000000000..b84333f9f810 + +#endif /* __MALI_GP_JOB_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_group.c b/drivers/gpu/arm/mali400/mali/common/mali_group.c -new file mode 100755 +new file mode 100644 index 000000000000..47979a2f1a35 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_group.c @@ -312556,7 +312582,7 @@ index 000000000000..47979a2f1a35 +} +#endif /* #if defined(CONFIG_MALI400_PROFILING) */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_group.h b/drivers/gpu/arm/mali400/mali/common/mali_group.h -new file mode 100755 +new file mode 100644 index 000000000000..32481e4a6748 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_group.h @@ -313022,7 +313048,7 @@ index 000000000000..32481e4a6748 + +#endif /* __MALI_GROUP_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_hw_core.c b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.c -new file mode 100755 +new file mode 100644 index 000000000000..a813816e998d --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.c @@ -313075,7 +313101,7 @@ index 000000000000..a813816e998d + _mali_osk_mem_unreqregion(core->phys_addr, core->size); +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_hw_core.h b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.h -new file mode 100755 +new file mode 100644 index 000000000000..38d96e240a20 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.h @@ -313192,7 +313218,7 @@ index 000000000000..38d96e240a20 + +#endif /* __MALI_HW_CORE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_common.h b/drivers/gpu/arm/mali400/mali/common/mali_kernel_common.h -new file mode 100755 +new file mode 100644 index 000000000000..6a8f0f0116a4 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_common.h @@ -313379,7 +313405,7 @@ index 000000000000..6a8f0f0116a4 + +#endif /* __MALI_KERNEL_COMMON_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.c b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.c -new file mode 100755 +new file mode 100644 index 000000000000..87f97b710257 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.c @@ -314734,7 +314760,7 @@ index 000000000000..87f97b710257 +} +#endif diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.h b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.h -new file mode 100755 +new file mode 100644 index 000000000000..c471fc955107 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.h @@ -314797,7 +314823,7 @@ index 000000000000..c471fc955107 +} +#endif /* __MALI_KERNEL_CORE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.c b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.c -new file mode 100755 +new file mode 100644 index 000000000000..d1b8dc3b0b0e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.c @@ -315243,7 +315269,7 @@ index 000000000000..d1b8dc3b0b0e + return last_utilization_pp; +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.h b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.h -new file mode 100755 +new file mode 100644 index 000000000000..06f585dcb238 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.h @@ -315321,7 +315347,7 @@ index 000000000000..06f585dcb238 + +#endif /* __MALI_KERNEL_UTILIZATION_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_vsync.c b/drivers/gpu/arm/mali400/mali/common/mali_kernel_vsync.c -new file mode 100755 +new file mode 100644 index 000000000000..dd44e5e7fa03 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_vsync.c @@ -315372,7 +315398,7 @@ index 000000000000..dd44e5e7fa03 +} + diff --git a/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.c b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.c -new file mode 100755 +new file mode 100644 index 000000000000..fe33f561b2aa --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.c @@ -315912,7 +315938,7 @@ index 000000000000..fe33f561b2aa + return _MALI_OSK_ERR_OK; +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.h b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.h -new file mode 100755 +new file mode 100644 index 000000000000..c48a8844075f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.h @@ -316042,7 +316068,7 @@ index 000000000000..c48a8844075f + +#endif /* __MALI_KERNEL_L2_CACHE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.c b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.c -new file mode 100755 +new file mode 100644 index 000000000000..eb95998f1469 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.c @@ -316116,7 +316142,7 @@ index 000000000000..eb95998f1469 + return _MALI_OSK_ERR_OK; +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.h b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.h -new file mode 100755 +new file mode 100644 index 000000000000..05013f46f901 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.h @@ -316141,7 +316167,7 @@ index 000000000000..05013f46f901 + +#endif /* __MALI_MEM_VALIDATION_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mmu.c b/drivers/gpu/arm/mali400/mali/common/mali_mmu.c -new file mode 100755 +new file mode 100644 index 000000000000..b82486fa66c0 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu.c @@ -316580,7 +316606,7 @@ index 000000000000..b82486fa66c0 +} +#endif diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mmu.h b/drivers/gpu/arm/mali400/mali/common/mali_mmu.h -new file mode 100755 +new file mode 100644 index 000000000000..6ed48585f3d2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu.h @@ -316710,7 +316736,7 @@ index 000000000000..6ed48585f3d2 + +#endif /* __MALI_MMU_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.c b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.c -new file mode 100755 +new file mode 100644 index 000000000000..9ad3e8970b7d --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.c @@ -317211,7 +317237,7 @@ index 000000000000..9ad3e8970b7d + MALI_SUCCESS; +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.h b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.h -new file mode 100755 +new file mode 100644 index 000000000000..3fdf07210259 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.h @@ -317327,7 +317353,7 @@ index 000000000000..3fdf07210259 + +#endif /* __MALI_MMU_PAGE_DIRECTORY_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk.h b/drivers/gpu/arm/mali400/mali/common/mali_osk.h -new file mode 100755 +new file mode 100644 index 000000000000..9ade362d6b28 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk.h @@ -318722,7 +318748,7 @@ index 000000000000..9ade362d6b28 + +#endif /* __MALI_OSK_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_bitops.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_bitops.h -new file mode 100755 +new file mode 100644 index 000000000000..bb1831753a40 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_bitops.h @@ -318890,7 +318916,7 @@ index 000000000000..bb1831753a40 + +#endif /* __MALI_OSK_BITOPS_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_list.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_list.h -new file mode 100755 +new file mode 100644 index 000000000000..9af2d7d4d621 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_list.h @@ -319169,7 +319195,7 @@ index 000000000000..9af2d7d4d621 + +#endif /* __MALI_OSK_LIST_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_mali.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_mali.h -new file mode 100755 +new file mode 100644 index 000000000000..a4c1618e9252 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_mali.h @@ -319330,7 +319356,7 @@ index 000000000000..a4c1618e9252 + +#endif /* __MALI_OSK_MALI_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_profiling.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_profiling.h -new file mode 100755 +new file mode 100644 index 000000000000..6e4583db1c80 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_profiling.h @@ -319482,7 +319508,7 @@ index 000000000000..6e4583db1c80 + + diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_types.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_types.h -new file mode 100755 +new file mode 100644 index 000000000000..b6fa94ce16b3 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_types.h @@ -319959,7 +319985,7 @@ index 000000000000..b6fa94ce16b3 + +#endif /* __MALI_OSK_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm.c b/drivers/gpu/arm/mali400/mali/common/mali_pm.c -new file mode 100755 +new file mode 100644 index 000000000000..3989a33aeaef --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm.c @@ -321327,7 +321353,7 @@ index 000000000000..3989a33aeaef + return pd_mask_wanted; +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm.h b/drivers/gpu/arm/mali400/mali/common/mali_pm.h -new file mode 100755 +new file mode 100644 index 000000000000..dac69958e034 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm.h @@ -321424,7 +321450,7 @@ index 000000000000..dac69958e034 +u32 mali_pm_get_wanted_mask(void); +#endif /* __MALI_PM_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.c b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.c -new file mode 100755 +new file mode 100644 index 000000000000..8290f7d88f6a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.c @@ -321639,7 +321665,7 @@ index 000000000000..8290f7d88f6a +} +#endif diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.h b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.h -new file mode 100755 +new file mode 100644 index 000000000000..5776abe39f3d --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.h @@ -321749,7 +321775,7 @@ index 000000000000..5776abe39f3d + +#endif /* __MALI_PM_DOMAIN_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.c b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.c -new file mode 100755 +new file mode 100644 index 000000000000..cf74823230f7 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.c @@ -322010,7 +322036,7 @@ index 000000000000..cf74823230f7 + _mali_osk_spinlock_irq_unlock(mdev->mali_metrics.lock); +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.h b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.h -new file mode 100755 +new file mode 100644 index 000000000000..2b136b0de4e3 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.h @@ -322090,7 +322116,7 @@ index 000000000000..2b136b0de4e3 +#endif +#endif /* __MALI_PM_METRICS_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pmu.c b/drivers/gpu/arm/mali400/mali/common/mali_pmu.c -new file mode 100755 +new file mode 100644 index 000000000000..6f0af59f6fd4 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pmu.c @@ -322366,7 +322392,7 @@ index 000000000000..6f0af59f6fd4 + return _MALI_OSK_ERR_OK; +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pmu.h b/drivers/gpu/arm/mali400/mali/common/mali_pmu.h -new file mode 100755 +new file mode 100644 index 000000000000..5b856240fdac --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pmu.h @@ -322495,7 +322521,7 @@ index 000000000000..5b856240fdac + +#endif /* __MALI_PMU_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pp.c b/drivers/gpu/arm/mali400/mali/common/mali_pp.c -new file mode 100755 +new file mode 100644 index 000000000000..2dd8b8766f8e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp.c @@ -323003,7 +323029,7 @@ index 000000000000..2dd8b8766f8e +} +#endif diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pp.h b/drivers/gpu/arm/mali400/mali/common/mali_pp.h -new file mode 100755 +new file mode 100644 index 000000000000..f98b29866ffa --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp.h @@ -323147,7 +323173,7 @@ index 000000000000..f98b29866ffa + +#endif /* __MALI_PP_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pp_job.c b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.c -new file mode 100755 +new file mode 100644 index 000000000000..b0216d4c1ac8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.c @@ -323469,7 +323495,7 @@ index 000000000000..b0216d4c1ac8 + return pp_counter_per_sub_job_src1[sub_job]; +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pp_job.h b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.h -new file mode 100755 +new file mode 100644 index 000000000000..d0331f398ff9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.h @@ -324069,7 +324095,7 @@ index 000000000000..d0331f398ff9 + +#endif /* __MALI_PP_JOB_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_scheduler.c b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.c -new file mode 100755 +new file mode 100644 index 000000000000..b5e6cfddbb0e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.c @@ -325623,7 +325649,7 @@ index 000000000000..b5e6cfddbb0e + mali_executor_running_status_print(); +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_scheduler.h b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.h -new file mode 100755 +new file mode 100644 index 000000000000..de81a421ea9a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.h @@ -325760,7 +325786,7 @@ index 000000000000..de81a421ea9a + +#endif /* __MALI_SCHEDULER_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_scheduler_types.h b/drivers/gpu/arm/mali400/mali/common/mali_scheduler_types.h -new file mode 100755 +new file mode 100644 index 000000000000..ba1d71d01d46 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler_types.h @@ -325795,7 +325821,7 @@ index 000000000000..ba1d71d01d46 + +#endif /* __MALI_SCHEDULER_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_session.c b/drivers/gpu/arm/mali400/mali/common/mali_session.c -new file mode 100755 +new file mode 100644 index 000000000000..7504fb108779 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_session.c @@ -325956,7 +325982,7 @@ index 000000000000..7504fb108779 +#endif +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_session.h b/drivers/gpu/arm/mali400/mali/common/mali_session.h -new file mode 100755 +new file mode 100644 index 000000000000..da8b9927ee60 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_session.h @@ -326098,7 +326124,7 @@ index 000000000000..da8b9927ee60 + +#endif /* __MALI_SESSION_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_soft_job.c b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.c -new file mode 100755 +new file mode 100644 index 000000000000..35cd830bc83a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.c @@ -326542,7 +326568,7 @@ index 000000000000..35cd830bc83a + } +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_soft_job.h b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.h -new file mode 100755 +new file mode 100644 index 000000000000..018ef4c527d9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.h @@ -326738,7 +326764,7 @@ index 000000000000..018ef4c527d9 + +#endif /* __MALI_SOFT_JOB_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.c b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.c -new file mode 100755 +new file mode 100644 index 000000000000..f829e99f02ab --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.c @@ -326821,7 +326847,7 @@ index 000000000000..f829e99f02ab + } +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.h b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.h -new file mode 100755 +new file mode 100644 index 000000000000..4d788ec1bbe4 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.h @@ -326897,7 +326923,7 @@ index 000000000000..4d788ec1bbe4 + +#endif /* __MALI_SPINLOCK_REENTRANT_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline.c b/drivers/gpu/arm/mali400/mali/common/mali_timeline.c -new file mode 100755 +new file mode 100644 index 000000000000..ffffee9306ce --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline.c @@ -328867,7 +328893,7 @@ index 000000000000..ffffee9306ce +} +#endif diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline.h b/drivers/gpu/arm/mali400/mali/common/mali_timeline.h -new file mode 100755 +new file mode 100644 index 000000000000..3e8bfc8fb733 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline.h @@ -329460,7 +329486,7 @@ index 000000000000..3e8bfc8fb733 + +#endif /* __MALI_TIMELINE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.c b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.c -new file mode 100755 +new file mode 100644 index 000000000000..1ab13f50997f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.c @@ -329684,7 +329710,7 @@ index 000000000000..1ab13f50997f + } +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.h b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.h -new file mode 100755 +new file mode 100644 index 000000000000..9da12baeef1a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.h @@ -329757,7 +329783,7 @@ index 000000000000..9da12baeef1a + +#endif /* __MALI_TIMELINE_FENCE_WAIT_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.c b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.c -new file mode 100755 +new file mode 100644 index 000000000000..bb7f6a04e8bd --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.c @@ -329942,7 +329968,7 @@ index 000000000000..bb7f6a04e8bd +} +#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.h b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.h -new file mode 100755 +new file mode 100644 index 000000000000..65e368ae7c9e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.h @@ -329999,7 +330025,7 @@ index 000000000000..65e368ae7c9e + +#endif /* __MALI_TIMELINE_SYNC_FENCE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_ukk.h b/drivers/gpu/arm/mali400/mali/common/mali_ukk.h -new file mode 100755 +new file mode 100644 index 000000000000..55a05c50436a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_ukk.h @@ -330556,7 +330582,7 @@ index 000000000000..55a05c50436a + +#endif /* __MALI_UKK_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.c b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.c -new file mode 100755 +new file mode 100644 index 000000000000..1911eff87a72 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.c @@ -330709,7 +330735,7 @@ index 000000000000..1911eff87a72 + return _MALI_OSK_ERR_OK; +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.h b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.h -new file mode 100755 +new file mode 100644 index 000000000000..da9c0630e371 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.h @@ -330754,7 +330780,7 @@ index 000000000000..da9c0630e371 +#endif +#endif /* __MALI_KERNEL_USER_SETTING__ */ diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard.h -new file mode 100755 +new file mode 100644 index 000000000000..7df55c951d6f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard.h @@ -331286,7 +331312,7 @@ index 000000000000..7df55c951d6f + +#endif diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_ioctl.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_ioctl.h -new file mode 100755 +new file mode 100644 index 000000000000..686708eaef75 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_ioctl.h @@ -331389,7 +331415,7 @@ index 000000000000..686708eaef75 + +#endif /* __MALI_UTGARD_IOCTL_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_events.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_events.h -new file mode 100755 +new file mode 100644 index 000000000000..17d31de931d0 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_events.h @@ -331585,7 +331611,7 @@ index 000000000000..17d31de931d0 + +#endif /*_MALI_UTGARD_PROFILING_EVENTS_H_*/ diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_gator_api.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_gator_api.h -new file mode 100755 +new file mode 100644 index 000000000000..c1927d1450dc --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_gator_api.h @@ -331896,7 +331922,7 @@ index 000000000000..c1927d1450dc + +#endif /* __MALI_UTGARD_PROFILING_GATOR_API_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_uk_types.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_uk_types.h -new file mode 100755 +new file mode 100644 index 000000000000..34656f09b2ab --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_uk_types.h @@ -333010,7 +333036,7 @@ index 000000000000..34656f09b2ab + +#endif /* __MALI_UTGARD_UK_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/license/gpl/mali_kernel_license.h b/drivers/gpu/arm/mali400/mali/linux/license/gpl/mali_kernel_license.h -new file mode 100755 +new file mode 100644 index 000000000000..6fafc6777e48 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/license/gpl/mali_kernel_license.h @@ -333046,7 +333072,7 @@ index 000000000000..6fafc6777e48 + +#endif /* __MALI_KERNEL_LICENSE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c -new file mode 100755 +new file mode 100644 index 000000000000..7438cb4951e2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c @@ -333414,7 +333440,7 @@ index 000000000000..7438cb4951e2 + mdev->devfreq = NULL; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.h b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.h -new file mode 100755 +new file mode 100644 index 000000000000..ba7c017d88dc --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.h @@ -333437,7 +333463,7 @@ index 000000000000..ba7c017d88dc + +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_device_pause_resume.c b/drivers/gpu/arm/mali400/mali/linux/mali_device_pause_resume.c -new file mode 100755 +new file mode 100644 index 000000000000..95c3ea12d645 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_device_pause_resume.c @@ -333479,7 +333505,7 @@ index 000000000000..95c3ea12d645 + +EXPORT_SYMBOL(mali_dev_resume); diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.c b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.c -new file mode 100755 +new file mode 100644 index 000000000000..e026e11e4bc5 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.c @@ -333924,7 +333950,7 @@ index 000000000000..e026e11e4bc5 + ww_acquire_fini(ww_actx); +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.h b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.h -new file mode 100755 +new file mode 100644 index 000000000000..d44f6d1a8926 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.h @@ -334054,7 +334080,7 @@ index 000000000000..d44f6d1a8926 + u32 num_dma_reservation_object, struct ww_acquire_ctx *ww_actx); +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.c b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.c -new file mode 100755 +new file mode 100644 index 000000000000..e13cbad3e513 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.c @@ -334843,7 +334869,7 @@ index 000000000000..e13cbad3e513 +}; +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.h b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.h -new file mode 100755 +new file mode 100644 index 000000000000..dbb29222ba98 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.h @@ -335040,7 +335066,7 @@ index 000000000000..dbb29222ba98 +#endif /*LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)*/ +#endif /* _MALI_INTERNAL_SYNC_H */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c -new file mode 100755 +new file mode 100644 index 000000000000..534db255ed02 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c @@ -336223,7 +336249,7 @@ index 000000000000..534db255ed02 +MODULE_AUTHOR("ARM Ltd."); +MODULE_VERSION(SVN_REV_STRING); diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.h b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.h -new file mode 100755 +new file mode 100644 index 000000000000..be754cb15646 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.h @@ -336265,7 +336291,7 @@ index 000000000000..be754cb15646 + +#endif /* __MALI_KERNEL_LINUX_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.c b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.c -new file mode 100755 +new file mode 100644 index 000000000000..7bda438fef50 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.c @@ -337681,7 +337707,7 @@ index 000000000000..7bda438fef50 + +#endif /* MALI_LICENSE_IS_GPL */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.h b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.h -new file mode 100755 +new file mode 100644 index 000000000000..91580a87c1e1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.h @@ -337716,7 +337742,7 @@ index 000000000000..91580a87c1e1 + +#endif /* __MALI_KERNEL_LINUX_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_linux_trace.h b/drivers/gpu/arm/mali400/mali/linux/mali_linux_trace.h -new file mode 100755 +new file mode 100644 index 000000000000..222260823c81 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_linux_trace.h @@ -337883,7 +337909,7 @@ index 000000000000..222260823c81 +#include + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory.c -new file mode 100755 +new file mode 100644 index 000000000000..dfc769e6cc40 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory.c @@ -338420,7 +338446,7 @@ index 000000000000..dfc769e6cc40 + + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory.h -new file mode 100755 +new file mode 100644 index 000000000000..efebbef235d8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory.h @@ -338569,7 +338595,7 @@ index 000000000000..efebbef235d8 + +#endif /* __MALI_MEMORY_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.c -new file mode 100755 +new file mode 100644 index 000000000000..bccef3576914 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.c @@ -338937,7 +338963,7 @@ index 000000000000..bccef3576914 + return (allocator->total_num - atomic_read(&allocator->free_num)) * _MALI_OSK_MALI_PAGE_SIZE; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.h -new file mode 100755 +new file mode 100644 index 000000000000..70fd9ec25f50 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.h @@ -339001,7 +339027,7 @@ index 000000000000..70fd9ec25f50 + +#endif /* __MALI_BLOCK_ALLOCATOR_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c -new file mode 100755 +new file mode 100644 index 000000000000..54e342a1f7ce --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c @@ -339783,7 +339809,7 @@ index 000000000000..54e342a1f7ce + return _MALI_OSK_ERR_OK; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.h -new file mode 100755 +new file mode 100644 index 000000000000..5f83a37fc8f8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.h @@ -339837,7 +339863,7 @@ index 000000000000..5f83a37fc8f8 +#endif + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.c -new file mode 100755 +new file mode 100644 index 000000000000..a9db577cb851 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.c @@ -340105,7 +340131,7 @@ index 000000000000..a9db577cb851 +} + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.h -new file mode 100755 +new file mode 100644 index 000000000000..defa08d52a46 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.h @@ -340175,7 +340201,7 @@ index 000000000000..defa08d52a46 + +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.c -new file mode 100755 +new file mode 100644 index 000000000000..1f4565127a6b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.c @@ -340550,7 +340576,7 @@ index 000000000000..1f4565127a6b + _mali_osk_free(mem); +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.h -new file mode 100755 +new file mode 100644 index 000000000000..a9b2870389ff --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.h @@ -340609,7 +340635,7 @@ index 000000000000..a9b2870389ff + +#endif /* __MALI_MEMORY_DMA_BUF_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.c -new file mode 100755 +new file mode 100644 index 000000000000..76018b7ab90b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.c @@ -340704,7 +340730,7 @@ index 000000000000..76018b7ab90b +} + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.h -new file mode 100755 +new file mode 100644 index 000000000000..2db178d96233 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.h @@ -340739,7 +340765,7 @@ index 000000000000..2db178d96233 + +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.c -new file mode 100755 +new file mode 100644 index 000000000000..6c0a2e9a8a14 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.c @@ -341737,7 +341763,7 @@ index 000000000000..6c0a2e9a8a14 + return _MALI_OSK_ERR_OK; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.h -new file mode 100755 +new file mode 100644 index 000000000000..23d8cde753a1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.h @@ -341794,7 +341820,7 @@ index 000000000000..23d8cde753a1 +#endif + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.c -new file mode 100755 +new file mode 100644 index 000000000000..9c8214ba3b8e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.c @@ -342610,7 +342636,7 @@ index 000000000000..9c8214ba3b8e + return atomic_read(&mali_mem_os_allocator.allocated_pages) * _MALI_OSK_MALI_PAGE_SIZE; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.h -new file mode 100755 +new file mode 100644 index 000000000000..8c9b35d0b230 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.h @@ -342670,7 +342696,7 @@ index 000000000000..8c9b35d0b230 + +#endif /* __MALI_MEMORY_OS_ALLOC_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.c -new file mode 100755 +new file mode 100644 index 000000000000..63506bfbe9fe --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.c @@ -342846,7 +342872,7 @@ index 000000000000..63506bfbe9fe + + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.h -new file mode 100755 +new file mode 100644 index 000000000000..48691d4790fe --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.h @@ -342882,7 +342908,7 @@ index 000000000000..48691d4790fe + +#endif /* __MALI_MEMORY_SECURE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.c -new file mode 100755 +new file mode 100644 index 000000000000..d682785b9673 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.c @@ -343831,7 +343857,7 @@ index 000000000000..d682785b9673 +} +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.h -new file mode 100755 +new file mode 100644 index 000000000000..5810960e204a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.h @@ -343958,7 +343984,7 @@ index 000000000000..5810960e204a +#endif /* __MALI_MEMORY_SWAP_ALLOC_H__ */ + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_types.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_types.h -new file mode 100755 +new file mode 100644 index 000000000000..33db40929642 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_types.h @@ -344183,7 +344209,7 @@ index 000000000000..33db40929642 +#define MALI_MEM_FLAG_CAN_RESIZE (_MALI_MEMORY_ALLOCATE_RESIZEABLE) +#endif /* __MALI_MEMORY_TYPES__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.c -new file mode 100755 +new file mode 100644 index 000000000000..666d4b0fb1cd --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.c @@ -344343,7 +344369,7 @@ index 000000000000..666d4b0fb1cd +} + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.h -new file mode 100755 +new file mode 100644 index 000000000000..c314c8dcbf1c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.h @@ -344378,7 +344404,7 @@ index 000000000000..c314c8dcbf1c + +#endif /* __MALI_MEMORY_DMA_BUF_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.c -new file mode 100755 +new file mode 100644 index 000000000000..8e13e923c3fb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.c @@ -344542,7 +344568,7 @@ index 000000000000..8e13e923c3fb + } +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.h -new file mode 100755 +new file mode 100644 index 000000000000..33ac99509740 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.h @@ -344568,7 +344594,7 @@ index 000000000000..33ac99509740 + +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.c -new file mode 100755 +new file mode 100644 index 000000000000..0b31e3a23432 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.c @@ -344701,7 +344727,7 @@ index 000000000000..0b31e3a23432 +} + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.h -new file mode 100755 +new file mode 100644 index 000000000000..fd03ed9f2bbb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.h @@ -344742,7 +344768,7 @@ index 000000000000..fd03ed9f2bbb + +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_atomics.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_atomics.c -new file mode 100755 +new file mode 100644 index 000000000000..5bc0e52ebe23 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_atomics.c @@ -344807,7 +344833,7 @@ index 000000000000..5bc0e52ebe23 + return atomic_xchg((atomic_t *)&atom->u.val, val); +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_bitmap.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_bitmap.c -new file mode 100755 +new file mode 100644 index 000000000000..fb9ccd2ad1e2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_bitmap.c @@ -344965,7 +344991,7 @@ index 000000000000..fb9ccd2ad1e2 +} + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_irq.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_irq.c -new file mode 100755 +new file mode 100644 index 000000000000..5c8b9ceab9ab --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_irq.c @@ -345171,7 +345197,7 @@ index 000000000000..5c8b9ceab9ab + return ret; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.c -new file mode 100755 +new file mode 100644 index 000000000000..ed5f0b0da7cb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.c @@ -345464,7 +345490,7 @@ index 000000000000..ed5f0b0da7cb +#endif /* LOCK_ORDER_CHECKING */ +#endif /* DEBUG */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.h b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.h -new file mode 100755 +new file mode 100644 index 000000000000..6fd5af95285b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.h @@ -345796,7 +345822,7 @@ index 000000000000..6fd5af95285b + +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_low_level_mem.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_low_level_mem.c -new file mode 100755 +new file mode 100644 index 000000000000..994b04dad745 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_low_level_mem.c @@ -345948,7 +345974,7 @@ index 000000000000..994b04dad745 + return _MALI_OSK_ERR_OK; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_mali.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_mali.c -new file mode 100755 +new file mode 100644 index 000000000000..a729d0499869 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_mali.c @@ -346459,7 +346485,7 @@ index 000000000000..a729d0499869 + + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_math.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_math.c -new file mode 100755 +new file mode 100644 index 000000000000..0b2d00762771 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_math.c @@ -346492,7 +346518,7 @@ index 000000000000..0b2d00762771 + return fls(input); +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_memory.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_memory.c -new file mode 100755 +new file mode 100644 index 000000000000..174616b566c4 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_memory.c @@ -346559,7 +346585,7 @@ index 000000000000..174616b566c4 + return MALI_TRUE; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_misc.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_misc.c -new file mode 100755 +new file mode 100644 index 000000000000..9845187f8122 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_misc.c @@ -346646,7 +346672,7 @@ index 000000000000..9845187f8122 + return tid; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_notification.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_notification.c -new file mode 100755 +new file mode 100644 index 000000000000..a05f8f066964 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_notification.c @@ -346834,7 +346860,7 @@ index 000000000000..a05f8f066964 + return _MALI_OSK_ERR_OK; /* all ok */ +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_pm.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_pm.c -new file mode 100755 +new file mode 100644 index 000000000000..e28e2eb21fe2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_pm.c @@ -346923,7 +346949,7 @@ index 000000000000..e28e2eb21fe2 +#endif +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_profiling.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_profiling.c -new file mode 100755 +new file mode 100644 index 000000000000..9e977ea4d0ff --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_profiling.c @@ -348211,7 +348237,7 @@ index 000000000000..9e977ea4d0ff +EXPORT_SYMBOL(_mali_profiling_get_api_version); +EXPORT_SYMBOL(_mali_profiling_get_mali_version); diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_specific.h b/drivers/gpu/arm/mali400/mali/linux/mali_osk_specific.h -new file mode 100755 +new file mode 100644 index 000000000000..af51161f9da1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_specific.h @@ -348291,7 +348317,7 @@ index 000000000000..af51161f9da1 + +#endif /* __MALI_OSK_SPECIFIC_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_time.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_time.c -new file mode 100755 +new file mode 100644 index 000000000000..d295e712ac7a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_time.c @@ -348356,7 +348382,7 @@ index 000000000000..d295e712ac7a + return (u64)timespec64_to_ns(&tsval); +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_timers.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_timers.c -new file mode 100755 +new file mode 100644 index 000000000000..d01c1148272a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_timers.c @@ -348438,7 +348464,7 @@ index 000000000000..d01c1148272a + kfree(tim); +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_wait_queue.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wait_queue.c -new file mode 100755 +new file mode 100644 index 000000000000..fa12abd3f5dc --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wait_queue.c @@ -348522,7 +348548,7 @@ index 000000000000..fa12abd3f5dc + kfree(queue); +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_wq.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wq.c -new file mode 100755 +new file mode 100644 index 000000000000..d5e258a83a29 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wq.c @@ -348768,7 +348794,7 @@ index 000000000000..d5e258a83a29 + +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_pmu_power_up_down.c b/drivers/gpu/arm/mali400/mali/linux/mali_pmu_power_up_down.c -new file mode 100755 +new file mode 100644 index 000000000000..931d7f07a1d2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_pmu_power_up_down.c @@ -348797,7 +348823,7 @@ index 000000000000..931d7f07a1d2 + +EXPORT_SYMBOL(mali_perf_set_num_pp_cores); diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_profiling_events.h b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_events.h -new file mode 100755 +new file mode 100644 index 000000000000..4661cac42b3f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_events.h @@ -348820,7 +348846,7 @@ index 000000000000..4661cac42b3f + +#endif /* __MALI_PROFILING_EVENTS_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_profiling_gator_api.h b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_gator_api.h -new file mode 100755 +new file mode 100644 index 000000000000..6fdaa427c4cf --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_gator_api.h @@ -348843,7 +348869,7 @@ index 000000000000..6fdaa427c4cf + +#endif /* __MALI_PROFILING_GATOR_API_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.c b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.c -new file mode 100755 +new file mode 100644 index 000000000000..c3a526f0ad90 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.c @@ -349124,7 +349150,7 @@ index 000000000000..c3a526f0ad90 + return prof_state == MALI_PROFILING_STATE_RETURN ? MALI_TRUE : MALI_FALSE; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.h b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.h -new file mode 100755 +new file mode 100644 index 000000000000..f17b4583307a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.h @@ -349165,7 +349191,7 @@ index 000000000000..f17b4583307a + +#endif /* __MALI_PROFILING_INTERNAL_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_sync.c b/drivers/gpu/arm/mali400/mali/linux/mali_sync.c -new file mode 100755 +new file mode 100644 index 000000000000..0d98b518f1ac --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_sync.c @@ -349836,7 +349862,7 @@ index 000000000000..0d98b518f1ac + + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_sync.h b/drivers/gpu/arm/mali400/mali/linux/mali_sync.h -new file mode 100755 +new file mode 100644 index 000000000000..91be8b9cf314 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_sync.h @@ -350011,7 +350037,7 @@ index 000000000000..91be8b9cf314 + +#endif /* _MALI_SYNC_H_ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_uk_types.h b/drivers/gpu/arm/mali400/mali/linux/mali_uk_types.h -new file mode 100755 +new file mode 100644 index 000000000000..68b27b8be067 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_uk_types.h @@ -350034,7 +350060,7 @@ index 000000000000..68b27b8be067 + +#endif /* __MALI_UK_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_core.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_core.c -new file mode 100755 +new file mode 100644 index 000000000000..0bd1cddb10c6 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_core.c @@ -350211,7 +350237,7 @@ index 000000000000..0bd1cddb10c6 + return 0; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_gp.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_gp.c -new file mode 100755 +new file mode 100644 index 000000000000..68fcd971938a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_gp.c @@ -350308,7 +350334,7 @@ index 000000000000..68fcd971938a + return 0; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_mem.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_mem.c -new file mode 100755 +new file mode 100644 index 000000000000..baea4c688db9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_mem.c @@ -350647,7 +350673,7 @@ index 000000000000..baea4c688db9 +} + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_pp.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_pp.c -new file mode 100755 +new file mode 100644 index 000000000000..a9b0958c06aa --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_pp.c @@ -350758,7 +350784,7 @@ index 000000000000..a9b0958c06aa + return 0; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_profiling.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_profiling.c -new file mode 100755 +new file mode 100644 index 000000000000..8b49ebc50b95 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_profiling.c @@ -350947,7 +350973,7 @@ index 000000000000..8b49ebc50b95 + return 0; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_soft_job.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_soft_job.c -new file mode 100755 +new file mode 100644 index 000000000000..1dd4a7c6fb1e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_soft_job.c @@ -351043,7 +351069,7 @@ index 000000000000..1dd4a7c6fb1e + return map_errcode(err); +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_timeline.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_timeline.c -new file mode 100755 +new file mode 100644 index 000000000000..ff0c909393a4 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_timeline.c @@ -351137,7 +351163,7 @@ index 000000000000..ff0c909393a4 + return 0; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_vsync.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_vsync.c -new file mode 100755 +new file mode 100644 index 000000000000..52519d1f96e0 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_vsync.c @@ -351182,7 +351208,7 @@ index 000000000000..52519d1f96e0 +} + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_wrappers.h b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_wrappers.h -new file mode 100755 +new file mode 100644 index 000000000000..1add628fe323 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_wrappers.h @@ -351270,7 +351296,7 @@ index 000000000000..1add628fe323 + +#endif /* __MALI_UKK_WRAPPERS_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/arm.c b/drivers/gpu/arm/mali400/mali/platform/arm/arm.c -new file mode 100755 +new file mode 100644 index 000000000000..fc7017bbfe08 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm.c @@ -351905,7 +351931,7 @@ index 000000000000..fc7017bbfe08 + } +} diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.c b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.c -new file mode 100755 +new file mode 100644 index 000000000000..7a2fc8107b4f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.c @@ -352033,7 +352059,7 @@ index 000000000000..7a2fc8107b4f + } +} diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.h b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.h -new file mode 100755 +new file mode 100644 index 000000000000..8e0101830749 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.h @@ -352083,7 +352109,7 @@ index 000000000000..8e0101830749 + +#endif /* __ARM_CORE_SCALING_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/juno_opp.c b/drivers/gpu/arm/mali400/mali/platform/arm/juno_opp.c -new file mode 100755 +new file mode 100644 index 000000000000..e4e7ab8b2c2e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/juno_opp.c @@ -352216,7 +352242,7 @@ index 000000000000..e4e7ab8b2c2e +#endif +#endif diff --git a/drivers/gpu/arm/mali400/mali/platform/rk/custom_log.h b/drivers/gpu/arm/mali400/mali/platform/rk/custom_log.h -new file mode 100755 +new file mode 100644 index 000000000000..fe5e1224149e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/rk/custom_log.h @@ -352431,7 +352457,7 @@ index 000000000000..fe5e1224149e + +#endif /* __CUSTOM_LOG_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/platform/rk/rk.c b/drivers/gpu/arm/mali400/mali/platform/rk/rk.c -new file mode 100755 +new file mode 100644 index 000000000000..2b412b5ec569 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/rk/rk.c @@ -353158,7 +353184,7 @@ index 000000000000..2b412b5ec569 + rk_context_deinit(pdev); +} diff --git a/drivers/gpu/arm/mali400/mali/platform/rk/rk_ext.h b/drivers/gpu/arm/mali400/mali/platform/rk/rk_ext.h -new file mode 100755 +new file mode 100644 index 000000000000..bd939350c425 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/rk/rk_ext.h @@ -353201,7 +353227,7 @@ index 000000000000..bd939350c425 +#endif /* __RK_EXT_H__ */ + diff --git a/drivers/gpu/arm/mali400/mali/readme.txt b/drivers/gpu/arm/mali400/mali/readme.txt -new file mode 100755 +new file mode 100644 index 000000000000..6785ac933b38 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/readme.txt @@ -353235,7 +353261,7 @@ index 000000000000..6785ac933b38 +device. See the mali_utgard.h header file for how to set up the Mali GPU +resources. diff --git a/drivers/gpu/arm/mali400/mali/regs/mali_200_regs.h b/drivers/gpu/arm/mali400/mali/regs/mali_200_regs.h -new file mode 100755 +new file mode 100644 index 000000000000..0345fb169a95 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/regs/mali_200_regs.h @@ -353372,7 +353398,7 @@ index 000000000000..0345fb169a95 + +#endif /* _MALI200_REGS_H_ */ diff --git a/drivers/gpu/arm/mali400/mali/regs/mali_gp_regs.h b/drivers/gpu/arm/mali400/mali/regs/mali_gp_regs.h -new file mode 100755 +new file mode 100644 index 000000000000..7f8b58fd6c49 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/regs/mali_gp_regs.h @@ -353550,7 +353576,7 @@ index 000000000000..7f8b58fd6c49 + +#endif diff --git a/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.c b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.c -new file mode 100755 +new file mode 100644 index 000000000000..7df934c12122 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.c @@ -353569,7 +353595,7 @@ index 000000000000..7df934c12122 + +/* This file is intentionally left empty, as all functions are inlined in mali_profiling_sampler.h */ diff --git a/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.h b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.h -new file mode 100755 +new file mode 100644 index 000000000000..f52097c1901b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.h @@ -353623,7 +353649,7 @@ index 000000000000..f52097c1901b + +#endif /* __MALI_TIMESTAMP_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.c b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.c -new file mode 100755 +new file mode 100644 index 000000000000..7df934c12122 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.c @@ -353642,7 +353668,7 @@ index 000000000000..7df934c12122 + +/* This file is intentionally left empty, as all functions are inlined in mali_profiling_sampler.h */ diff --git a/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.h b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.h -new file mode 100755 +new file mode 100644 index 000000000000..709a16a82f31 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.h @@ -353674,7 +353700,7 @@ index 000000000000..709a16a82f31 + +#endif /* __MALI_TIMESTAMP_H__ */ diff --git a/drivers/gpu/arm/mali400/rk_ver_info.txt b/drivers/gpu/arm/mali400/rk_ver_info.txt -new file mode 100755 +new file mode 100644 index 000000000000..2a6cbbbb5a97 --- /dev/null +++ b/drivers/gpu/arm/mali400/rk_ver_info.txt @@ -353691,7 +353717,7 @@ index 000000000000..2a6cbbbb5a97 + 在 mali_control_timer_callback_chain 中使用 mod_timer, 而不再是 add_timer. + diff --git a/drivers/gpu/arm/mali400/ump/Kbuild b/drivers/gpu/arm/mali400/ump/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..a3067ba72459 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/Kbuild @@ -353789,7 +353815,7 @@ index 000000000000..a3067ba72459 +obj-$(CONFIG_UMP) := ump.o + diff --git a/drivers/gpu/arm/mali400/ump/Kconfig b/drivers/gpu/arm/mali400/ump/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..ec3509057732 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/Kconfig @@ -353812,7 +353838,7 @@ index 000000000000..ec3509057732 + This enabled extra debug checks and messages in UMP. + diff --git a/drivers/gpu/arm/mali400/ump/Makefile b/drivers/gpu/arm/mali400/ump/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..88b02a22fce5 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/Makefile @@ -353885,7 +353911,7 @@ index 000000000000..88b02a22fce5 + $(MAKE) -C $(KDIR) M=$(CURDIR) clean + $(MAKE) -C $(KDIR) M=$(CURDIR)/../mali clean diff --git a/drivers/gpu/arm/mali400/ump/Makefile.common b/drivers/gpu/arm/mali400/ump/Makefile.common -new file mode 100755 +new file mode 100644 index 000000000000..ad2c18da98a0 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/Makefile.common @@ -353911,7 +353937,7 @@ index 000000000000..ad2c18da98a0 +EXTRA_CFLAGS += -DSVN_REV=$(SVN_REV) +EXTRA_CFLAGS += -DSVN_REV_STRING=\"$(SVN_REV)\" diff --git a/drivers/gpu/arm/mali400/ump/arch-default/config.h b/drivers/gpu/arm/mali400/ump/arch-default/config.h -new file mode 100755 +new file mode 100644 index 000000000000..d4aef9dd09c7 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/arch-default/config.h @@ -353941,7 +353967,7 @@ index 000000000000..d4aef9dd09c7 + +#endif /* __ARCH_CONFIG_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/arch-pb-virtex5/config.h b/drivers/gpu/arm/mali400/ump/arch-pb-virtex5/config.h -new file mode 100755 +new file mode 100644 index 000000000000..182e90c1d64f --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/arch-pb-virtex5/config.h @@ -353965,7 +353991,7 @@ index 000000000000..182e90c1d64f + +#endif /* __ARCH_CONFIG_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/arch/config.h b/drivers/gpu/arm/mali400/ump/arch/config.h -new file mode 100755 +new file mode 100644 index 000000000000..d4aef9dd09c7 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/arch/config.h @@ -353995,7 +354021,7 @@ index 000000000000..d4aef9dd09c7 + +#endif /* __ARCH_CONFIG_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_api.c b/drivers/gpu/arm/mali400/ump/common/ump_kernel_api.c -new file mode 100755 +new file mode 100644 index 000000000000..36adb2f5383e --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_api.c @@ -354456,7 +354482,7 @@ index 000000000000..36adb2f5383e + ump_random_mapping_put(mem); +} diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.c b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.c -new file mode 100755 +new file mode 100644 index 000000000000..73aa9e4c49f9 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.c @@ -354820,7 +354846,7 @@ index 000000000000..73aa9e4c49f9 + return 0; +} diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.h b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.h -new file mode 100755 +new file mode 100644 index 000000000000..aa65f1cb6c88 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.h @@ -354951,7 +354977,7 @@ index 000000000000..aa65f1cb6c88 + +#endif /* __UMP_KERNEL_COMMON_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.c b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.c -new file mode 100755 +new file mode 100644 index 000000000000..e4642f0394c2 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.c @@ -355112,7 +355138,7 @@ index 000000000000..e4642f0394c2 +} + diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.h b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.h -new file mode 100755 +new file mode 100644 index 000000000000..a888ba833fbb --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.h @@ -355207,7 +355233,7 @@ index 000000000000..a888ba833fbb + +#endif /* __UMP_KERNEL_DESCRIPTOR_MAPPING_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_memory_backend.h b/drivers/gpu/arm/mali400/ump/common/ump_kernel_memory_backend.h -new file mode 100755 +new file mode 100644 index 000000000000..2b69f68e87ac --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_memory_backend.h @@ -355261,7 +355287,7 @@ index 000000000000..2b69f68e87ac +#endif /*__UMP_KERNEL_MEMORY_BACKEND_H__ */ + diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_ref_drv.c b/drivers/gpu/arm/mali400/ump/common/ump_kernel_ref_drv.c -new file mode 100755 +new file mode 100644 index 000000000000..0b6434bee00f --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_ref_drv.c @@ -355448,7 +355474,7 @@ index 000000000000..0b6434bee00f + return _MALI_OSK_ERR_OK; +} diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_types.h b/drivers/gpu/arm/mali400/ump/common/ump_kernel_types.h -new file mode 100755 +new file mode 100644 index 000000000000..32f32ccbe9fc --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_types.h @@ -355512,7 +355538,7 @@ index 000000000000..32f32ccbe9fc + +#endif /* __UMP_KERNEL_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/common/ump_osk.h b/drivers/gpu/arm/mali400/ump/common/ump_osk.h -new file mode 100755 +new file mode 100644 index 000000000000..9adc4d3df3f5 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_osk.h @@ -355566,7 +355592,7 @@ index 000000000000..9adc4d3df3f5 + +#endif diff --git a/drivers/gpu/arm/mali400/ump/common/ump_uk_types.h b/drivers/gpu/arm/mali400/ump/common/ump_uk_types.h -new file mode 100755 +new file mode 100644 index 000000000000..db842cdcbeff --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_uk_types.h @@ -355774,7 +355800,7 @@ index 000000000000..db842cdcbeff + +#endif /* __UMP_UK_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/common/ump_ukk.h b/drivers/gpu/arm/mali400/ump/common/ump_ukk.h -new file mode 100755 +new file mode 100644 index 000000000000..f2906768c37f --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_ukk.h @@ -355840,7 +355866,7 @@ index 000000000000..f2906768c37f + +#endif /* __UMP_UKK_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/license/gpl/ump_kernel_license.h b/drivers/gpu/arm/mali400/ump/linux/license/gpl/ump_kernel_license.h -new file mode 100755 +new file mode 100644 index 000000000000..d0174055aa28 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/license/gpl/ump_kernel_license.h @@ -355876,7 +355902,7 @@ index 000000000000..d0174055aa28 + +#endif /* __UMP_KERNEL_LICENSE_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ioctl.h b/drivers/gpu/arm/mali400/ump/linux/ump_ioctl.h -new file mode 100755 +new file mode 100644 index 000000000000..bfb4e8d64885 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ioctl.h @@ -355936,7 +355962,7 @@ index 000000000000..bfb4e8d64885 + +#endif /* __UMP_IOCTL_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c -new file mode 100755 +new file mode 100644 index 000000000000..71b30830c308 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c @@ -356391,7 +356417,7 @@ index 000000000000..71b30830c308 +MODULE_AUTHOR("ARM Ltd."); +MODULE_VERSION(SVN_REV_STRING); diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.h b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.h -new file mode 100755 +new file mode 100644 index 000000000000..8d32ddbb5449 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.h @@ -356415,7 +356441,7 @@ index 000000000000..8d32ddbb5449 + +#endif /* __UMP_KERNEL_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.c b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.c -new file mode 100755 +new file mode 100644 index 000000000000..5a1257a25b82 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.c @@ -356692,7 +356718,7 @@ index 000000000000..5a1257a25b82 + return (allocator->num_blocks - allocator->num_free) * UMP_BLOCK_SIZE; +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.h b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.h -new file mode 100755 +new file mode 100644 index 000000000000..949fd245c6af --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.h @@ -356721,7 +356747,7 @@ index 000000000000..949fd245c6af +#endif /* __UMP_KERNEL_MEMORY_BACKEND_DEDICATED_H__ */ + diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.c b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.c -new file mode 100755 +new file mode 100644 index 000000000000..7cd8d5d381cf --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.c @@ -356962,7 +356988,7 @@ index 000000000000..7cd8d5d381cf + return info->num_pages_allocated * _MALI_OSK_MALI_PAGE_SIZE; +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.h b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.h -new file mode 100755 +new file mode 100644 index 000000000000..d21d503512ec --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.h @@ -356991,7 +357017,7 @@ index 000000000000..d21d503512ec +#endif /* __UMP_KERNEL_MEMORY_BACKEND_OS_H__ */ + diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.c b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.c -new file mode 100755 +new file mode 100644 index 000000000000..6be0f86440de --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.c @@ -357219,7 +357245,7 @@ index 000000000000..6be0f86440de + return mem; +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.h b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.h -new file mode 100755 +new file mode 100644 index 000000000000..2cea6cedc380 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.h @@ -357309,7 +357335,7 @@ index 000000000000..2cea6cedc380 + +#endif /* __UMP_KERNEL_RANDOM_MAPPING_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_memory_backend.c b/drivers/gpu/arm/mali400/ump/linux/ump_memory_backend.c -new file mode 100755 +new file mode 100644 index 000000000000..e41931e1ea75 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_memory_backend.c @@ -357380,7 +357406,7 @@ index 000000000000..e41931e1ea75 + } +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_osk_atomics.c b/drivers/gpu/arm/mali400/ump/linux/ump_osk_atomics.c -new file mode 100755 +new file mode 100644 index 000000000000..2b634ba79c6e --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_osk_atomics.c @@ -357413,7 +357439,7 @@ index 000000000000..2b634ba79c6e + return atomic_inc_return((atomic_t *)&atom->u.val); +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_osk_low_level_mem.c b/drivers/gpu/arm/mali400/ump/linux/ump_osk_low_level_mem.c -new file mode 100755 +new file mode 100644 index 000000000000..e08bf25257b0 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_osk_low_level_mem.c @@ -357733,7 +357759,7 @@ index 000000000000..e08bf25257b0 + return; +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_osk_misc.c b/drivers/gpu/arm/mali400/ump/linux/ump_osk_misc.c -new file mode 100755 +new file mode 100644 index 000000000000..58c9f1bf27b8 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_osk_misc.c @@ -357775,7 +357801,7 @@ index 000000000000..58c9f1bf27b8 + return _MALI_OSK_ERR_OK; +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.c b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.c -new file mode 100755 +new file mode 100644 index 000000000000..56a787ff64dc --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.c @@ -358011,7 +358037,7 @@ index 000000000000..56a787ff64dc +} +#endif diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h -new file mode 100755 +new file mode 100644 index 000000000000..61a7095a6920 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h @@ -358053,7 +358079,7 @@ index 000000000000..61a7095a6920 + +#endif /* __UMP_UKK_REF_WRAPPERS_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.c b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.c -new file mode 100755 +new file mode 100644 index 000000000000..4d6b69608fd4 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.c @@ -358339,7 +358365,7 @@ index 000000000000..4d6b69608fd4 + return 0; /* success */ +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.h b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.h -new file mode 100755 +new file mode 100644 index 000000000000..5f8fc683c8f5 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.h @@ -358391,7 +358417,7 @@ index 000000000000..5f8fc683c8f5 + +#endif /* __UMP_UKK_WRAPPERS_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/readme.txt b/drivers/gpu/arm/mali400/ump/readme.txt -new file mode 100755 +new file mode 100644 index 000000000000..c238cf0f2b1f --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/readme.txt @@ -358425,7 +358451,7 @@ index 000000000000..c238cf0f2b1f +by using the insmod command. The driver can also be built as a part of the +kernel itself. diff --git a/drivers/gpu/arm/mali400/umplock/Makefile b/drivers/gpu/arm/mali400/umplock/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..e5549a33f91d --- /dev/null +++ b/drivers/gpu/arm/mali400/umplock/Makefile @@ -358500,7 +358526,7 @@ index 000000000000..e5549a33f91d + +endif diff --git a/drivers/gpu/arm/mali400/umplock/umplock_driver.c b/drivers/gpu/arm/mali400/umplock/umplock_driver.c -new file mode 100755 +new file mode 100644 index 000000000000..173f4d9bb5c7 --- /dev/null +++ b/drivers/gpu/arm/mali400/umplock/umplock_driver.c @@ -359124,7 +359150,7 @@ index 000000000000..173f4d9bb5c7 +MODULE_AUTHOR("ARM Ltd."); +MODULE_DESCRIPTION("ARM UMP locker"); diff --git a/drivers/gpu/arm/mali400/umplock/umplock_ioctl.h b/drivers/gpu/arm/mali400/umplock/umplock_ioctl.h -new file mode 100755 +new file mode 100644 index 000000000000..8afdaad7000f --- /dev/null +++ b/drivers/gpu/arm/mali400/umplock/umplock_ioctl.h @@ -359196,7 +359222,7 @@ index 000000000000..8afdaad7000f +#endif /* __UMPLOCK_IOCTL_H__ */ + diff --git a/drivers/gpu/arm/midgard/Kbuild b/drivers/gpu/arm/midgard/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..b2c2bbcda668 --- /dev/null +++ b/drivers/gpu/arm/midgard/Kbuild @@ -359423,7 +359449,7 @@ index 000000000000..b2c2bbcda668 +# For kutf and mali_kutf_irq_latency_test +obj-$(CONFIG_MALI_KUTF) += tests/ diff --git a/drivers/gpu/arm/midgard/Kconfig b/drivers/gpu/arm/midgard/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..043bfc0021cc --- /dev/null +++ b/drivers/gpu/arm/midgard/Kconfig @@ -359678,7 +359704,7 @@ index 000000000000..043bfc0021cc +source "drivers/gpu/arm/midgard/platform/Kconfig" +source "drivers/gpu/arm/midgard/tests/Kconfig" diff --git a/drivers/gpu/arm/midgard/Makefile b/drivers/gpu/arm/midgard/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..9aa242c4f8c4 --- /dev/null +++ b/drivers/gpu/arm/midgard/Makefile @@ -359726,7 +359752,7 @@ index 000000000000..9aa242c4f8c4 +clean: + $(MAKE) -C $(KDIR) M=$(CURDIR) clean diff --git a/drivers/gpu/arm/midgard/Makefile.kbase b/drivers/gpu/arm/midgard/Makefile.kbase -new file mode 100755 +new file mode 100644 index 000000000000..2bef9c25eaeb --- /dev/null +++ b/drivers/gpu/arm/midgard/Makefile.kbase @@ -359749,7 +359775,7 @@ index 000000000000..2bef9c25eaeb +EXTRA_CFLAGS += -I$(ROOT) -I$(KBASE_PATH) -I$(OSK_PATH)/src/linux/include -I$(KBASE_PATH)/platform_$(PLATFORM) + diff --git a/drivers/gpu/arm/midgard/backend/gpu/Kbuild b/drivers/gpu/arm/midgard/backend/gpu/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..5f700e9b6b44 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/Kbuild @@ -359815,7 +359841,7 @@ index 000000000000..5f700e9b6b44 + BACKEND += backend/gpu/mali_kbase_model_error_generator.c +endif diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_backend_config.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_backend_config.h -new file mode 100755 +new file mode 100644 index 000000000000..c8ae87eb84a2 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_backend_config.h @@ -359850,7 +359876,7 @@ index 000000000000..c8ae87eb84a2 +#endif /* _KBASE_BACKEND_CONFIG_H_ */ + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.c -new file mode 100755 +new file mode 100644 index 000000000000..fef9a2cb743e --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.c @@ -359885,7 +359911,7 @@ index 000000000000..fef9a2cb743e +} + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.h -new file mode 100755 +new file mode 100644 index 000000000000..fe9869109a82 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.h @@ -359925,7 +359951,7 @@ index 000000000000..fe9869109a82 + +#endif /* _KBASE_CACHE_POLICY_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_debug_job_fault_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_debug_job_fault_backend.c -new file mode 100755 +new file mode 100644 index 000000000000..7851ea6466c7 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_debug_job_fault_backend.c @@ -360088,7 +360114,7 @@ index 000000000000..7851ea6466c7 + +#endif diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c -new file mode 100755 +new file mode 100644 index 000000000000..4e8e56e9baf2 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c @@ -360568,7 +360594,7 @@ index 000000000000..4e8e56e9baf2 + kbase_devfreq_term_core_mask_table(kbdev); +} diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.h -new file mode 100755 +new file mode 100644 index 000000000000..c0bf8b15b3bc --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.h @@ -360598,7 +360624,7 @@ index 000000000000..c0bf8b15b3bc + +#endif /* _BASE_DEVFREQ_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_hw.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_hw.c -new file mode 100755 +new file mode 100644 index 000000000000..dcdf15cdc3e8 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_hw.c @@ -360859,7 +360885,7 @@ index 000000000000..dcdf15cdc3e8 + KBASE_TRACE_ADD(kbdev, CORE_GPU_IRQ_DONE, NULL, NULL, 0u, val); +} diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_internal.h -new file mode 100755 +new file mode 100644 index 000000000000..5b20445932fb --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_internal.h @@ -360932,7 +360958,7 @@ index 000000000000..5b20445932fb + +#endif /* _KBASE_DEVICE_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c -new file mode 100755 +new file mode 100644 index 000000000000..d578fd78e825 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c @@ -361061,7 +361087,7 @@ index 000000000000..d578fd78e825 +} + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c -new file mode 100755 +new file mode 100644 index 000000000000..b395325b556b --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c @@ -361177,7 +361203,7 @@ index 000000000000..b395325b556b +} + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_backend.c -new file mode 100755 +new file mode 100644 index 000000000000..7ad309e8d7f4 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_backend.c @@ -361675,7 +361701,7 @@ index 000000000000..7ad309e8d7f4 +} + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_defs.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_defs.h -new file mode 100755 +new file mode 100644 index 000000000000..4794672da8f0 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_defs.h @@ -361739,7 +361765,7 @@ index 000000000000..4794672da8f0 +#endif /* _KBASE_INSTR_DEFS_H_ */ + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_internal.h -new file mode 100755 +new file mode 100644 index 000000000000..e96aeae786e1 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_internal.h @@ -361790,7 +361816,7 @@ index 000000000000..e96aeae786e1 + +#endif /* _KBASE_INSTR_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_internal.h -new file mode 100755 +new file mode 100644 index 000000000000..8781561e73d0 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_internal.h @@ -361835,7 +361861,7 @@ index 000000000000..8781561e73d0 + +#endif /* _KBASE_IRQ_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_linux.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_linux.c -new file mode 100755 +new file mode 100644 index 000000000000..8416b80e8b77 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_linux.c @@ -362310,7 +362336,7 @@ index 000000000000..8416b80e8b77 + +#endif /* !defined(CONFIG_MALI_NO_MALI) */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_as.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_as.c -new file mode 100755 +new file mode 100644 index 000000000000..92358f2bf298 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_as.c @@ -362553,7 +362579,7 @@ index 000000000000..92358f2bf298 +} + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h -new file mode 100755 +new file mode 100644 index 000000000000..08a7400e66d5 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h @@ -362682,7 +362708,7 @@ index 000000000000..08a7400e66d5 + +#endif /* _KBASE_HWACCESS_GPU_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_hw.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_hw.c -new file mode 100755 +new file mode 100644 index 000000000000..a6fb097b94f9 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_hw.c @@ -364206,7 +364232,7 @@ index 000000000000..a6fb097b94f9 +} +#endif /* KBASE_GPU_RESET_EN */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h -new file mode 100755 +new file mode 100644 index 000000000000..1f382b3c1af4 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h @@ -364376,7 +364402,7 @@ index 000000000000..1f382b3c1af4 + +#endif /* _KBASE_JM_HWACCESS_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c -new file mode 100755 +new file mode 100644 index 000000000000..4b4541660ec4 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c @@ -366334,7 +366360,7 @@ index 000000000000..4b4541660ec4 + + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.h -new file mode 100755 +new file mode 100644 index 000000000000..1e0e05ad3ea4 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.h @@ -366416,7 +366442,7 @@ index 000000000000..1e0e05ad3ea4 + +#endif /* _KBASE_HWACCESS_GPU_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c -new file mode 100755 +new file mode 100644 index 000000000000..54d8ddd80097 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c @@ -366725,7 +366751,7 @@ index 000000000000..54d8ddd80097 +} +#endif /* KBASE_TRACE_ENABLE */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.h -new file mode 100755 +new file mode 100644 index 000000000000..35d9781ae092 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.h @@ -366860,7 +366886,7 @@ index 000000000000..35d9781ae092 + +#endif /* _KBASE_JS_AFFINITY_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_backend.c -new file mode 100755 +new file mode 100644 index 000000000000..a8c1af23a369 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_backend.c @@ -367222,7 +367248,7 @@ index 000000000000..a8c1af23a369 +} + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_internal.h -new file mode 100755 +new file mode 100644 index 000000000000..3f53779c6747 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_internal.h @@ -367297,7 +367323,7 @@ index 000000000000..3f53779c6747 + +#endif /* _KBASE_JS_BACKEND_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.c -new file mode 100755 +new file mode 100644 index 000000000000..ba826184dd3f --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.c @@ -367710,7 +367736,7 @@ index 000000000000..ba826184dd3f + spin_unlock_irqrestore(&kbdev->mmu_mask_change, flags); +} diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.h -new file mode 100755 +new file mode 100644 index 000000000000..c02253c6acc3 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.h @@ -367758,7 +367784,7 @@ index 000000000000..c02253c6acc3 + +#endif /* _MALI_KBASE_MMU_HW_DIRECT_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.c -new file mode 100755 +new file mode 100644 index 000000000000..0614348e935a --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.c @@ -367827,7 +367853,7 @@ index 000000000000..0614348e935a + +KBASE_EXPORT_TEST_API(kbase_pm_always_on_policy_ops); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.h -new file mode 100755 +new file mode 100644 index 000000000000..f9d244b01bc2 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.h @@ -367910,7 +367936,7 @@ index 000000000000..f9d244b01bc2 +#endif /* MALI_KBASE_PM_ALWAYS_ON_H */ + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_backend.c -new file mode 100755 +new file mode 100644 index 000000000000..146fd48bab92 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_backend.c @@ -368398,7 +368424,7 @@ index 000000000000..146fd48bab92 + mutex_unlock(&js_devdata->runpool_mutex); +} diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.c -new file mode 100755 +new file mode 100644 index 000000000000..85890f1e85f5 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.c @@ -368586,7 +368612,7 @@ index 000000000000..85890f1e85f5 + kbase_pm_update_cores_state_nolock(kbdev); +} diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.h -new file mode 100755 +new file mode 100644 index 000000000000..ee9e751f2d79 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.h @@ -368684,7 +368710,7 @@ index 000000000000..ee9e751f2d79 + +#endif /* _KBASE_PM_CA_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.c -new file mode 100755 +new file mode 100644 index 000000000000..66bf660cffb6 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.c @@ -368819,7 +368845,7 @@ index 000000000000..66bf660cffb6 +}; + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.h -new file mode 100755 +new file mode 100644 index 000000000000..7ab3cd4d8460 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.h @@ -368880,7 +368906,7 @@ index 000000000000..7ab3cd4d8460 +#endif /* MALI_KBASE_PM_CA_DEVFREQ_H */ + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.c -new file mode 100755 +new file mode 100644 index 000000000000..864612d31f9b --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.c @@ -368951,7 +368977,7 @@ index 000000000000..864612d31f9b + +KBASE_EXPORT_TEST_API(kbase_pm_ca_fixed_policy_ops); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.h -new file mode 100755 +new file mode 100644 index 000000000000..a763155cb703 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.h @@ -368997,7 +369023,7 @@ index 000000000000..a763155cb703 +#endif /* MALI_KBASE_PM_CA_FIXED_H */ + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.c -new file mode 100755 +new file mode 100644 index 000000000000..f891fa225a89 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.c @@ -369073,7 +369099,7 @@ index 000000000000..f891fa225a89 + +KBASE_EXPORT_TEST_API(kbase_pm_coarse_demand_policy_ops); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.h -new file mode 100755 +new file mode 100644 index 000000000000..749d305eee9a --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.h @@ -369143,7 +369169,7 @@ index 000000000000..749d305eee9a + +#endif /* MALI_KBASE_PM_COARSE_DEMAND_H */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_defs.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_defs.h -new file mode 100755 +new file mode 100644 index 000000000000..352744ee6d73 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_defs.h @@ -369668,7 +369694,7 @@ index 000000000000..352744ee6d73 + +#endif /* _KBASE_PM_HWACCESS_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c -new file mode 100755 +new file mode 100644 index 000000000000..81322fd0dd17 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c @@ -369747,7 +369773,7 @@ index 000000000000..81322fd0dd17 + +KBASE_EXPORT_TEST_API(kbase_pm_demand_policy_ops); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.h -new file mode 100755 +new file mode 100644 index 000000000000..c0c84b6e9189 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.h @@ -369817,7 +369843,7 @@ index 000000000000..c0c84b6e9189 + +#endif /* MALI_KBASE_PM_DEMAND_H */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_driver.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_driver.c -new file mode 100755 +new file mode 100644 index 000000000000..82727937c545 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_driver.c @@ -371536,7 +371562,7 @@ index 000000000000..82727937c545 + +KBASE_EXPORT_TEST_API(kbase_pm_release_gpu_cycle_counter); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_internal.h -new file mode 100755 +new file mode 100644 index 000000000000..6804f45ac27b --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_internal.h @@ -372090,7 +372116,7 @@ index 000000000000..6804f45ac27b + +#endif /* _KBASE_BACKEND_PM_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_metrics.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_metrics.c -new file mode 100755 +new file mode 100644 index 000000000000..024248ca7123 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_metrics.c @@ -372497,7 +372523,7 @@ index 000000000000..024248ca7123 + spin_unlock_irqrestore(&kbdev->pm.backend.metrics.lock, flags); +} diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.c -new file mode 100755 +new file mode 100644 index 000000000000..075f020c66e6 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.c @@ -373476,7 +373502,7 @@ index 000000000000..075f020c66e6 + +KBASE_EXPORT_TEST_API(kbase_pm_release_l2_caches); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.h -new file mode 100755 +new file mode 100644 index 000000000000..611a90e66e65 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.h @@ -373709,7 +373735,7 @@ index 000000000000..611a90e66e65 + +#endif /* _KBASE_PM_POLICY_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c -new file mode 100755 +new file mode 100644 index 000000000000..d08c628dd433 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c @@ -373818,7 +373844,7 @@ index 000000000000..d08c628dd433 +} +#endif /* CONFIG_MALI_NO_MALI */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.h -new file mode 100755 +new file mode 100644 index 000000000000..433aa4b9cb5e --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.h @@ -373876,7 +373902,7 @@ index 000000000000..433aa4b9cb5e + +#endif /* _KBASE_BACKEND_TIME_H_ */ diff --git a/drivers/gpu/arm/midgard/docs/Doxyfile b/drivers/gpu/arm/midgard/docs/Doxyfile -new file mode 100755 +new file mode 100644 index 000000000000..35ff2f1ce4a0 --- /dev/null +++ b/drivers/gpu/arm/midgard/docs/Doxyfile @@ -374008,7 +374034,7 @@ index 000000000000..35ff2f1ce4a0 +DOTFILE_DIRS += ../../kernel/drivers/gpu/arm/midgard/docs + diff --git a/drivers/gpu/arm/midgard/docs/policy_operation_diagram.dot b/drivers/gpu/arm/midgard/docs/policy_operation_diagram.dot -new file mode 100755 +new file mode 100644 index 000000000000..7ae05c2f8ded --- /dev/null +++ b/drivers/gpu/arm/midgard/docs/policy_operation_diagram.dot @@ -374126,7 +374152,7 @@ index 000000000000..7ae05c2f8ded + +} diff --git a/drivers/gpu/arm/midgard/docs/policy_overview.dot b/drivers/gpu/arm/midgard/docs/policy_overview.dot -new file mode 100755 +new file mode 100644 index 000000000000..159b993b7d61 --- /dev/null +++ b/drivers/gpu/arm/midgard/docs/policy_overview.dot @@ -374195,7 +374221,7 @@ index 000000000000..159b993b7d61 + jobslots->job_finish [ style=dotted ]; +} diff --git a/drivers/gpu/arm/midgard/ipa/Kbuild b/drivers/gpu/arm/midgard/ipa/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..602b15f5225c --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/Kbuild @@ -374225,7 +374251,7 @@ index 000000000000..602b15f5225c + midgard_kbase-y += ipa/mali_kbase_ipa_tmix.o +endif diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c -new file mode 100755 +new file mode 100644 index 000000000000..01bdbb4e8eb1 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c @@ -374816,7 +374842,7 @@ index 000000000000..01bdbb4e8eb1 +}; +KBASE_EXPORT_TEST_API(kbase_ipa_power_model_ops); diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.h b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.h -new file mode 100755 +new file mode 100644 index 000000000000..b2d3db149579 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.h @@ -374970,7 +374996,7 @@ index 000000000000..b2d3db149579 + +#endif diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.c b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.c -new file mode 100755 +new file mode 100644 index 000000000000..eafc14009ddc --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.c @@ -375195,7 +375221,7 @@ index 000000000000..eafc14009ddc + mutex_unlock(&kbdev->ipa.lock); +} diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.h b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.h -new file mode 100755 +new file mode 100644 index 000000000000..ec06e2096f94 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.h @@ -375250,7 +375276,7 @@ index 000000000000..ec06e2096f94 + +#endif /* _KBASE_IPA_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_simple.c b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_simple.c -new file mode 100755 +new file mode 100644 index 000000000000..da0a4d4a0e7e --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_simple.c @@ -375478,7 +375504,7 @@ index 000000000000..da0a4d4a0e7e + .do_utilization_scaling_in_framework = true, +}; diff --git a/drivers/gpu/arm/midgard/mali_base_hwconfig_features.h b/drivers/gpu/arm/midgard/mali_base_hwconfig_features.h -new file mode 100755 +new file mode 100644 index 000000000000..6be0a334f99f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_hwconfig_features.h @@ -375795,7 +375821,7 @@ index 000000000000..6be0a334f99f + +#endif /* _BASE_HWCONFIG_FEATURES_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_base_hwconfig_issues.h b/drivers/gpu/arm/midgard/mali_base_hwconfig_issues.h -new file mode 100755 +new file mode 100644 index 000000000000..6d7e5c57e6a4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_hwconfig_issues.h @@ -376899,7 +376925,7 @@ index 000000000000..6d7e5c57e6a4 + +#endif /* _BASE_HWCONFIG_ISSUES_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_base_kernel.h b/drivers/gpu/arm/midgard/mali_base_kernel.h -new file mode 100755 +new file mode 100644 index 000000000000..ea5e473caef6 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_kernel.h @@ -378763,7 +378789,7 @@ index 000000000000..ea5e473caef6 + +#endif /* _BASE_KERNEL_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_base_mem_priv.h b/drivers/gpu/arm/midgard/mali_base_mem_priv.h -new file mode 100755 +new file mode 100644 index 000000000000..4a98a72cc37a --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_mem_priv.h @@ -378821,7 +378847,7 @@ index 000000000000..4a98a72cc37a + +#endif diff --git a/drivers/gpu/arm/midgard/mali_base_vendor_specific_func.h b/drivers/gpu/arm/midgard/mali_base_vendor_specific_func.h -new file mode 100755 +new file mode 100644 index 000000000000..be454a216a39 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_vendor_specific_func.h @@ -378851,7 +378877,7 @@ index 000000000000..be454a216a39 + +#endif /*_BASE_VENDOR_SPEC_FUNC_H_*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase.h b/drivers/gpu/arm/midgard/mali_kbase.h -new file mode 100755 +new file mode 100644 index 000000000000..0d9bf23dc685 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase.h @@ -379469,7 +379495,7 @@ index 000000000000..0d9bf23dc685 + + diff --git a/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.c b/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.c -new file mode 100755 +new file mode 100644 index 000000000000..fde0f8ff8582 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.c @@ -379684,7 +379710,7 @@ index 000000000000..fde0f8ff8582 + return clamped; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.h b/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.h -new file mode 100755 +new file mode 100644 index 000000000000..099a29861672 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.h @@ -379713,7 +379739,7 @@ index 000000000000..099a29861672 + +#endif /* _KBASE_10969_WORKAROUND_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.c -new file mode 100755 +new file mode 100644 index 000000000000..f910fe970feb --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.c @@ -379821,7 +379847,7 @@ index 000000000000..f910fe970feb + return; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.h -new file mode 100755 +new file mode 100644 index 000000000000..3ed2248897fc --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.h @@ -379872,7 +379898,7 @@ index 000000000000..3ed2248897fc + +#endif /*_KBASE_AS_FAULT_DEBUG_FS_H*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase_cache_policy.c b/drivers/gpu/arm/midgard/mali_kbase_cache_policy.c -new file mode 100755 +new file mode 100644 index 000000000000..c67b3e97f1af --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_cache_policy.c @@ -379942,7 +379968,7 @@ index 000000000000..c67b3e97f1af + dma_sync_single_for_cpu(kbdev->dev, handle, size, dir); +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_cache_policy.h b/drivers/gpu/arm/midgard/mali_kbase_cache_policy.h -new file mode 100755 +new file mode 100644 index 000000000000..0c18bdb357b0 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_cache_policy.h @@ -379993,7 +380019,7 @@ index 000000000000..0c18bdb357b0 + +#endif /* _KBASE_CACHE_POLICY_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_config.c b/drivers/gpu/arm/midgard/mali_kbase_config.c -new file mode 100755 +new file mode 100644 index 000000000000..fb615ae02ead --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_config.c @@ -380050,7 +380076,7 @@ index 000000000000..fb615ae02ead +} + diff --git a/drivers/gpu/arm/midgard/mali_kbase_config.h b/drivers/gpu/arm/midgard/mali_kbase_config.h -new file mode 100755 +new file mode 100644 index 000000000000..356d52bcd774 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_config.h @@ -380401,7 +380427,7 @@ index 000000000000..356d52bcd774 + +#endif /* _KBASE_CONFIG_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_config_defaults.h b/drivers/gpu/arm/midgard/mali_kbase_config_defaults.h -new file mode 100755 +new file mode 100644 index 000000000000..1cf44b3500cf --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_config_defaults.h @@ -380634,7 +380660,7 @@ index 000000000000..1cf44b3500cf +#endif /* _KBASE_CONFIG_DEFAULTS_H_ */ + diff --git a/drivers/gpu/arm/midgard/mali_kbase_context.c b/drivers/gpu/arm/midgard/mali_kbase_context.c -new file mode 100755 +new file mode 100644 index 000000000000..6338a7e221ed --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_context.c @@ -380982,7 +381008,7 @@ index 000000000000..6338a7e221ed +} +KBASE_EXPORT_SYMBOL(kbase_context_set_create_flags); diff --git a/drivers/gpu/arm/midgard/mali_kbase_context.h b/drivers/gpu/arm/midgard/mali_kbase_context.h -new file mode 100755 +new file mode 100644 index 000000000000..a3f5bb0ce0da --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_context.h @@ -381078,7 +381104,7 @@ index 000000000000..a3f5bb0ce0da +} +#endif /* _KBASE_CONTEXT_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c -new file mode 100755 +new file mode 100644 index 000000000000..da55cb080d00 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c @@ -386074,7 +386100,7 @@ index 000000000000..da55cb080d00 +#include "mali_linux_kbase_trace.h" +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.c b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.c -new file mode 100755 +new file mode 100644 index 000000000000..ce004841403f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.c @@ -386288,7 +386314,7 @@ index 000000000000..ce004841403f + } +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.h b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.h -new file mode 100755 +new file mode 100644 index 000000000000..47474fecc2a9 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.h @@ -386428,7 +386454,7 @@ index 000000000000..47474fecc2a9 + +#endif /* _KBASE_CTX_SCHED_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug.c b/drivers/gpu/arm/midgard/mali_kbase_debug.c -new file mode 100755 +new file mode 100644 index 000000000000..fb57ac2e31ad --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug.c @@ -386473,7 +386499,7 @@ index 000000000000..fb57ac2e31ad +KBASE_EXPORT_SYMBOL(kbasep_debug_assert_call_hook); + diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug.h b/drivers/gpu/arm/midgard/mali_kbase_debug.h -new file mode 100755 +new file mode 100644 index 000000000000..5fff2892bb55 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug.h @@ -386643,7 +386669,7 @@ index 000000000000..5fff2892bb55 + +#endif /* _KBASE_DEBUG_H */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.c b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.c -new file mode 100755 +new file mode 100644 index 000000000000..f29430ddf8f9 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.c @@ -387148,7 +387174,7 @@ index 000000000000..f29430ddf8f9 + +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.h b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.h -new file mode 100755 +new file mode 100644 index 000000000000..a2bf8983c37c --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.h @@ -387250,7 +387276,7 @@ index 000000000000..a2bf8983c37c + +#endif /*_KBASE_DEBUG_JOB_FAULT_H*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c -new file mode 100755 +new file mode 100644 index 000000000000..6f2cbdf571cb --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c @@ -387562,7 +387588,7 @@ index 000000000000..6f2cbdf571cb + +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.h b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.h -new file mode 100755 +new file mode 100644 index 000000000000..20ab51a776c6 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.h @@ -387593,7 +387619,7 @@ index 000000000000..20ab51a776c6 + +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_defs.h b/drivers/gpu/arm/midgard/mali_kbase_defs.h -new file mode 100755 +new file mode 100644 index 000000000000..f8a6f33df2da --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_defs.h @@ -389201,7 +389227,7 @@ index 000000000000..f8a6f33df2da + +#endif /* _KBASE_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_device.c b/drivers/gpu/arm/midgard/mali_kbase_device.c -new file mode 100755 +new file mode 100644 index 000000000000..b0eb67da8644 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_device.c @@ -389881,7 +389907,7 @@ index 000000000000..b0eb67da8644 +KBASE_EXPORT_SYMBOL(_mali_profiling_control); + diff --git a/drivers/gpu/arm/midgard/mali_kbase_disjoint_events.c b/drivers/gpu/arm/midgard/mali_kbase_disjoint_events.c -new file mode 100755 +new file mode 100644 index 000000000000..f70bcccf4050 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_disjoint_events.c @@ -389963,7 +389989,7 @@ index 000000000000..f70bcccf4050 +} +KBASE_EXPORT_TEST_API(kbase_disjoint_event_get); diff --git a/drivers/gpu/arm/midgard/mali_kbase_dma_fence.c b/drivers/gpu/arm/midgard/mali_kbase_dma_fence.c -new file mode 100755 +new file mode 100644 index 000000000000..9197743c81d4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_dma_fence.c @@ -390418,7 +390444,7 @@ index 000000000000..9197743c81d4 + return 0; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_dma_fence.h b/drivers/gpu/arm/midgard/mali_kbase_dma_fence.h -new file mode 100755 +new file mode 100644 index 000000000000..c9ab40350422 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_dma_fence.h @@ -390555,7 +390581,7 @@ index 000000000000..c9ab40350422 +#endif /* CONFIG_MALI_DMA_FENCE */ +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_event.c b/drivers/gpu/arm/midgard/mali_kbase_event.c -new file mode 100755 +new file mode 100644 index 000000000000..188148645f37 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_event.c @@ -390820,7 +390846,7 @@ index 000000000000..188148645f37 + +KBASE_EXPORT_TEST_API(kbase_event_cleanup); diff --git a/drivers/gpu/arm/midgard/mali_kbase_fence.c b/drivers/gpu/arm/midgard/mali_kbase_fence.c -new file mode 100755 +new file mode 100644 index 000000000000..3bcfb38c31c2 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_fence.c @@ -391026,7 +391052,7 @@ index 000000000000..3bcfb38c31c2 + return err; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_fence.h b/drivers/gpu/arm/midgard/mali_kbase_fence.h -new file mode 100755 +new file mode 100644 index 000000000000..639cc2ef4348 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_fence.h @@ -391307,7 +391333,7 @@ index 000000000000..639cc2ef4348 + +#endif /* _KBASE_FENCE_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_fence_defs.h b/drivers/gpu/arm/midgard/mali_kbase_fence_defs.h -new file mode 100755 +new file mode 100644 index 000000000000..fa2c6dfe999e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_fence_defs.h @@ -391364,7 +391390,7 @@ index 000000000000..fa2c6dfe999e + +#endif /* _KBASE_FENCE_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator.h b/drivers/gpu/arm/midgard/mali_kbase_gator.h -new file mode 100755 +new file mode 100644 index 000000000000..ce65b5562a2b --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator.h @@ -391415,7 +391441,7 @@ index 000000000000..ce65b5562a2b + +#endif /* _KBASE_GATOR_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_api.c b/drivers/gpu/arm/midgard/mali_kbase_gator_api.c -new file mode 100755 +new file mode 100644 index 000000000000..860e10159fb3 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_api.c @@ -391755,7 +391781,7 @@ index 000000000000..860e10159fb3 +} +KBASE_EXPORT_SYMBOL(kbase_gator_instr_hwcnt_dump_irq); diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_api.h b/drivers/gpu/arm/midgard/mali_kbase_gator_api.h -new file mode 100755 +new file mode 100644 index 000000000000..ef9ac0f7b633 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_api.h @@ -391980,7 +392006,7 @@ index 000000000000..ef9ac0f7b633 + +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names.h b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names.h -new file mode 100755 +new file mode 100644 index 000000000000..cad19b66200d --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names.h @@ -394156,7 +394182,7 @@ index 000000000000..cad19b66200d + +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_thex.h b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_thex.h -new file mode 100755 +new file mode 100644 index 000000000000..bcceef4fc9bc --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_thex.h @@ -394453,7 +394479,7 @@ index 000000000000..bcceef4fc9bc + +#endif /* _KBASE_GATOR_HWCNT_NAMES_THEX_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tmix.h b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tmix.h -new file mode 100755 +new file mode 100644 index 000000000000..5ea06770fdb2 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tmix.h @@ -394750,7 +394776,7 @@ index 000000000000..5ea06770fdb2 + +#endif /* _KBASE_GATOR_HWCNT_NAMES_TMIX_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tsix.h b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tsix.h -new file mode 100755 +new file mode 100644 index 000000000000..be09c4556735 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tsix.h @@ -395047,7 +395073,7 @@ index 000000000000..be09c4556735 + +#endif /* _KBASE_GATOR_HWCNT_NAMES_TSIX_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpu_id.h b/drivers/gpu/arm/midgard/mali_kbase_gpu_id.h -new file mode 100755 +new file mode 100644 index 000000000000..42f0111c474f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpu_id.h @@ -395176,7 +395202,7 @@ index 000000000000..42f0111c474f + +#endif /* _KBASE_GPU_ID_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.c -new file mode 100755 +new file mode 100644 index 000000000000..6df0a1cb1264 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.c @@ -395279,7 +395305,7 @@ index 000000000000..6df0a1cb1264 +} +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.h -new file mode 100755 +new file mode 100644 index 000000000000..7045693eb910 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.h @@ -395322,7 +395348,7 @@ index 000000000000..7045693eb910 + +#endif /*_KBASE_GPU_MEMORY_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpuprops.c b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.c -new file mode 100755 +new file mode 100644 index 000000000000..a947a2e03a2f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.c @@ -395838,7 +395864,7 @@ index 000000000000..a947a2e03a2f + return 0; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpuprops.h b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.h -new file mode 100755 +new file mode 100644 index 000000000000..57b3eaf9cd53 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.h @@ -395928,7 +395954,7 @@ index 000000000000..57b3eaf9cd53 + +#endif /* _KBASE_GPUPROPS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpuprops_types.h b/drivers/gpu/arm/midgard/mali_kbase_gpuprops_types.h -new file mode 100755 +new file mode 100644 index 000000000000..10794fc27318 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpuprops_types.h @@ -396026,7 +396052,7 @@ index 000000000000..10794fc27318 + +#endif /* _KBASE_GPUPROPS_TYPES_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hw.c b/drivers/gpu/arm/midgard/mali_kbase_hw.c -new file mode 100755 +new file mode 100644 index 000000000000..9a390d233939 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hw.c @@ -396485,7 +396511,7 @@ index 000000000000..9a390d233939 + return 0; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_hw.h b/drivers/gpu/arm/midgard/mali_kbase_hw.h -new file mode 100755 +new file mode 100644 index 000000000000..754250ce968d --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hw.h @@ -396556,7 +396582,7 @@ index 000000000000..754250ce968d + +#endif /* _KBASE_HW_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_backend.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_backend.h -new file mode 100755 +new file mode 100644 index 000000000000..b09be99e6b4e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_backend.h @@ -396616,7 +396642,7 @@ index 000000000000..b09be99e6b4e + +#endif /* _KBASE_HWACCESS_BACKEND_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_defs.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_defs.h -new file mode 100755 +new file mode 100644 index 000000000000..0acf297192fd --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_defs.h @@ -396658,7 +396684,7 @@ index 000000000000..0acf297192fd + +#endif /* _KBASE_HWACCESS_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_gpuprops.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_gpuprops.h -new file mode 100755 +new file mode 100644 index 000000000000..cf8a8131c22e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_gpuprops.h @@ -396711,7 +396737,7 @@ index 000000000000..cf8a8131c22e + +#endif /* _KBASE_HWACCESS_GPUPROPS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_instr.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_instr.h -new file mode 100755 +new file mode 100644 index 000000000000..5de2b7535bb4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_instr.h @@ -396833,7 +396859,7 @@ index 000000000000..5de2b7535bb4 + +#endif /* _KBASE_HWACCESS_INSTR_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_jm.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_jm.h -new file mode 100755 +new file mode 100644 index 000000000000..750fda2cd81d --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_jm.h @@ -397220,7 +397246,7 @@ index 000000000000..750fda2cd81d + +#endif /* _KBASE_HWACCESS_JM_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_pm.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_pm.h -new file mode 100755 +new file mode 100644 index 000000000000..71c7d495c40a --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_pm.h @@ -397435,7 +397461,7 @@ index 000000000000..71c7d495c40a + +#endif /* _KBASE_HWACCESS_PM_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_time.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_time.h -new file mode 100755 +new file mode 100644 index 000000000000..10b65798e6cf --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_time.h @@ -397494,7 +397520,7 @@ index 000000000000..10b65798e6cf + +#endif /* _KBASE_BACKEND_TIME_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwcnt_reader.h b/drivers/gpu/arm/midgard/mali_kbase_hwcnt_reader.h -new file mode 100755 +new file mode 100644 index 000000000000..cf7bf1b35dc5 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwcnt_reader.h @@ -397566,7 +397592,7 @@ index 000000000000..cf7bf1b35dc5 +#endif /* _KBASE_HWCNT_READER_H_ */ + diff --git a/drivers/gpu/arm/midgard/mali_kbase_ioctl.h b/drivers/gpu/arm/midgard/mali_kbase_ioctl.h -new file mode 100755 +new file mode 100644 index 000000000000..dcbed9c774d6 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_ioctl.h @@ -398228,7 +398254,7 @@ index 000000000000..dcbed9c774d6 + +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_jd.c b/drivers/gpu/arm/midgard/mali_kbase_jd.c -new file mode 100755 +new file mode 100644 index 000000000000..d9d8658d31dc --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jd.c @@ -400137,7 +400163,7 @@ index 000000000000..d9d8658d31dc + +KBASE_EXPORT_TEST_API(kbase_jd_exit); diff --git a/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c -new file mode 100755 +new file mode 100644 index 000000000000..44643abf85aa --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c @@ -400376,7 +400402,7 @@ index 000000000000..44643abf85aa + +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.h -new file mode 100755 +new file mode 100644 index 000000000000..0935f1db7296 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.h @@ -400421,7 +400447,7 @@ index 000000000000..0935f1db7296 + +#endif /*_KBASE_JD_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase_jm.c b/drivers/gpu/arm/midgard/mali_kbase_jm.c -new file mode 100755 +new file mode 100644 index 000000000000..0c5c6a6f78cb --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jm.c @@ -400558,7 +400584,7 @@ index 000000000000..0c5c6a6f78cb +} + diff --git a/drivers/gpu/arm/midgard/mali_kbase_jm.h b/drivers/gpu/arm/midgard/mali_kbase_jm.h -new file mode 100755 +new file mode 100644 index 000000000000..a74ee24c8058 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jm.h @@ -400674,7 +400700,7 @@ index 000000000000..a74ee24c8058 + +#endif /* _KBASE_JM_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_js.c b/drivers/gpu/arm/midgard/mali_kbase_js.c -new file mode 100755 +new file mode 100644 index 000000000000..10a1d5909bbe --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js.c @@ -403514,7 +403540,7 @@ index 000000000000..10a1d5909bbe + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_js.h b/drivers/gpu/arm/midgard/mali_kbase_js.h -new file mode 100755 +new file mode 100644 index 000000000000..ddada8e468a1 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js.h @@ -404445,7 +404471,7 @@ index 000000000000..ddada8e468a1 + +#endif /* _KBASE_JS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.c b/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.c -new file mode 100755 +new file mode 100644 index 000000000000..321506ada835 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.c @@ -404752,7 +404778,7 @@ index 000000000000..321506ada835 + return runpool_state_changed; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.h b/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.h -new file mode 100755 +new file mode 100644 index 000000000000..ce9183326a57 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.h @@ -404916,7 +404942,7 @@ index 000000000000..ce9183326a57 + +#endif /* _KBASE_JS_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_js_defs.h b/drivers/gpu/arm/midgard/mali_kbase_js_defs.h -new file mode 100755 +new file mode 100644 index 000000000000..ba8b6441549b --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js_defs.h @@ -405308,7 +405334,7 @@ index 000000000000..ba8b6441549b + +#endif /* _KBASE_JS_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_linux.h b/drivers/gpu/arm/midgard/mali_kbase_linux.h -new file mode 100755 +new file mode 100644 index 000000000000..6d1e61fd41e0 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_linux.h @@ -405357,7 +405383,7 @@ index 000000000000..6d1e61fd41e0 + +#endif /* _KBASE_LINUX_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem.c b/drivers/gpu/arm/midgard/mali_kbase_mem.c -new file mode 100755 +new file mode 100644 index 000000000000..8cbb5f6765b8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem.c @@ -408020,7 +408046,7 @@ index 000000000000..8cbb5f6765b8 + } +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem.h b/drivers/gpu/arm/midgard/mali_kbase_mem.h -new file mode 100755 +new file mode 100644 index 000000000000..3f3eaa3fda98 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem.h @@ -409094,7 +409120,7 @@ index 000000000000..3f3eaa3fda98 + +#endif /* _KBASE_MEM_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c -new file mode 100755 +new file mode 100644 index 000000000000..e20315e67242 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c @@ -411678,7 +411704,7 @@ index 000000000000..e20315e67242 +KBASE_EXPORT_SYMBOL(kbase_va_free); + diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.h b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.h -new file mode 100755 +new file mode 100644 index 000000000000..33b3554f9d82 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.h @@ -411915,7 +411941,7 @@ index 000000000000..33b3554f9d82 + +#endif /* _KBASE_MEM_LINUX_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_lowlevel.h b/drivers/gpu/arm/midgard/mali_kbase_mem_lowlevel.h -new file mode 100755 +new file mode 100644 index 000000000000..9725fd3f05df --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_lowlevel.h @@ -411966,7 +411992,7 @@ index 000000000000..9725fd3f05df + +#endif /* _KBASE_LOWLEVEL_H */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_pool.c b/drivers/gpu/arm/midgard/mali_kbase_mem_pool.c -new file mode 100755 +new file mode 100644 index 000000000000..a8269940a037 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_pool.c @@ -412541,7 +412567,7 @@ index 000000000000..a8269940a037 + pool_dbg(pool, "free_pages(%zu) done\n", nr_pages); +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.c -new file mode 100755 +new file mode 100644 index 000000000000..585fba036c9e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.c @@ -412628,7 +412654,7 @@ index 000000000000..585fba036c9e + +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.h -new file mode 100755 +new file mode 100644 index 000000000000..1442854e8956 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.h @@ -412670,7 +412696,7 @@ index 000000000000..1442854e8956 +#endif /*_KBASE_MEM_POOL_DEBUGFS_H*/ + diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.c -new file mode 100755 +new file mode 100644 index 000000000000..d58fd8d62fde --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.c @@ -412797,7 +412823,7 @@ index 000000000000..d58fd8d62fde +} +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.h -new file mode 100755 +new file mode 100644 index 000000000000..a1dc2e0b165b --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.h @@ -412862,7 +412888,7 @@ index 000000000000..a1dc2e0b165b +#endif /*_KBASE_MEM_PROFILE_DEBUGFS_H*/ + diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs_buf_size.h b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs_buf_size.h -new file mode 100755 +new file mode 100644 index 000000000000..82f0702974c2 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs_buf_size.h @@ -412901,7 +412927,7 @@ index 000000000000..82f0702974c2 +#endif /*_KBASE_MEM_PROFILE_DEBUGFS_BUF_SIZE_H_*/ + diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu.c b/drivers/gpu/arm/midgard/mali_kbase_mmu.c -new file mode 100755 +new file mode 100644 index 000000000000..26144850a588 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu.c @@ -414995,7 +415021,7 @@ index 000000000000..26144850a588 + } +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu_hw.h b/drivers/gpu/arm/midgard/mali_kbase_mmu_hw.h -new file mode 100755 +new file mode 100644 index 000000000000..986e959e9a0c --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_hw.h @@ -415124,7 +415150,7 @@ index 000000000000..986e959e9a0c + +#endif /* _MALI_KBASE_MMU_HW_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu_mode.h b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode.h -new file mode 100755 +new file mode 100644 index 000000000000..b487c00426ae --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode.h @@ -415177,7 +415203,7 @@ index 000000000000..b487c00426ae + +#endif /* _MALI_KBASE_MMU_MODE_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_aarch64.c b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_aarch64.c -new file mode 100755 +new file mode 100644 index 000000000000..60df171164ff --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_aarch64.c @@ -415383,7 +415409,7 @@ index 000000000000..60df171164ff + return &aarch64_mode; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_lpae.c b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_lpae.c -new file mode 100755 +new file mode 100644 index 000000000000..53fbbc73af91 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_lpae.c @@ -415587,7 +415613,7 @@ index 000000000000..53fbbc73af91 + return &lpae_mode; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_platform_fake.c b/drivers/gpu/arm/midgard/mali_kbase_platform_fake.c -new file mode 100755 +new file mode 100644 index 000000000000..1a44957fe44a --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_platform_fake.c @@ -415717,7 +415743,7 @@ index 000000000000..1a44957fe44a +#endif /* CONFIG_MALI_PLATFORM_FAKE */ + diff --git a/drivers/gpu/arm/midgard/mali_kbase_pm.c b/drivers/gpu/arm/midgard/mali_kbase_pm.c -new file mode 100755 +new file mode 100644 index 000000000000..97d543464c28 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_pm.c @@ -415928,7 +415954,7 @@ index 000000000000..97d543464c28 +} + diff --git a/drivers/gpu/arm/midgard/mali_kbase_pm.h b/drivers/gpu/arm/midgard/mali_kbase_pm.h -new file mode 100755 +new file mode 100644 index 000000000000..37fa2479df74 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_pm.h @@ -416105,7 +416131,7 @@ index 000000000000..37fa2479df74 + +#endif /* _KBASE_PM_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_profiling_gator_api.h b/drivers/gpu/arm/midgard/mali_kbase_profiling_gator_api.h -new file mode 100755 +new file mode 100644 index 000000000000..7fb674eded37 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_profiling_gator_api.h @@ -416151,7 +416177,7 @@ index 000000000000..7fb674eded37 + +#endif /* _KBASE_PROFILING_GATOR_API */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.c -new file mode 100755 +new file mode 100644 index 000000000000..c970650069cd --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.c @@ -416287,7 +416313,7 @@ index 000000000000..c970650069cd + +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.h -new file mode 100755 +new file mode 100644 index 000000000000..f10837002330 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.h @@ -416343,7 +416369,7 @@ index 000000000000..f10837002330 + +#endif /*_KBASE_REGS_HISTORY_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase_replay.c b/drivers/gpu/arm/midgard/mali_kbase_replay.c -new file mode 100755 +new file mode 100644 index 000000000000..84aa3316e435 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_replay.c @@ -417515,7 +417541,7 @@ index 000000000000..84aa3316e435 + return true; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_smc.c b/drivers/gpu/arm/midgard/mali_kbase_smc.c -new file mode 100755 +new file mode 100644 index 000000000000..6c8cf73ae58c --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_smc.c @@ -417607,7 +417633,7 @@ index 000000000000..6c8cf73ae58c +#endif /* CONFIG_ARM64 */ + diff --git a/drivers/gpu/arm/midgard/mali_kbase_smc.h b/drivers/gpu/arm/midgard/mali_kbase_smc.h -new file mode 100755 +new file mode 100644 index 000000000000..9bff3d2e8b4d --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_smc.h @@ -417680,7 +417706,7 @@ index 000000000000..9bff3d2e8b4d + +#endif /* _KBASE_SMC_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_softjobs.c b/drivers/gpu/arm/midgard/mali_kbase_softjobs.c -new file mode 100755 +new file mode 100644 index 000000000000..396953e780a8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_softjobs.c @@ -419235,7 +419261,7 @@ index 000000000000..396953e780a8 + kbase_js_sched_all(kbdev); +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_strings.c b/drivers/gpu/arm/midgard/mali_kbase_strings.c -new file mode 100755 +new file mode 100644 index 000000000000..c98762cec244 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_strings.c @@ -419264,7 +419290,7 @@ index 000000000000..c98762cec244 +const char kbase_drv_name[] = KBASE_DRV_NAME; +const char kbase_timeline_name[] = KBASE_TIMELINE_NAME; diff --git a/drivers/gpu/arm/midgard/mali_kbase_strings.h b/drivers/gpu/arm/midgard/mali_kbase_strings.h -new file mode 100755 +new file mode 100644 index 000000000000..41b8fdbec6a4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_strings.h @@ -419289,7 +419315,7 @@ index 000000000000..41b8fdbec6a4 +extern const char kbase_drv_name[]; +extern const char kbase_timeline_name[]; diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync.h b/drivers/gpu/arm/midgard/mali_kbase_sync.h -new file mode 100755 +new file mode 100644 index 000000000000..33b580595563 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync.h @@ -419498,7 +419524,7 @@ index 000000000000..33b580595563 + +#endif /* MALI_KBASE_SYNC_H */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync_android.c b/drivers/gpu/arm/midgard/mali_kbase_sync_android.c -new file mode 100755 +new file mode 100644 index 000000000000..d7349dcae69a --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync_android.c @@ -420041,7 +420067,7 @@ index 000000000000..d7349dcae69a +} +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync_common.c b/drivers/gpu/arm/midgard/mali_kbase_sync_common.c -new file mode 100755 +new file mode 100644 index 000000000000..457def296684 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync_common.c @@ -420090,7 +420116,7 @@ index 000000000000..457def296684 + return "error"; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync_file.c b/drivers/gpu/arm/midgard/mali_kbase_sync_file.c -new file mode 100755 +new file mode 100644 index 000000000000..60b5d74db33e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync_file.c @@ -420455,7 +420481,7 @@ index 000000000000..60b5d74db33e +} +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_tlstream.c b/drivers/gpu/arm/midgard/mali_kbase_tlstream.c -new file mode 100755 +new file mode 100644 index 000000000000..c8310c45f143 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_tlstream.c @@ -423033,7 +423059,7 @@ index 000000000000..c8310c45f143 + kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_AUX, flags); +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_tlstream.h b/drivers/gpu/arm/midgard/mali_kbase_tlstream.h -new file mode 100755 +new file mode 100644 index 000000000000..c0a1117d5f25 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_tlstream.h @@ -423662,7 +423688,7 @@ index 000000000000..c0a1117d5f25 +#endif /* _KBASE_TLSTREAM_H */ + diff --git a/drivers/gpu/arm/midgard/mali_kbase_trace_defs.h b/drivers/gpu/arm/midgard/mali_kbase_trace_defs.h -new file mode 100755 +new file mode 100644 index 000000000000..e2e0544208ce --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_defs.h @@ -423932,7 +423958,7 @@ index 000000000000..e2e0544208ce + +/* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.c b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.c -new file mode 100755 +new file mode 100644 index 000000000000..5830e87f0818 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.c @@ -424174,7 +424200,7 @@ index 000000000000..5830e87f0818 + +#endif /* CONFIG_MALI_TRACE_TIMELINE */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.h b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.h -new file mode 100755 +new file mode 100644 index 000000000000..a04f7c1420e0 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.h @@ -424543,7 +424569,7 @@ index 000000000000..a04f7c1420e0 +#endif /* _KBASE_TRACE_TIMELINE_H */ + diff --git a/drivers/gpu/arm/midgard/mali_kbase_trace_timeline_defs.h b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline_defs.h -new file mode 100755 +new file mode 100644 index 000000000000..156a95a67f4a --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline_defs.h @@ -424689,7 +424715,7 @@ index 000000000000..156a95a67f4a +"HW: Job Chain stop (SW approximated)", "%d,%d,%d", +"_tgid,job_slot,_producerof_atom_number_completed") diff --git a/drivers/gpu/arm/midgard/mali_kbase_uku.h b/drivers/gpu/arm/midgard/mali_kbase_uku.h -new file mode 100755 +new file mode 100644 index 000000000000..c22a59324248 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_uku.h @@ -425240,7 +425266,7 @@ index 000000000000..c22a59324248 +#endif /* _KBASE_UKU_H_ */ + diff --git a/drivers/gpu/arm/midgard/mali_kbase_utility.c b/drivers/gpu/arm/midgard/mali_kbase_utility.c -new file mode 100755 +new file mode 100644 index 000000000000..be474ff87401 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_utility.c @@ -425279,7 +425305,7 @@ index 000000000000..be474ff87401 + return false; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_utility.h b/drivers/gpu/arm/midgard/mali_kbase_utility.h -new file mode 100755 +new file mode 100644 index 000000000000..fd7252dab0de --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_utility.h @@ -425322,7 +425348,7 @@ index 000000000000..fd7252dab0de + +#endif /* _KBASE_UTILITY_H */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_vinstr.c b/drivers/gpu/arm/midgard/mali_kbase_vinstr.c -new file mode 100755 +new file mode 100644 index 000000000000..8395568d0efa --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_vinstr.c @@ -427398,7 +427424,7 @@ index 000000000000..8395568d0efa + spin_unlock_irqrestore(&vinstr_ctx->state_lock, flags); +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_vinstr.h b/drivers/gpu/arm/midgard/mali_kbase_vinstr.h -new file mode 100755 +new file mode 100644 index 000000000000..6207d25aef06 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_vinstr.h @@ -427559,7 +427585,7 @@ index 000000000000..6207d25aef06 +#endif /* _KBASE_VINSTR_H_ */ + diff --git a/drivers/gpu/arm/midgard/mali_linux_kbase_trace.h b/drivers/gpu/arm/midgard/mali_linux_kbase_trace.h -new file mode 100755 +new file mode 100644 index 000000000000..5d6b4021d626 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_linux_kbase_trace.h @@ -427766,7 +427792,7 @@ index 000000000000..5d6b4021d626 +/* This part must be outside protection */ +#include diff --git a/drivers/gpu/arm/midgard/mali_linux_trace.h b/drivers/gpu/arm/midgard/mali_linux_trace.h -new file mode 100755 +new file mode 100644 index 000000000000..2be06a552768 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_linux_trace.h @@ -427961,7 +427987,7 @@ index 000000000000..2be06a552768 +/* This part must be outside protection */ +#include diff --git a/drivers/gpu/arm/midgard/mali_malisw.h b/drivers/gpu/arm/midgard/mali_malisw.h -new file mode 100755 +new file mode 100644 index 000000000000..99452933eab4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_malisw.h @@ -428098,7 +428124,7 @@ index 000000000000..99452933eab4 + +#endif /* _MALISW_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_midg_coherency.h b/drivers/gpu/arm/midgard/mali_midg_coherency.h -new file mode 100755 +new file mode 100644 index 000000000000..a509cbd5f175 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_midg_coherency.h @@ -428130,7 +428156,7 @@ index 000000000000..a509cbd5f175 + +#endif /* _MIDG_COHERENCY_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_midg_regmap.h b/drivers/gpu/arm/midgard/mali_midg_regmap.h -new file mode 100755 +new file mode 100644 index 000000000000..7d7b7bcd3cc3 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_midg_regmap.h @@ -428747,7 +428773,7 @@ index 000000000000..7d7b7bcd3cc3 + +#endif /* _MIDGARD_REGMAP_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_timeline.h b/drivers/gpu/arm/midgard/mali_timeline.h -new file mode 100755 +new file mode 100644 index 000000000000..bd5f6614b6bb --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_timeline.h @@ -429149,7 +429175,7 @@ index 000000000000..bd5f6614b6bb +#include + diff --git a/drivers/gpu/arm/midgard/mali_uk.h b/drivers/gpu/arm/midgard/mali_uk.h -new file mode 100755 +new file mode 100644 index 000000000000..841d03fb5873 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_uk.h @@ -429296,7 +429322,7 @@ index 000000000000..841d03fb5873 +#endif /* __cplusplus */ +#endif /* _UK_H_ */ diff --git a/drivers/gpu/arm/midgard/platform/Kconfig b/drivers/gpu/arm/midgard/platform/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..8fb4e917c4fa --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/Kconfig @@ -429326,7 +429352,7 @@ index 000000000000..8fb4e917c4fa +# + diff --git a/drivers/gpu/arm/midgard/platform/devicetree/Kbuild b/drivers/gpu/arm/midgard/platform/devicetree/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..e888a42fc69a --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/devicetree/Kbuild @@ -429350,7 +429376,7 @@ index 000000000000..e888a42fc69a + $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_config_devicetree.o \ + $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_runtime_pm.o diff --git a/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_devicetree.c b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_devicetree.c -new file mode 100755 +new file mode 100644 index 000000000000..b2a7c93f12a9 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_devicetree.c @@ -429387,7 +429413,7 @@ index 000000000000..b2a7c93f12a9 + return &dummy_platform_config; +} diff --git a/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_platform.h b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_platform.h -new file mode 100755 +new file mode 100644 index 000000000000..49e107f98000 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_platform.h @@ -429466,7 +429492,7 @@ index 000000000000..49e107f98000 + +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_runtime_pm.c b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_runtime_pm.c -new file mode 100755 +new file mode 100644 index 000000000000..aa4376afd3ba --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_runtime_pm.c @@ -429572,7 +429598,7 @@ index 000000000000..aa4376afd3ba + + diff --git a/drivers/gpu/arm/midgard/platform/mali_kbase_platform_common.h b/drivers/gpu/arm/midgard/platform/mali_kbase_platform_common.h -new file mode 100755 +new file mode 100644 index 000000000000..c11085af5f24 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/mali_kbase_platform_common.h @@ -429606,7 +429632,7 @@ index 000000000000..c11085af5f24 +int kbase_platform_early_init(void); +int kbase_platform_rk_init_opp_table(struct kbase_device *kbdev); diff --git a/drivers/gpu/arm/midgard/platform/mali_kbase_platform_fake.h b/drivers/gpu/arm/midgard/platform/mali_kbase_platform_fake.h -new file mode 100755 +new file mode 100644 index 000000000000..01f9dfce93cc --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/mali_kbase_platform_fake.h @@ -429650,7 +429676,7 @@ index 000000000000..01f9dfce93cc + +#endif /* CONFIG_MALI_PLATFORM_FAKE */ diff --git a/drivers/gpu/arm/midgard/platform/rk/Kbuild b/drivers/gpu/arm/midgard/platform/rk/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..db993487e3be --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/Kbuild @@ -429673,7 +429699,7 @@ index 000000000000..db993487e3be + $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_config_rk.o + diff --git a/drivers/gpu/arm/midgard/platform/rk/custom_log.h b/drivers/gpu/arm/midgard/platform/rk/custom_log.h -new file mode 100755 +new file mode 100644 index 000000000000..fe5e1224149e --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/custom_log.h @@ -429888,7 +429914,7 @@ index 000000000000..fe5e1224149e + +#endif /* __CUSTOM_LOG_H__ */ diff --git a/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_platform.h b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_platform.h -new file mode 100755 +new file mode 100644 index 000000000000..07c5b6f8a760 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_platform.h @@ -429982,7 +430008,7 @@ index 000000000000..07c5b6f8a760 +#define SECURE_CALLBACKS (NULL) + diff --git a/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_rk.c b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_rk.c -new file mode 100755 +new file mode 100644 index 000000000000..8ad910c1256f --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_rk.c @@ -430480,7 +430506,7 @@ index 000000000000..8ad910c1256f + "gpu_leakage", "mali"); +} diff --git a/drivers/gpu/arm/midgard/platform/rk/mali_kbase_rk.h b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_rk.h -new file mode 100755 +new file mode 100644 index 000000000000..6eab25014d21 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_rk.h @@ -430548,7 +430574,7 @@ index 000000000000..6eab25014d21 +#endif /* _MALI_KBASE_RK_H_ */ + diff --git a/drivers/gpu/arm/midgard/platform/vexpress/Kbuild b/drivers/gpu/arm/midgard/platform/vexpress/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..1caa293666d3 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/Kbuild @@ -430572,7 +430598,7 @@ index 000000000000..1caa293666d3 + $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_config_vexpress.o \ + $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_cpu_vexpress.o diff --git a/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_platform.h b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_platform.h -new file mode 100755 +new file mode 100644 index 000000000000..02835f129aa3 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_platform.h @@ -430653,7 +430679,7 @@ index 000000000000..02835f129aa3 + +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_vexpress.c -new file mode 100755 +new file mode 100644 index 000000000000..15ce2bc5eea5 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_vexpress.c @@ -430744,7 +430770,7 @@ index 000000000000..15ce2bc5eea5 + return 0; +} diff --git a/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.c -new file mode 100755 +new file mode 100644 index 000000000000..4665f98cbbe4 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.c @@ -431029,7 +431055,7 @@ index 000000000000..4665f98cbbe4 + } +} diff --git a/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.h b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.h -new file mode 100755 +new file mode 100644 index 000000000000..da865698133a --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.h @@ -431073,7 +431099,7 @@ index 000000000000..da865698133a + +#endif /* _KBASE_CPU_VEXPRESS_H_ */ diff --git a/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/Kbuild b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..7efe8fa4263b --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/Kbuild @@ -431095,7 +431121,7 @@ index 000000000000..7efe8fa4263b + +mali_kbase-y += $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_config_vexpress.o diff --git a/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h -new file mode 100755 +new file mode 100644 index 000000000000..0efbf3962f98 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h @@ -431174,7 +431200,7 @@ index 000000000000..0efbf3962f98 + +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c -new file mode 100755 +new file mode 100644 index 000000000000..3ff0930fb4a3 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c @@ -431259,7 +431285,7 @@ index 000000000000..3ff0930fb4a3 + return 0; +} diff --git a/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/Kbuild b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..1caa293666d3 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/Kbuild @@ -431283,7 +431309,7 @@ index 000000000000..1caa293666d3 + $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_config_vexpress.o \ + $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_cpu_vexpress.o diff --git a/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h -new file mode 100755 +new file mode 100644 index 000000000000..dbdf21e009f9 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h @@ -431364,7 +431390,7 @@ index 000000000000..dbdf21e009f9 + +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c -new file mode 100755 +new file mode 100644 index 000000000000..76ffe4a1e59e --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c @@ -431453,7 +431479,7 @@ index 000000000000..76ffe4a1e59e +} + diff --git a/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c -new file mode 100755 +new file mode 100644 index 000000000000..816dff49835f --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c @@ -431530,7 +431556,7 @@ index 000000000000..816dff49835f + return 0; +} diff --git a/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.h b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.h -new file mode 100755 +new file mode 100644 index 000000000000..23647ccb0871 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.h @@ -431564,7 +431590,7 @@ index 000000000000..23647ccb0871 + +#endif /* _KBASE_CPU_VEXPRESS_H_ */ diff --git a/drivers/gpu/arm/midgard/platform_dummy/mali_ukk_os.h b/drivers/gpu/arm/midgard/platform_dummy/mali_ukk_os.h -new file mode 100755 +new file mode 100644 index 000000000000..5fa9b39c4bc0 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform_dummy/mali_ukk_os.h @@ -431623,7 +431649,7 @@ index 000000000000..5fa9b39c4bc0 + +#endif /* _UKK_OS_H__ */ diff --git a/drivers/gpu/arm/midgard/protected_mode_switcher.h b/drivers/gpu/arm/midgard/protected_mode_switcher.h -new file mode 100755 +new file mode 100644 index 000000000000..5dc2f3ba8cf6 --- /dev/null +++ b/drivers/gpu/arm/midgard/protected_mode_switcher.h @@ -431693,7 +431719,7 @@ index 000000000000..5dc2f3ba8cf6 + +#endif /* _PROTECTED_MODE_SWITCH_H_ */ diff --git a/drivers/gpu/arm/midgard/rename.h b/drivers/gpu/arm/midgard/rename.h -new file mode 100755 +new file mode 100644 index 000000000000..8218666183ea --- /dev/null +++ b/drivers/gpu/arm/midgard/rename.h @@ -432125,7 +432151,7 @@ index 000000000000..8218666183ea +#define rk_kbase_device_runtime_init midgard_rk_kbase_device_runtime_init +#endif diff --git a/drivers/gpu/arm/midgard/sconscript b/drivers/gpu/arm/midgard/sconscript -new file mode 100755 +new file mode 100644 index 000000000000..ff23d7aebe6e --- /dev/null +++ b/drivers/gpu/arm/midgard/sconscript @@ -432223,7 +432249,7 @@ index 000000000000..ff23d7aebe6e + +env.AppendUnique(BASE=['cutils_linked_list']) diff --git a/drivers/gpu/arm/midgard/tests/Kbuild b/drivers/gpu/arm/midgard/tests/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..b4bed0473439 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/Kbuild @@ -432246,7 +432272,7 @@ index 000000000000..b4bed0473439 +obj-$(CONFIG_MALI_KUTF) += kutf/ +obj-$(CONFIG_MALI_IRQ_LATENCY) += mali_kutf_irq_test/ diff --git a/drivers/gpu/arm/midgard/tests/Kconfig b/drivers/gpu/arm/midgard/tests/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..da0515c065de --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/Kconfig @@ -432269,7 +432295,7 @@ index 000000000000..da0515c065de +source "drivers/gpu/arm/midgard/tests/kutf/Kconfig" +source "drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig" diff --git a/drivers/gpu/arm/midgard/tests/include/kutf/kutf_mem.h b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_mem.h -new file mode 100755 +new file mode 100644 index 000000000000..0d145e42a0ca --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_mem.h @@ -432340,7 +432366,7 @@ index 000000000000..0d145e42a0ca +void kutf_mempool_destroy(struct kutf_mempool *pool); +#endif /* _KERNEL_UTF_MEM_H_ */ diff --git a/drivers/gpu/arm/midgard/tests/include/kutf/kutf_resultset.h b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_resultset.h -new file mode 100755 +new file mode 100644 index 000000000000..1cc85f1b7a46 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_resultset.h @@ -432467,7 +432493,7 @@ index 000000000000..1cc85f1b7a46 + +#endif /* _KERNEL_UTF_RESULTSET_H_ */ diff --git a/drivers/gpu/arm/midgard/tests/include/kutf/kutf_suite.h b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_suite.h -new file mode 100755 +new file mode 100644 index 000000000000..754c3adb1cca --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_suite.h @@ -432981,7 +433007,7 @@ index 000000000000..754c3adb1cca + +#endif /* _KERNEL_UTF_SUITE_H_ */ diff --git a/drivers/gpu/arm/midgard/tests/include/kutf/kutf_utils.h b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_utils.h -new file mode 100755 +new file mode 100644 index 000000000000..c458c1f73802 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_utils.h @@ -433042,7 +433068,7 @@ index 000000000000..c458c1f73802 + +#endif /* _KERNEL_UTF_UTILS_H_ */ diff --git a/drivers/gpu/arm/midgard/tests/kutf/Kbuild b/drivers/gpu/arm/midgard/tests/kutf/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..6b840c2ef7b7 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/Kbuild @@ -433068,7 +433094,7 @@ index 000000000000..6b840c2ef7b7 + +kutf-y := kutf_mem.o kutf_resultset.o kutf_suite.o kutf_utils.o diff --git a/drivers/gpu/arm/midgard/tests/kutf/Kconfig b/drivers/gpu/arm/midgard/tests/kutf/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..84364716afe3 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/Kconfig @@ -433096,7 +433122,7 @@ index 000000000000..84364716afe3 + Enables MALI testing framework. To compile it as a module, + choose M here - this will generate a single module called kutf. diff --git a/drivers/gpu/arm/midgard/tests/kutf/Makefile b/drivers/gpu/arm/midgard/tests/kutf/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..010c92ca39b9 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/Makefile @@ -433131,7 +433157,7 @@ index 000000000000..010c92ca39b9 +clean: + $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean diff --git a/drivers/gpu/arm/midgard/tests/kutf/kutf_mem.c b/drivers/gpu/arm/midgard/tests/kutf/kutf_mem.c -new file mode 100755 +new file mode 100644 index 000000000000..5408e57d469a --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_mem.c @@ -433231,7 +433257,7 @@ index 000000000000..5408e57d469a +} +EXPORT_SYMBOL(kutf_mempool_alloc); diff --git a/drivers/gpu/arm/midgard/tests/kutf/kutf_resultset.c b/drivers/gpu/arm/midgard/tests/kutf/kutf_resultset.c -new file mode 100755 +new file mode 100644 index 000000000000..5bd04969fd55 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_resultset.c @@ -433332,7 +433358,7 @@ index 000000000000..5bd04969fd55 +} + diff --git a/drivers/gpu/arm/midgard/tests/kutf/kutf_suite.c b/drivers/gpu/arm/midgard/tests/kutf/kutf_suite.c -new file mode 100755 +new file mode 100644 index 000000000000..a7cfd3be9c46 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_suite.c @@ -434379,7 +434405,7 @@ index 000000000000..a7cfd3be9c46 +module_init(init_kutf_core); +module_exit(exit_kutf_core); diff --git a/drivers/gpu/arm/midgard/tests/kutf/kutf_utils.c b/drivers/gpu/arm/midgard/tests/kutf/kutf_utils.c -new file mode 100755 +new file mode 100644 index 000000000000..a429a2dbf788 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_utils.c @@ -434456,7 +434482,7 @@ index 000000000000..a429a2dbf788 +} +EXPORT_SYMBOL(kutf_dsprintf); diff --git a/drivers/gpu/arm/midgard/tests/kutf/sconscript b/drivers/gpu/arm/midgard/tests/kutf/sconscript -new file mode 100755 +new file mode 100644 index 000000000000..d7f112448e42 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/sconscript @@ -434483,7 +434509,7 @@ index 000000000000..d7f112448e42 +mod = kutf_env.BuildKernelModule('$STATIC_LIB_PATH/kutf.ko', Glob('*.c'), make_args = make_args) +kutf_env.KernelObjTarget('kutf', mod) diff --git a/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kbuild b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kbuild -new file mode 100755 +new file mode 100644 index 000000000000..0cd9cebe9d8b --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kbuild @@ -434509,7 +434535,7 @@ index 000000000000..0cd9cebe9d8b + +mali_kutf_irq_test-y := mali_kutf_irq_test_main.o diff --git a/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..16f68d15c46e --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig @@ -434538,7 +434564,7 @@ index 000000000000..16f68d15c46e + can determine the latency of the Mali GPU IRQ on your system. + Choosing M here will generate a single module called mali_kutf_irq_test. diff --git a/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Makefile b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..4e948767a4ac --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Makefile @@ -434595,7 +434621,7 @@ index 000000000000..4e948767a4ac +clean: + $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean diff --git a/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c -new file mode 100755 +new file mode 100644 index 000000000000..e2ff4432bf80 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c @@ -434858,7 +434884,7 @@ index 000000000000..e2ff4432bf80 +MODULE_AUTHOR("ARM Ltd."); +MODULE_VERSION("1.0"); diff --git a/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/sconscript b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/sconscript -new file mode 100755 +new file mode 100644 index 000000000000..ec837f16448d --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/sconscript @@ -434894,7 +434920,7 @@ index 000000000000..ec837f16448d + env.Depends('$STATIC_LIB_PATH/mali_kutf_irq_test.ko', '$STATIC_LIB_PATH/mali_kbase.ko') + env.KernelObjTarget('mali_kutf_irq_test', cmd) diff --git a/drivers/gpu/arm/midgard/tests/sconscript b/drivers/gpu/arm/midgard/tests/sconscript -new file mode 100755 +new file mode 100644 index 000000000000..5337e1078e20 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/sconscript @@ -434937,7 +434963,7 @@ index 000000000000..5337e1078e20 + SConscript('mali_kutf_ipa_test/sconscript') + SConscript('mali_kutf_vinstr_test/sconscript') diff --git a/drivers/gpu/arm/sconscript b/drivers/gpu/arm/sconscript -new file mode 100755 +new file mode 100644 index 000000000000..a06092bd5bf0 --- /dev/null +++ b/drivers/gpu/arm/sconscript @@ -439575,7 +439601,7 @@ index cf4dc121a2c4..ec10660a7e53 100644 + #endif diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.c -new file mode 100755 +new file mode 100644 index 000000000000..24aab5043e61 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.c @@ -440329,7 +440355,7 @@ index 000000000000..24aab5043e61 +MODULE_DESCRIPTION("DW HDMI transmitter HDCP driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.h -new file mode 100755 +new file mode 100644 index 000000000000..d138f91f3422 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.h @@ -440477,7 +440503,7 @@ index 9682416056ed..7ec390d46ca5 100644 .audio_shutdown = dw_hdmi_i2s_audio_shutdown, .get_eld = dw_hdmi_i2s_get_eld, diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-audio.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-audio.h -new file mode 100755 +new file mode 100644 index 000000000000..93f1a42954e7 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-audio.h @@ -441602,7 +441628,7 @@ index 000000000000..48c3a4843ac0 + +#endif diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-i2s-audio.c -new file mode 100755 +new file mode 100644 index 000000000000..5ece777c1afa --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-i2s-audio.c @@ -441796,7 +441822,7 @@ index 000000000000..5ece777c1afa +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRIVER_NAME); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c -new file mode 100755 +new file mode 100644 index 000000000000..ee29181563f9 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c @@ -445911,7 +445937,7 @@ index 000000000000..ee29181563f9 +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:dw-hdmi-qp"); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h -new file mode 100755 +new file mode 100644 index 000000000000..e9b5e19a3be5 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h @@ -450520,7 +450546,7 @@ index 376fa6eb46f6..71f0daa5f834 100644 MODULE_AUTHOR("Philippe Cornu "); MODULE_DESCRIPTION("DW MIPI DSI host controller driver"); diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c -index 7fc8e7000046..4108c7265d53 100644 +index 0fde260b7edd..fee489a4a17d 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -296,12 +296,14 @@ update_connector_routing(struct drm_atomic_state *state, @@ -450550,7 +450576,7 @@ index 7fc8e7000046..4108c7265d53 100644 DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] using [ENCODER:%d:%s] on [CRTC:%d:%s]\n", connector->base.id, -@@ -3554,6 +3557,9 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, +@@ -3563,6 +3566,9 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, replaced = drm_property_replace_blob(&crtc_state->degamma_lut, NULL); replaced |= drm_property_replace_blob(&crtc_state->ctm, NULL); replaced |= drm_property_replace_blob(&crtc_state->gamma_lut, blob); @@ -451373,10 +451399,10 @@ index fad2c1181127..58050d4aeabc 100644 DRM_MODE_PROP_IMMUTABLE | DRM_MODE_PROP_BLOB, "IN_FORMATS", 0); diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c -index 0f99e5453f15..d42c7310bf09 100644 +index 8bebc29a129d..1ced8f34b233 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c -@@ -1940,6 +1940,7 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out, +@@ -1943,6 +1943,7 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out, strncpy(out->name, in->name, DRM_DISPLAY_MODE_LEN); out->name[DRM_DISPLAY_MODE_LEN-1] = 0; } @@ -451384,7 +451410,7 @@ index 0f99e5453f15..d42c7310bf09 100644 /** * drm_crtc_convert_umode - convert a modeinfo into a drm_display_mode -@@ -2016,6 +2017,7 @@ int drm_mode_convert_umode(struct drm_device *dev, +@@ -2019,6 +2020,7 @@ int drm_mode_convert_umode(struct drm_device *dev, return 0; } @@ -451434,7 +451460,7 @@ index 825499ea3ff5..272e5cdd61ce 100644 /** diff --git a/drivers/gpu/drm/drm_sync_helper.c b/drivers/gpu/drm/drm_sync_helper.c -new file mode 100755 +new file mode 100644 index 000000000000..0c6aa875b4c6 --- /dev/null +++ b/drivers/gpu/drm/drm_sync_helper.c @@ -452431,7 +452457,7 @@ index 534dd7414d42..0145129d7c66 100644 .width_mm = 135, .height_mm = 217, diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c -index 1a87cc445b5e..d6c0bbc03c6d 100644 +index ee01b61a6baf..816474848663 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -30,6 +30,7 @@ @@ -452870,7 +452896,7 @@ index 1a87cc445b5e..d6c0bbc03c6d 100644 connector_type = DRM_MODE_CONNECTOR_DPI; break; case DRM_MODE_CONNECTOR_LVDS: -@@ -3906,6 +4189,9 @@ static const struct panel_desc arm_rtsm = { +@@ -3911,6 +4194,9 @@ static const struct panel_desc arm_rtsm = { static const struct of_device_id platform_of_match[] = { { @@ -452880,7 +452906,7 @@ index 1a87cc445b5e..d6c0bbc03c6d 100644 .compatible = "ampire,am-1280800n3tzqw-t00h", .data = &ire_am_1280800n3tzqw_t00h, }, { -@@ -4314,15 +4600,132 @@ static const struct of_device_id platform_of_match[] = { +@@ -4319,15 +4605,132 @@ static const struct of_device_id platform_of_match[] = { }; MODULE_DEVICE_TABLE(of, platform_of_match); @@ -453014,7 +453040,7 @@ index 1a87cc445b5e..d6c0bbc03c6d 100644 } static int panel_simple_platform_remove(struct platform_device *pdev) -@@ -4557,6 +4960,9 @@ static const struct panel_desc_dsi osd101t2045_53ts = { +@@ -4562,6 +4965,9 @@ static const struct panel_desc_dsi osd101t2045_53ts = { static const struct of_device_id dsi_of_match[] = { { @@ -453024,7 +453050,7 @@ index 1a87cc445b5e..d6c0bbc03c6d 100644 .compatible = "auo,b080uan01", .data = &auo_b080uan01 }, { -@@ -4583,9 +4989,33 @@ static const struct of_device_id dsi_of_match[] = { +@@ -4588,9 +4994,33 @@ static const struct of_device_id dsi_of_match[] = { }; MODULE_DEVICE_TABLE(of, dsi_of_match); @@ -453058,7 +453084,7 @@ index 1a87cc445b5e..d6c0bbc03c6d 100644 const struct of_device_id *id; int err; -@@ -4593,12 +5023,47 @@ static int panel_simple_dsi_probe(struct mipi_dsi_device *dsi) +@@ -4598,12 +5028,47 @@ static int panel_simple_dsi_probe(struct mipi_dsi_device *dsi) if (!id) return -ENODEV; @@ -453108,7 +453134,7 @@ index 1a87cc445b5e..d6c0bbc03c6d 100644 dsi->format = desc->format; dsi->lanes = desc->lanes; diff --git a/drivers/gpu/drm/panel/panel-simple.h b/drivers/gpu/drm/panel/panel-simple.h -new file mode 100755 +new file mode 100644 index 000000000000..7349c35e3cb2 --- /dev/null +++ b/drivers/gpu/drm/panel/panel-simple.h @@ -454100,7 +454126,7 @@ index 512581698a1e..9f09525b4bc0 100644 }; MODULE_DEVICE_TABLE(of, rockchip_dp_dt_ids); diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c -index adeaa0140f0f..9804fe1ba9a5 100644 +index 53cad1003ad7..6d490454755b 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c @@ -6,7 +6,6 @@ @@ -454442,9 +454468,9 @@ index adeaa0140f0f..9804fe1ba9a5 100644 struct cdn_dp_device *dp; - struct extcon_dev *extcon; struct phy *phy; + int ret; int i; - -@@ -1156,21 +1151,18 @@ static int cdn_dp_probe(struct platform_device *pdev) +@@ -1157,21 +1152,18 @@ static int cdn_dp_probe(struct platform_device *pdev) dp_data = (struct cdn_dp_data *)match->data; for (i = 0; i < dp_data->max_phy; i++) { @@ -454468,7 +454494,7 @@ index adeaa0140f0f..9804fe1ba9a5 100644 port->phy = phy; port->dp = dp; port->id = i; -@@ -1178,7 +1170,7 @@ static int cdn_dp_probe(struct platform_device *pdev) +@@ -1179,7 +1171,7 @@ static int cdn_dp_probe(struct platform_device *pdev) } if (!dp->ports) { @@ -454517,7 +454543,7 @@ index 81ac9b658a70..60a8c095b30f 100644 u8 dpcd[DP_RECEIVER_CAP_SIZE]; bool sink_has_audio; diff --git a/drivers/gpu/drm/rockchip/cdn-dp-link-training.c b/drivers/gpu/drm/rockchip/cdn-dp-link-training.c -new file mode 100755 +new file mode 100644 index 000000000000..ec2f001c2557 --- /dev/null +++ b/drivers/gpu/drm/rockchip/cdn-dp-link-training.c @@ -455240,7 +455266,7 @@ index 441248b7a79e..656ec69be66d 100644 +int cdn_dp_software_train_link(struct cdn_dp_device *dp); #endif /* _CDN_DP_REG_H */ diff --git a/drivers/gpu/drm/rockchip/dw-dp.c b/drivers/gpu/drm/rockchip/dw-dp.c -new file mode 100755 +new file mode 100644 index 000000000000..e6c3ac37c1b0 --- /dev/null +++ b/drivers/gpu/drm/rockchip/dw-dp.c @@ -460449,7 +460475,7 @@ index 82cbfccba1bc..2ff99e503224 100644 /* * For dual-DSI display, one DSI pokes at the other DSI's diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c -new file mode 100755 +new file mode 100644 index 000000000000..e66df80980f4 --- /dev/null +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c @@ -467053,7 +467079,7 @@ index 23de359a1dec..3253cf215c5f 100644 .name = "dwhdmi-rockchip", .pm = &dw_hdmi_rockchip_pm, diff --git a/drivers/gpu/drm/rockchip/ebc-dev/Kconfig b/drivers/gpu/drm/rockchip/ebc-dev/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..949c8e4b7b57 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/Kconfig @@ -467073,7 +467099,7 @@ index 000000000000..949c8e4b7b57 + bool "Tps65185" +endchoice diff --git a/drivers/gpu/drm/rockchip/ebc-dev/Makefile b/drivers/gpu/drm/rockchip/ebc-dev/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..848ac22fd0b2 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/Makefile @@ -467088,7 +467114,7 @@ index 000000000000..848ac22fd0b2 + +rkebc-$(CONFIG_ARM64) += ebc_dev_v8.o diff --git a/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/Makefile b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..a63ef49dea04 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/Makefile @@ -467097,7 +467123,7 @@ index 000000000000..a63ef49dea04 + +obj-$(CONFIG_ROCKCHIP_EBC_DEV) += buf_manage.o buf_list.o diff --git a/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.c b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.c -new file mode 100755 +new file mode 100644 index 000000000000..90f350110b70 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.c @@ -467274,7 +467300,7 @@ index 000000000000..90f350110b70 + return 0; +} diff --git a/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.h b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.h -new file mode 100755 +new file mode 100644 index 000000000000..eaf504560fb8 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.h @@ -467375,7 +467401,7 @@ index 000000000000..eaf504560fb8 + +#endif diff --git a/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.c b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.c -new file mode 100755 +new file mode 100644 index 000000000000..a2e47b45c148 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.c @@ -467708,7 +467734,7 @@ index 000000000000..a2e47b45c148 + return res; +} diff --git a/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.h b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.h -new file mode 100755 +new file mode 100644 index 000000000000..745cdbf9cfde --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.h @@ -467763,7 +467789,7 @@ index 000000000000..745cdbf9cfde +#endif + diff --git a/drivers/gpu/drm/rockchip/ebc-dev/ebc_dev.h b/drivers/gpu/drm/rockchip/ebc-dev/ebc_dev.h -new file mode 100755 +new file mode 100644 index 000000000000..5fc2fecd22cb --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/ebc_dev.h @@ -467883,7 +467909,7 @@ index 000000000000..5fc2fecd22cb + +#endif diff --git a/drivers/gpu/drm/rockchip/ebc-dev/ebc_dev_v8.S b/drivers/gpu/drm/rockchip/ebc-dev/ebc_dev_v8.S -new file mode 100755 +new file mode 100644 index 000000000000..65be1fdee09f --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/ebc_dev_v8.S @@ -523191,7 +523217,7 @@ index 000000000000..65be1fdee09f + .ident "GCC: (Linaro GCC 6.3-2017.05) 6.3.1 20170404" + .section .note.GNU-stack,"",@progbits diff --git a/drivers/gpu/drm/rockchip/ebc-dev/ebc_panel.h b/drivers/gpu/drm/rockchip/ebc-dev/ebc_panel.h -new file mode 100755 +new file mode 100644 index 000000000000..dc0a72b11b21 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/ebc_panel.h @@ -523247,7 +523273,7 @@ index 000000000000..dc0a72b11b21 +}; +#endif diff --git a/drivers/gpu/drm/rockchip/ebc-dev/ebc_public.c b/drivers/gpu/drm/rockchip/ebc-dev/ebc_public.c -new file mode 100755 +new file mode 100644 index 000000000000..8ecccb7f6403 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/ebc_public.c @@ -523289,7 +523315,7 @@ index 000000000000..8ecccb7f6403 + return blocking_notifier_call_chain(&ebc_notifier_list, event, NULL); +} diff --git a/drivers/gpu/drm/rockchip/ebc-dev/epdlut/Makefile b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..6b99702b7a6f --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/Makefile @@ -523300,7 +523326,7 @@ index 000000000000..6b99702b7a6f + +waveform-$(CONFIG_ARM64) += pvi_waveform_v8.o rkf_waveform_v8.o diff --git a/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.c b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.c -new file mode 100755 +new file mode 100644 index 000000000000..8871b37d52cc --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.c @@ -523378,7 +523404,7 @@ index 000000000000..8871b37d52cc + return lut_get(output, lut_type, temperture); +} diff --git a/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.h b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.h -new file mode 100755 +new file mode 100644 index 000000000000..8d2210603a29 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.h @@ -523450,7 +523476,7 @@ index 000000000000..8d2210603a29 +int rkf_wf_get_lut(struct epd_lut_data *output, enum epd_lut_type lut_type, int temperture); +#endif diff --git a/drivers/gpu/drm/rockchip/ebc-dev/epdlut/pvi_waveform_v8.S b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/pvi_waveform_v8.S -new file mode 100755 +new file mode 100644 index 000000000000..849c81dcfc71 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/pvi_waveform_v8.S @@ -542112,7 +542138,7 @@ index 000000000000..849c81dcfc71 + .ident "GCC: (Linaro GCC 6.3-2017.05) 6.3.1 20170404" + .section .note.GNU-stack,"",@progbits diff --git a/drivers/gpu/drm/rockchip/ebc-dev/epdlut/rkf_waveform_v8.S b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/rkf_waveform_v8.S -new file mode 100755 +new file mode 100644 index 000000000000..8a17822240c5 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/rkf_waveform_v8.S @@ -561475,7 +561501,7 @@ index 000000000000..8a17822240c5 + .ident "GCC: (Linaro GCC 6.3-2017.05) 6.3.1 20170404" + .section .note.GNU-stack,"",@progbits diff --git a/drivers/gpu/drm/rockchip/ebc-dev/pmic/Makefile b/drivers/gpu/drm/rockchip/ebc-dev/pmic/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..a05717f1ce98 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/Makefile @@ -561485,7 +561511,7 @@ index 000000000000..a05717f1ce98 +obj-$(CONFIG_ROCKCHIP_EBC_DEV) += ebc_pmic.o +obj-$(CONFIG_EPD_TPS65185_SENSOR) += tps65185.o diff --git a/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.c b/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.c -new file mode 100755 +new file mode 100644 index 000000000000..c24db23dc47d --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.c @@ -561561,7 +561587,7 @@ index 000000000000..c24db23dc47d + +module_param(vcom, int, 0644); diff --git a/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.h b/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.h -new file mode 100755 +new file mode 100644 index 000000000000..f95192094ba7 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.h @@ -561627,7 +561653,7 @@ index 000000000000..f95192094ba7 +void ebc_pmic_verity_vcom(struct ebc_pmic *pmic); +#endif diff --git a/drivers/gpu/drm/rockchip/ebc-dev/pmic/tps65185.c b/drivers/gpu/drm/rockchip/ebc-dev/pmic/tps65185.c -new file mode 100755 +new file mode 100644 index 000000000000..f007dd0adb65 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/tps65185.c @@ -562305,7 +562331,7 @@ index 000000000000..f007dd0adb65 +MODULE_DESCRIPTION("ti tps65185 pmic"); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/rockchip/ebc-dev/tcon/Makefile b/drivers/gpu/drm/rockchip/ebc-dev/tcon/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..913d4813773b --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/Makefile @@ -562314,7 +562340,7 @@ index 000000000000..913d4813773b + +obj-$(CONFIG_ROCKCHIP_EBC_DEV) += ebc_tcon.o eink_tcon.o diff --git a/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.c b/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.c -new file mode 100755 +new file mode 100644 index 000000000000..23c82751bb1b --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.c @@ -562736,7 +562762,7 @@ index 000000000000..23c82751bb1b +MODULE_DESCRIPTION("ROCKCHIP EBC tcon driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.h b/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.h -new file mode 100755 +new file mode 100644 index 000000000000..9a9ea56f3cdb --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.h @@ -562861,7 +562887,7 @@ index 000000000000..9a9ea56f3cdb +} +#endif diff --git a/drivers/gpu/drm/rockchip/ebc-dev/tcon/eink_tcon.c b/drivers/gpu/drm/rockchip/ebc-dev/tcon/eink_tcon.c -new file mode 100755 +new file mode 100644 index 000000000000..01b2b9629c35 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/eink_tcon.c @@ -585570,7 +585596,7 @@ index 17e7c40a9e7b..46683937fc07 100644 /* * If we failed to find the CRTC(s) which this encoder is diff --git a/drivers/gpu/drm/rockchip/rk618/Kconfig b/drivers/gpu/drm/rockchip/rk618/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..03ae305a93c1 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/Kconfig @@ -585586,7 +585612,7 @@ index 000000000000..03ae305a93c1 + help + Rockchip rk618 display bridge chips driver. diff --git a/drivers/gpu/drm/rockchip/rk618/Makefile b/drivers/gpu/drm/rockchip/rk618/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..ad3ac27b36ad --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/Makefile @@ -585604,7 +585630,7 @@ index 000000000000..ad3ac27b36ad + rk618_hdmi.o \ + rk618_dsi.o diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_dither.c b/drivers/gpu/drm/rockchip/rk618/rk618_dither.c -new file mode 100755 +new file mode 100644 index 000000000000..a9bc0c37c2d6 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_dither.c @@ -585663,7 +585689,7 @@ index 000000000000..a9bc0c37c2d6 + +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_dither.h b/drivers/gpu/drm/rockchip/rk618/rk618_dither.h -new file mode 100755 +new file mode 100644 index 000000000000..c74bb95f0ce4 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_dither.h @@ -585686,7 +585712,7 @@ index 000000000000..c74bb95f0ce4 + +#endif diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_dsi.c b/drivers/gpu/drm/rockchip/rk618/rk618_dsi.c -new file mode 100755 +new file mode 100644 index 000000000000..a00825784e2d --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_dsi.c @@ -586887,7 +586913,7 @@ index 000000000000..a00825784e2d +MODULE_DESCRIPTION("Rockchip RK618 MIPI-DSI driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_hdmi.c b/drivers/gpu/drm/rockchip/rk618/rk618_hdmi.c -new file mode 100755 +new file mode 100644 index 000000000000..ab3fa5bfab54 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_hdmi.c @@ -588500,7 +588526,7 @@ index 000000000000..ab3fa5bfab54 +MODULE_DESCRIPTION("Rockchip RK618 HDMI driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_lvds.c b/drivers/gpu/drm/rockchip/rk618/rk618_lvds.c -new file mode 100755 +new file mode 100644 index 000000000000..b652e19a6a34 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_lvds.c @@ -588809,7 +588835,7 @@ index 000000000000..b652e19a6a34 +MODULE_DESCRIPTION("Rockchip RK618 LVDS driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_rgb.c b/drivers/gpu/drm/rockchip/rk618/rk618_rgb.c -new file mode 100755 +new file mode 100644 index 000000000000..76efc25aa216 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_rgb.c @@ -589116,7 +589142,7 @@ index 000000000000..76efc25aa216 +MODULE_DESCRIPTION("Rockchip RK618 RGB driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_scaler.c b/drivers/gpu/drm/rockchip/rk618/rk618_scaler.c -new file mode 100755 +new file mode 100644 index 000000000000..2c3a67664699 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_scaler.c @@ -589547,7 +589573,7 @@ index 000000000000..2c3a67664699 +MODULE_DESCRIPTION("Rockchip RK618 SCALER driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_vif.c b/drivers/gpu/drm/rockchip/rk618/rk618_vif.c -new file mode 100755 +new file mode 100644 index 000000000000..9dc9e10e2d3a --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_vif.c @@ -589814,7 +589840,7 @@ index 000000000000..9dc9e10e2d3a +MODULE_DESCRIPTION("Rockchip RK618 VIF driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/Kconfig b/drivers/gpu/drm/rockchip/rk628/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..41e1fbbe1e61 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/Kconfig @@ -589828,7 +589854,7 @@ index 000000000000..41e1fbbe1e61 + help + Rockchip RK628 display bridge chips driver. diff --git a/drivers/gpu/drm/rockchip/rk628/Makefile b/drivers/gpu/drm/rockchip/rk628/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..76d768d29776 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/Makefile @@ -589848,7 +589874,7 @@ index 000000000000..76d768d29776 + rk628_hdmi.o \ + rk628_hdmirx.o diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_combrxphy.c b/drivers/gpu/drm/rockchip/rk628/rk628_combrxphy.c -new file mode 100755 +new file mode 100644 index 000000000000..a83eeeaf935f --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_combrxphy.c @@ -590884,7 +590910,7 @@ index 000000000000..a83eeeaf935f +MODULE_DESCRIPTION("Rockchip RK628 HDMI Combo RX PHY driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.c b/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.c -new file mode 100755 +new file mode 100644 index 000000000000..cbe7923139b7 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.c @@ -591410,7 +591436,7 @@ index 000000000000..cbe7923139b7 +MODULE_DESCRIPTION("Rockchip RK628 GVI/LVDS/MIPI Combo TX PHY driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.h b/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.h -new file mode 100755 +new file mode 100644 index 000000000000..40d785eecd67 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.h @@ -591429,7 +591455,7 @@ index 000000000000..40d785eecd67 + +#endif diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_dsi.c b/drivers/gpu/drm/rockchip/rk628/rk628_dsi.c -new file mode 100755 +new file mode 100644 index 000000000000..fc7da77ec0e4 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_dsi.c @@ -592830,7 +592856,7 @@ index 000000000000..fc7da77ec0e4 +MODULE_DESCRIPTION("Rockchip RK628 MIPI-DSI driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_gvi.c b/drivers/gpu/drm/rockchip/rk628/rk628_gvi.c -new file mode 100755 +new file mode 100644 index 000000000000..a3c92195e2dd --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_gvi.c @@ -593500,7 +593526,7 @@ index 000000000000..a3c92195e2dd +MODULE_DESCRIPTION("Rockchip RK628 GVI driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_hdmi.c b/drivers/gpu/drm/rockchip/rk628/rk628_hdmi.c -new file mode 100755 +new file mode 100644 index 000000000000..29b5fcb2d3bc --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_hdmi.c @@ -595128,7 +595154,7 @@ index 000000000000..29b5fcb2d3bc +MODULE_DESCRIPTION("Rockchip RK628 HDMI driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_hdmirx.c b/drivers/gpu/drm/rockchip/rk628/rk628_hdmirx.c -new file mode 100755 +new file mode 100644 index 000000000000..7ff3cc0087a1 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_hdmirx.c @@ -596114,7 +596140,7 @@ index 000000000000..7ff3cc0087a1 +MODULE_DESCRIPTION("Rockchip RK628 HDMI RX driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c b/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c -new file mode 100755 +new file mode 100644 index 000000000000..61326b1477cc --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c @@ -596439,7 +596465,7 @@ index 000000000000..61326b1477cc +MODULE_DESCRIPTION("Rockchip RK628 LVDS driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_post_process.c b/drivers/gpu/drm/rockchip/rk628/rk628_post_process.c -new file mode 100755 +new file mode 100644 index 000000000000..80fd257a6471 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_post_process.c @@ -596940,7 +596966,7 @@ index 000000000000..80fd257a6471 +MODULE_DESCRIPTION("Rockchip RK628 Post Process driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_rgb.c b/drivers/gpu/drm/rockchip/rk628/rk628_rgb.c -new file mode 100755 +new file mode 100644 index 000000000000..df8cc3cee860 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_rgb.c @@ -597324,7 +597350,7 @@ index 000000000000..df8cc3cee860 +MODULE_DESCRIPTION("Rockchip RK628 RGB driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.c b/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.c -new file mode 100755 +new file mode 100644 index 000000000000..adbc11679f53 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.c @@ -598733,7 +598759,7 @@ index 000000000000..adbc11679f53 +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:" DRIVER_NAME); diff --git a/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.h b/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.h -new file mode 100755 +new file mode 100644 index 000000000000..a4330df85b33 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.h @@ -599028,7 +599054,7 @@ index 000000000000..a4330df85b33 + +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_backlight.c b/drivers/gpu/drm/rockchip/rockchip_drm_backlight.c -new file mode 100755 +new file mode 100644 index 000000000000..2f0a98749683 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_backlight.c @@ -599548,7 +599574,7 @@ index 000000000000..2f0a98749683 +MODULE_DESCRIPTION("Rockchip Drm Backlight Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_backlight.h b/drivers/gpu/drm/rockchip/rockchip_drm_backlight.h -new file mode 100755 +new file mode 100644 index 000000000000..4c8dc6348354 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_backlight.h @@ -599908,7 +599934,7 @@ index 000000000000..f606377aeb07 + return ret; +} diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.c b/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.c -new file mode 100755 +new file mode 100644 index 000000000000..923bcf3b2aa9 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.c @@ -600201,7 +600227,7 @@ index 000000000000..923bcf3b2aa9 + return 0; +} diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.h b/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.h -new file mode 100755 +new file mode 100644 index 000000000000..5bb39c0447f0 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.h @@ -601180,7 +601206,7 @@ index 000000000000..4368f3397dbe + +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c -index 0f3eb392fe39..9f64ad8ed07b 100644 +index 0f3eb392fe39..55ea3e6e8d86 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -6,17 +6,24 @@ @@ -604083,7 +604109,7 @@ index 2fdc455c4ad7..bd449be5b9c0 100644 drm_fb_helper_unregister_fbi(helper); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c -index 22ff4a592976..9a4b78d04191 100644 +index 6038aafa29c6..412ffd7f7ec6 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c @@ -4,7 +4,7 @@ @@ -604934,7 +604960,7 @@ index 7ffc541bea07..34bcb76b20e3 100644 +void rockchip_gem_get_ddr_info(void); #endif /* _ROCKCHIP_DRM_GEM_H */ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_logo.c b/drivers/gpu/drm/rockchip/rockchip_drm_logo.c -new file mode 100755 +new file mode 100644 index 000000000000..af228f40c404 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_logo.c @@ -606174,7 +606200,7 @@ index 000000000000..af228f40c404 +late_initcall_sync(rockchip_clocks_loader_unprotect); +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_logo.h b/drivers/gpu/drm/rockchip/rockchip_drm_logo.h -new file mode 100755 +new file mode 100644 index 000000000000..7e1b1d2dfdf4 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_logo.h @@ -606501,7 +606527,7 @@ index 000000000000..7c764fca154d + +subsys_initcall_sync(rockchip_drm_self_test); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_tve.c b/drivers/gpu/drm/rockchip/rockchip_drm_tve.c -new file mode 100755 +new file mode 100644 index 000000000000..6fbd17c1b003 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_tve.c @@ -607574,7 +607600,7 @@ index 000000000000..6fbd17c1b003 +MODULE_DESCRIPTION("ROCKCHIP TVE Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_tve.h b/drivers/gpu/drm/rockchip/rockchip_drm_tve.h -new file mode 100755 +new file mode 100644 index 000000000000..376b2ff0f422 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_tve.h @@ -607865,7 +607891,7 @@ index 000000000000..376b2ff0f422 + +#endif /* _ROCKCHIP_DRM_TVE_ */ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vconn.c b/drivers/gpu/drm/rockchip/rockchip_drm_vconn.c -new file mode 100755 +new file mode 100644 index 000000000000..f0fab09d386b --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vconn.c @@ -608458,7 +608484,7 @@ index 000000000000..f0fab09d386b + }, +}; diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c -index af98bfcde518..b80ef0c6dc53 100644 +index 682d78fab9a5..09a256b3e6bd 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -6,21 +6,28 @@ @@ -615620,7 +615646,7 @@ index 857d97cdc67c..5f72a76beee0 100644 +extern const struct component_ops vop2_component_ops; #endif /* _ROCKCHIP_DRM_VOP_H */ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c -new file mode 100755 +new file mode 100644 index 000000000000..2c7a66adfb75 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -627766,7 +627792,7 @@ index 000000000000..2c7a66adfb75 +}; +EXPORT_SYMBOL_GPL(vop2_component_ops); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vvop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vvop.c -new file mode 100755 +new file mode 100644 index 000000000000..3f4432ad596c --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vvop.c @@ -632639,7 +632665,7 @@ index 27b9635124bc..8973232e0caa 100644 return NULL; } diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_clk.c b/drivers/gpu/drm/rockchip/rockchip_vop2_clk.c -new file mode 100755 +new file mode 100644 index 000000000000..b670e3d38a64 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_clk.c @@ -632977,7 +633003,7 @@ index 000000000000..b670e3d38a64 + return 0; +} diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c -new file mode 100755 +new file mode 100644 index 000000000000..9854a23f545b --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c @@ -640847,7 +640873,7 @@ index 6e9fa5815d4d..a33f6fcecb78 100644 +#define RK3528_ACM_YHS_DEL_HGAIN_SEG64 0x07d8 #endif /* _ROCKCHIP_VOP_REG_H */ diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c -index 13c14eb175e9..3a3de40fc90f 100644 +index 6abcf975a2db..960fbd0a95b3 100644 --- a/drivers/i2c/busses/i2c-rk3x.c +++ b/drivers/i2c/busses/i2c-rk3x.c @@ -23,6 +23,8 @@ @@ -641351,7 +641377,7 @@ index 13c14eb175e9..3a3de40fc90f 100644 MODULE_DESCRIPTION("Rockchip RK3xxx I2C Bus driver"); MODULE_AUTHOR("Max Schwarz "); diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c -index 34fecf97a355..d041b7fa5c9c 100644 +index e8a89e18c640..3a9fc1c88ed7 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -61,6 +61,7 @@ @@ -641474,7 +641500,7 @@ index e39b679126a2..2760f1e52b97 100644 tristate "Spreadtrum SC27xx series PMICs ADC" depends on MFD_SC27XX_PMIC || COMPILE_TEST diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c -index 12584f1631d8..c266169dfe61 100644 +index deb58e232770..badb07ed59b4 100644 --- a/drivers/iio/adc/rockchip_saradc.c +++ b/drivers/iio/adc/rockchip_saradc.c @@ -35,7 +35,7 @@ @@ -641593,7 +641619,7 @@ index 12584f1631d8..c266169dfe61 100644 }, {}, }; -@@ -278,6 +317,72 @@ static irqreturn_t rockchip_saradc_trigger_handler(int irq, void *p) +@@ -280,6 +319,72 @@ static irqreturn_t rockchip_saradc_trigger_handler(int irq, void *p) return IRQ_HANDLED; } @@ -641666,7 +641692,7 @@ index 12584f1631d8..c266169dfe61 100644 static int rockchip_saradc_probe(struct platform_device *pdev) { struct rockchip_saradc *info = NULL; -@@ -390,6 +495,13 @@ static int rockchip_saradc_probe(struct platform_device *pdev) +@@ -392,6 +497,13 @@ static int rockchip_saradc_probe(struct platform_device *pdev) return ret; } @@ -641680,7 +641706,7 @@ index 12584f1631d8..c266169dfe61 100644 ret = clk_prepare_enable(info->pclk); if (ret < 0) { dev_err(&pdev->dev, "failed to enable pclk\n"); -@@ -430,6 +542,21 @@ static int rockchip_saradc_probe(struct platform_device *pdev) +@@ -432,6 +544,21 @@ static int rockchip_saradc_probe(struct platform_device *pdev) if (ret) return ret; @@ -641757,7 +641783,7 @@ index 54afb38601b9..bb29a7c9a1c0 100644 } diff --git a/drivers/input/keyboard/rk_keys.c b/drivers/input/keyboard/rk_keys.c -new file mode 100755 +new file mode 100644 index 000000000000..375cfbd600ea --- /dev/null +++ b/drivers/input/keyboard/rk_keys.c @@ -642318,7 +642344,7 @@ index 000000000000..375cfbd600ea +late_initcall_sync(rk_keys_driver_init); +module_exit(rk_keys_driver_exit); diff --git a/drivers/input/remotectl/Kconfig b/drivers/input/remotectl/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..67558b48869e --- /dev/null +++ b/drivers/input/remotectl/Kconfig @@ -642343,7 +642369,7 @@ index 000000000000..67558b48869e + +endif diff --git a/drivers/input/remotectl/Makefile b/drivers/input/remotectl/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..209472b4a356 --- /dev/null +++ b/drivers/input/remotectl/Makefile @@ -642357,7 +642383,7 @@ index 000000000000..209472b4a356 + +obj-$(CONFIG_ROCKCHIP_REMOTECTL_PWM) += rockchip_pwm_remotectl.o diff --git a/drivers/input/remotectl/rockchip_pwm_remotectl.c b/drivers/input/remotectl/rockchip_pwm_remotectl.c -new file mode 100755 +new file mode 100644 index 000000000000..f24ba9edf08b --- /dev/null +++ b/drivers/input/remotectl/rockchip_pwm_remotectl.c @@ -643191,7 +643217,7 @@ index 000000000000..f24ba9edf08b + +MODULE_LICENSE("GPL"); diff --git a/drivers/input/remotectl/rockchip_pwm_remotectl.h b/drivers/input/remotectl/rockchip_pwm_remotectl.h -new file mode 100755 +new file mode 100644 index 000000000000..5126a3edb5d5 --- /dev/null +++ b/drivers/input/remotectl/rockchip_pwm_remotectl.h @@ -643357,7 +643383,7 @@ index 000000000000..5126a3edb5d5 + +#endif diff --git a/drivers/input/sensors/Kconfig b/drivers/input/sensors/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..ebff9437aa66 --- /dev/null +++ b/drivers/input/sensors/Kconfig @@ -643386,7 +643412,7 @@ index 000000000000..ebff9437aa66 + +endif diff --git a/drivers/input/sensors/Makefile b/drivers/input/sensors/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..df8d372dafe1 --- /dev/null +++ b/drivers/input/sensors/Makefile @@ -643407,7 +643433,7 @@ index 000000000000..df8d372dafe1 +obj-$(CONFIG_SENSOR_DEVICE) += sensor_dev.o +sensor_dev-y = sensor-i2c.o sensor-dev.o diff --git a/drivers/input/sensors/accel/Kconfig b/drivers/input/sensors/accel/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..724cb2ca1e7a --- /dev/null +++ b/drivers/input/sensors/accel/Kconfig @@ -643562,7 +643588,7 @@ index 000000000000..724cb2ca1e7a + +endif diff --git a/drivers/input/sensors/accel/Makefile b/drivers/input/sensors/accel/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..de250ef4a282 --- /dev/null +++ b/drivers/input/sensors/accel/Makefile @@ -643590,7 +643616,7 @@ index 000000000000..de250ef4a282 +obj-$(CONFIG_ICM2060X_ACC) += icm2060x_acc.o +da223-y := da223_cust.o da223_core.o diff --git a/drivers/input/sensors/accel/bma2xx.c b/drivers/input/sensors/accel/bma2xx.c -new file mode 100755 +new file mode 100644 index 000000000000..19f578a77295 --- /dev/null +++ b/drivers/input/sensors/accel/bma2xx.c @@ -645864,7 +645890,7 @@ index 000000000000..19f578a77295 +MODULE_DESCRIPTION("bma2x2 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/da223_core.c b/drivers/input/sensors/accel/da223_core.c -new file mode 100755 +new file mode 100644 index 000000000000..b0e25eac9b5f --- /dev/null +++ b/drivers/input/sensors/accel/da223_core.c @@ -647777,7 +647803,7 @@ index 000000000000..b0e25eac9b5f + return res; +} diff --git a/drivers/input/sensors/accel/da223_core.h b/drivers/input/sensors/accel/da223_core.h -new file mode 100755 +new file mode 100644 index 000000000000..de67d711b486 --- /dev/null +++ b/drivers/input/sensors/accel/da223_core.h @@ -648086,7 +648112,7 @@ index 000000000000..de67d711b486 + + diff --git a/drivers/input/sensors/accel/da223_cust.c b/drivers/input/sensors/accel/da223_cust.c -new file mode 100755 +new file mode 100644 index 000000000000..c00836d5b78d --- /dev/null +++ b/drivers/input/sensors/accel/da223_cust.c @@ -648990,7 +649016,7 @@ index 000000000000..c00836d5b78d +MODULE_DESCRIPTION("mir3da 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/da223_cust.h b/drivers/input/sensors/accel/da223_cust.h -new file mode 100755 +new file mode 100644 index 000000000000..e6bf15a02da8 --- /dev/null +++ b/drivers/input/sensors/accel/da223_cust.h @@ -649040,7 +649066,7 @@ index 000000000000..e6bf15a02da8 + + diff --git a/drivers/input/sensors/accel/dmard10.c b/drivers/input/sensors/accel/dmard10.c -new file mode 100755 +new file mode 100644 index 000000000000..8be258c316a2 --- /dev/null +++ b/drivers/input/sensors/accel/dmard10.c @@ -649500,7 +649526,7 @@ index 000000000000..8be258c316a2 +MODULE_LICENSE("GPL"); + diff --git a/drivers/input/sensors/accel/icm2060x_acc.c b/drivers/input/sensors/accel/icm2060x_acc.c -new file mode 100755 +new file mode 100644 index 000000000000..80a5c96e6207 --- /dev/null +++ b/drivers/input/sensors/accel/icm2060x_acc.c @@ -649766,7 +649792,7 @@ index 000000000000..80a5c96e6207 +MODULE_DESCRIPTION("icm2060x_acc 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/kxtik.c b/drivers/input/sensors/accel/kxtik.c -new file mode 100755 +new file mode 100644 index 000000000000..734b471f5d3a --- /dev/null +++ b/drivers/input/sensors/accel/kxtik.c @@ -650131,7 +650157,7 @@ index 000000000000..734b471f5d3a +MODULE_DESCRIPTION("kxtik 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/kxtj9.c b/drivers/input/sensors/accel/kxtj9.c -new file mode 100755 +new file mode 100644 index 000000000000..6fc6a8c5f119 --- /dev/null +++ b/drivers/input/sensors/accel/kxtj9.c @@ -650469,7 +650495,7 @@ index 000000000000..6fc6a8c5f119 +MODULE_DESCRIPTION("kxtj9 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/lis3dh.c b/drivers/input/sensors/accel/lis3dh.c -new file mode 100755 +new file mode 100644 index 000000000000..55f0fe526899 --- /dev/null +++ b/drivers/input/sensors/accel/lis3dh.c @@ -650778,7 +650804,7 @@ index 000000000000..55f0fe526899 +MODULE_DESCRIPTION("lis3dh 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/lsm303d.c b/drivers/input/sensors/accel/lsm303d.c -new file mode 100755 +new file mode 100644 index 000000000000..ff238278f10c --- /dev/null +++ b/drivers/input/sensors/accel/lsm303d.c @@ -651146,7 +651172,7 @@ index 000000000000..ff238278f10c +MODULE_DESCRIPTION("lsm303d 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/lsm330_acc.c b/drivers/input/sensors/accel/lsm330_acc.c -new file mode 100755 +new file mode 100644 index 000000000000..ed93bb0147ff --- /dev/null +++ b/drivers/input/sensors/accel/lsm330_acc.c @@ -651430,7 +651456,7 @@ index 000000000000..ed93bb0147ff +MODULE_DESCRIPTION("lsm330_acc 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/mc3230.c b/drivers/input/sensors/accel/mc3230.c -new file mode 100755 +new file mode 100644 index 000000000000..d5827f2f2bee --- /dev/null +++ b/drivers/input/sensors/accel/mc3230.c @@ -652789,7 +652815,7 @@ index 000000000000..d5827f2f2bee +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("mc3230 3-Axis accelerometer driver"); diff --git a/drivers/input/sensors/accel/mma7660.c b/drivers/input/sensors/accel/mma7660.c -new file mode 100755 +new file mode 100644 index 000000000000..33e2dec7bb22 --- /dev/null +++ b/drivers/input/sensors/accel/mma7660.c @@ -653053,7 +653079,7 @@ index 000000000000..33e2dec7bb22 +MODULE_DESCRIPTION("mma7660 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/mma8452.c b/drivers/input/sensors/accel/mma8452.c -new file mode 100755 +new file mode 100644 index 000000000000..9c8bb48f0848 --- /dev/null +++ b/drivers/input/sensors/accel/mma8452.c @@ -653483,7 +653509,7 @@ index 000000000000..9c8bb48f0848 +MODULE_DESCRIPTION("mma8452 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/mpu6500_acc.c b/drivers/input/sensors/accel/mpu6500_acc.c -new file mode 100755 +new file mode 100644 index 000000000000..6fc2058e0f9f --- /dev/null +++ b/drivers/input/sensors/accel/mpu6500_acc.c @@ -653789,7 +653815,7 @@ index 000000000000..6fc2058e0f9f +MODULE_DESCRIPTION("mpu6500_acc 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/mpu6880_acc.c b/drivers/input/sensors/accel/mpu6880_acc.c -new file mode 100755 +new file mode 100644 index 000000000000..4cf8c89506a5 --- /dev/null +++ b/drivers/input/sensors/accel/mpu6880_acc.c @@ -654091,7 +654117,7 @@ index 000000000000..4cf8c89506a5 +MODULE_DESCRIPTION("mpu6880 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/mxc622x.c b/drivers/input/sensors/accel/mxc622x.c -new file mode 100755 +new file mode 100644 index 000000000000..614242584e0a --- /dev/null +++ b/drivers/input/sensors/accel/mxc622x.c @@ -654381,7 +654407,7 @@ index 000000000000..614242584e0a +MODULE_DESCRIPTION("mxc6225 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/mxc6655xa.c b/drivers/input/sensors/accel/mxc6655xa.c -new file mode 100755 +new file mode 100644 index 000000000000..535a83a262f5 --- /dev/null +++ b/drivers/input/sensors/accel/mxc6655xa.c @@ -654649,7 +654675,7 @@ index 000000000000..535a83a262f5 +MODULE_DESCRIPTION("mxc6655 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/sc7660.c b/drivers/input/sensors/accel/sc7660.c -new file mode 100755 +new file mode 100644 index 000000000000..39106b111000 --- /dev/null +++ b/drivers/input/sensors/accel/sc7660.c @@ -656310,7 +656336,7 @@ index 000000000000..39106b111000 +MODULE_DESCRIPTION("sc7660 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/sc7a20.c b/drivers/input/sensors/accel/sc7a20.c -new file mode 100755 +new file mode 100644 index 000000000000..f7443f922e7e --- /dev/null +++ b/drivers/input/sensors/accel/sc7a20.c @@ -658084,7 +658110,7 @@ index 000000000000..f7443f922e7e +MODULE_DESCRIPTION("sc7a20 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/sc7a30.c b/drivers/input/sensors/accel/sc7a30.c -new file mode 100755 +new file mode 100644 index 000000000000..576c9188029b --- /dev/null +++ b/drivers/input/sensors/accel/sc7a30.c @@ -659305,7 +659331,7 @@ index 000000000000..576c9188029b +MODULE_DESCRIPTION("sc7a30 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/stk8baxx.c b/drivers/input/sensors/accel/stk8baxx.c -new file mode 100755 +new file mode 100644 index 000000000000..9ca93971d914 --- /dev/null +++ b/drivers/input/sensors/accel/stk8baxx.c @@ -660268,7 +660294,7 @@ index 000000000000..9ca93971d914 +MODULE_LICENSE("GPL"); +MODULE_VERSION(STK_ACC_DRIVER_VERSION); diff --git a/drivers/input/sensors/angle/Kconfig b/drivers/input/sensors/angle/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..088837f92ed8 --- /dev/null +++ b/drivers/input/sensors/angle/Kconfig @@ -660301,7 +660327,7 @@ index 000000000000..088837f92ed8 +endif + diff --git a/drivers/input/sensors/angle/Makefile b/drivers/input/sensors/angle/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..0696550b53f8 --- /dev/null +++ b/drivers/input/sensors/angle/Makefile @@ -660310,7 +660336,7 @@ index 000000000000..0696550b53f8 +obj-$(CONFIG_ANGLE_KXTIK) += angle_kxtik.o +obj-$(CONFIG_ANGLE_LIS3DH) += angle_lis3dh.o diff --git a/drivers/input/sensors/angle/angle_kxtik.c b/drivers/input/sensors/angle/angle_kxtik.c -new file mode 100755 +new file mode 100644 index 000000000000..7373c6bd4068 --- /dev/null +++ b/drivers/input/sensors/angle/angle_kxtik.c @@ -660714,7 +660740,7 @@ index 000000000000..7373c6bd4068 +MODULE_DESCRIPTION("kxtik angle driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/angle/angle_lis3dh.c b/drivers/input/sensors/angle/angle_lis3dh.c -new file mode 100755 +new file mode 100644 index 000000000000..ae247ffa2312 --- /dev/null +++ b/drivers/input/sensors/angle/angle_lis3dh.c @@ -661062,7 +661088,7 @@ index 000000000000..ae247ffa2312 + + diff --git a/drivers/input/sensors/compass/Kconfig b/drivers/input/sensors/compass/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..91a19ffe23ea --- /dev/null +++ b/drivers/input/sensors/compass/Kconfig @@ -661126,7 +661152,7 @@ index 000000000000..91a19ffe23ea +endif + diff --git a/drivers/input/sensors/compass/Makefile b/drivers/input/sensors/compass/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..f42c2aa2dd17 --- /dev/null +++ b/drivers/input/sensors/compass/Makefile @@ -661140,7 +661166,7 @@ index 000000000000..f42c2aa2dd17 +obj-$(CONFIG_COMPASS_AK09911) += ak09911.o +obj-$(CONFIG_COMPASS_AK09918) += ak09918.o diff --git a/drivers/input/sensors/compass/ak09911.c b/drivers/input/sensors/compass/ak09911.c -new file mode 100755 +new file mode 100644 index 000000000000..b1e334d0b5a8 --- /dev/null +++ b/drivers/input/sensors/compass/ak09911.c @@ -661813,7 +661839,7 @@ index 000000000000..b1e334d0b5a8 +MODULE_DESCRIPTION("akm09911 3-Axis compasss driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/compass/ak09918.c b/drivers/input/sensors/compass/ak09918.c -new file mode 100755 +new file mode 100644 index 000000000000..1c3056a824e5 --- /dev/null +++ b/drivers/input/sensors/compass/ak09918.c @@ -662511,7 +662537,7 @@ index 000000000000..1c3056a824e5 +MODULE_DESCRIPTION("akm09918 3-Axis compasss driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/compass/ak8963.c b/drivers/input/sensors/compass/ak8963.c -new file mode 100755 +new file mode 100644 index 000000000000..10e91eb2d0be --- /dev/null +++ b/drivers/input/sensors/compass/ak8963.c @@ -663231,7 +663257,7 @@ index 000000000000..10e91eb2d0be +MODULE_DESCRIPTION("akm8963 3-Axis compasss driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/compass/ak8975.c b/drivers/input/sensors/compass/ak8975.c -new file mode 100755 +new file mode 100644 index 000000000000..c48a808ed18d --- /dev/null +++ b/drivers/input/sensors/compass/ak8975.c @@ -663887,7 +663913,7 @@ index 000000000000..c48a808ed18d + + diff --git a/drivers/input/sensors/gyro/Kconfig b/drivers/input/sensors/gyro/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..fb721d4cb30d --- /dev/null +++ b/drivers/input/sensors/gyro/Kconfig @@ -663935,7 +663961,7 @@ index 000000000000..fb721d4cb30d + tristate "gyroscope icm2060x_gyro" +endif diff --git a/drivers/input/sensors/gyro/Makefile b/drivers/input/sensors/gyro/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..0943257a11de --- /dev/null +++ b/drivers/input/sensors/gyro/Makefile @@ -663952,7 +663978,7 @@ index 000000000000..0943257a11de +obj-$(CONFIG_GYRO_LSM330) += lsm330_gyro.o +obj-$(CONFIG_GYRO_ICM2060X) += icm2060x_gyro.o diff --git a/drivers/input/sensors/gyro/ewtsa.c b/drivers/input/sensors/gyro/ewtsa.c -new file mode 100755 +new file mode 100644 index 000000000000..acbc0ac4b143 --- /dev/null +++ b/drivers/input/sensors/gyro/ewtsa.c @@ -664419,7 +664445,7 @@ index 000000000000..acbc0ac4b143 +MODULE_DESCRIPTION("ewtsa 3-Axis Gyroscope driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/gyro/icm2060x_gyro.c b/drivers/input/sensors/gyro/icm2060x_gyro.c -new file mode 100755 +new file mode 100644 index 000000000000..3d4624b5dbd6 --- /dev/null +++ b/drivers/input/sensors/gyro/icm2060x_gyro.c @@ -664641,7 +664667,7 @@ index 000000000000..3d4624b5dbd6 +MODULE_DESCRIPTION("icm2060x_gyro 3-Axis Gyroscope driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/gyro/l3g20d.c b/drivers/input/sensors/gyro/l3g20d.c -new file mode 100755 +new file mode 100644 index 000000000000..8822a0e3bfe0 --- /dev/null +++ b/drivers/input/sensors/gyro/l3g20d.c @@ -664904,7 +664930,7 @@ index 000000000000..8822a0e3bfe0 +MODULE_DESCRIPTION("l3g20d 3-Axis Gyroscope driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/gyro/l3g4200d.c b/drivers/input/sensors/gyro/l3g4200d.c -new file mode 100755 +new file mode 100644 index 000000000000..b1e3af6589cb --- /dev/null +++ b/drivers/input/sensors/gyro/l3g4200d.c @@ -665167,7 +665193,7 @@ index 000000000000..b1e3af6589cb +MODULE_DESCRIPTION("l3g4200d 3-Axis Gyroscope driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/gyro/lsm330_gyro.c b/drivers/input/sensors/gyro/lsm330_gyro.c -new file mode 100755 +new file mode 100644 index 000000000000..a488d4826acf --- /dev/null +++ b/drivers/input/sensors/gyro/lsm330_gyro.c @@ -665435,7 +665461,7 @@ index 000000000000..a488d4826acf +MODULE_DESCRIPTION("lsm330 3-Axis Gyroscope driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/gyro/mpu6500_gyro.c b/drivers/input/sensors/gyro/mpu6500_gyro.c -new file mode 100755 +new file mode 100644 index 000000000000..6b4f81154b7f --- /dev/null +++ b/drivers/input/sensors/gyro/mpu6500_gyro.c @@ -665657,7 +665683,7 @@ index 000000000000..6b4f81154b7f +MODULE_DESCRIPTION("mpu6500_gyro 3-Axis Gyroscope driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/gyro/mpu6880_gyro.c b/drivers/input/sensors/gyro/mpu6880_gyro.c -new file mode 100755 +new file mode 100644 index 000000000000..324e66ecfab6 --- /dev/null +++ b/drivers/input/sensors/gyro/mpu6880_gyro.c @@ -665879,7 +665905,7 @@ index 000000000000..324e66ecfab6 +MODULE_DESCRIPTION("mpu6880_gyro 3-Axis Gyroscope driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/hall/Kconfig b/drivers/input/sensors/hall/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..33ca28c87cda --- /dev/null +++ b/drivers/input/sensors/hall/Kconfig @@ -665901,7 +665927,7 @@ index 000000000000..33ca28c87cda + +endif diff --git a/drivers/input/sensors/hall/Makefile b/drivers/input/sensors/hall/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..f78ba4ffb850 --- /dev/null +++ b/drivers/input/sensors/hall/Makefile @@ -665910,7 +665936,7 @@ index 000000000000..f78ba4ffb850 +obj-$(CONFIG_HS_OCH165T) += och165t_hall.o +obj-$(CONFIG_HS_MH248) += mh248.o diff --git a/drivers/input/sensors/hall/mh248.c b/drivers/input/sensors/hall/mh248.c -new file mode 100755 +new file mode 100644 index 000000000000..88ee00980514 --- /dev/null +++ b/drivers/input/sensors/hall/mh248.c @@ -666081,7 +666107,7 @@ index 000000000000..88ee00980514 +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("Hall Sensor MH248 driver"); diff --git a/drivers/input/sensors/hall/och165t_hall.c b/drivers/input/sensors/hall/och165t_hall.c -new file mode 100755 +new file mode 100644 index 000000000000..71711a95028d --- /dev/null +++ b/drivers/input/sensors/hall/och165t_hall.c @@ -666246,7 +666272,7 @@ index 000000000000..71711a95028d +MODULE_DESCRIPTION("och165t hall driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/lsensor/Kconfig b/drivers/input/sensors/lsensor/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..8ea493862dd3 --- /dev/null +++ b/drivers/input/sensors/lsensor/Kconfig @@ -666302,7 +666328,7 @@ index 000000000000..8ea493862dd3 +endif + diff --git a/drivers/input/sensors/lsensor/Makefile b/drivers/input/sensors/lsensor/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..aa8bf78f440c --- /dev/null +++ b/drivers/input/sensors/lsensor/Makefile @@ -666321,7 +666347,7 @@ index 000000000000..aa8bf78f440c +obj-$(CONFIG_LS_STK3410) += ls_stk3410.o +obj-$(CONFIG_LS_EM3071X) += ls_em3071x.o diff --git a/drivers/input/sensors/lsensor/cm3217.c b/drivers/input/sensors/lsensor/cm3217.c -new file mode 100755 +new file mode 100644 index 000000000000..182fee423993 --- /dev/null +++ b/drivers/input/sensors/lsensor/cm3217.c @@ -666564,7 +666590,7 @@ index 000000000000..182fee423993 +MODULE_DESCRIPTION("cm3217 light driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/lsensor/cm3218.c b/drivers/input/sensors/lsensor/cm3218.c -new file mode 100755 +new file mode 100644 index 000000000000..eed39578b005 --- /dev/null +++ b/drivers/input/sensors/lsensor/cm3218.c @@ -666985,7 +667011,7 @@ index 000000000000..eed39578b005 +MODULE_DESCRIPTION("cm3218 light driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/lsensor/cm3232.c b/drivers/input/sensors/lsensor/cm3232.c -new file mode 100755 +new file mode 100644 index 000000000000..6322e57bb1a9 --- /dev/null +++ b/drivers/input/sensors/lsensor/cm3232.c @@ -667236,7 +667262,7 @@ index 000000000000..6322e57bb1a9 +MODULE_DESCRIPTION("cm3232 light driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/lsensor/isl29023.c b/drivers/input/sensors/lsensor/isl29023.c -new file mode 100755 +new file mode 100644 index 000000000000..200c4b2959c7 --- /dev/null +++ b/drivers/input/sensors/lsensor/isl29023.c @@ -667515,7 +667541,7 @@ index 000000000000..200c4b2959c7 +MODULE_DESCRIPTION("isl29023 light driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/lsensor/ls_al3006.c b/drivers/input/sensors/lsensor/ls_al3006.c -new file mode 100755 +new file mode 100644 index 000000000000..8334d0faceaf --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_al3006.c @@ -667822,7 +667848,7 @@ index 000000000000..8334d0faceaf +MODULE_LICENSE("GPL"); + diff --git a/drivers/input/sensors/lsensor/ls_ap321xx.c b/drivers/input/sensors/lsensor/ls_ap321xx.c -new file mode 100755 +new file mode 100644 index 000000000000..8181cec587a0 --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_ap321xx.c @@ -668243,7 +668269,7 @@ index 000000000000..8181cec587a0 + + diff --git a/drivers/input/sensors/lsensor/ls_em3071x.c b/drivers/input/sensors/lsensor/ls_em3071x.c -new file mode 100755 +new file mode 100644 index 000000000000..fc7500963ab5 --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_em3071x.c @@ -668532,7 +668558,7 @@ index 000000000000..fc7500963ab5 +MODULE_DESCRIPTION("em3071x light driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/lsensor/ls_stk3171.c b/drivers/input/sensors/lsensor/ls_stk3171.c -new file mode 100755 +new file mode 100644 index 000000000000..a8bc7d0e9af3 --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_stk3171.c @@ -668859,7 +668885,7 @@ index 000000000000..a8bc7d0e9af3 + + diff --git a/drivers/input/sensors/lsensor/ls_stk3410.c b/drivers/input/sensors/lsensor/ls_stk3410.c -new file mode 100755 +new file mode 100644 index 000000000000..25722040fc31 --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_stk3410.c @@ -669239,7 +669265,7 @@ index 000000000000..25722040fc31 +MODULE_DESCRIPTION("stk3410 light driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/lsensor/ls_us5152.c b/drivers/input/sensors/lsensor/ls_us5152.c -new file mode 100755 +new file mode 100644 index 000000000000..4f5b470bc735 --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_us5152.c @@ -669685,7 +669711,7 @@ index 000000000000..4f5b470bc735 +MODULE_LICENSE("GPL"); +MODULE_VERSION(DRIVER_VERSION); diff --git a/drivers/input/sensors/lsensor/ls_us5152.h b/drivers/input/sensors/lsensor/ls_us5152.h -new file mode 100755 +new file mode 100644 index 000000000000..71f108572639 --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_us5152.h @@ -669926,7 +669952,7 @@ index 000000000000..71f108572639 +#define us5152_NUM_CACHABLE_REGS 0x12 +#endif diff --git a/drivers/input/sensors/pressure/Kconfig b/drivers/input/sensors/pressure/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..8bbaaa148690 --- /dev/null +++ b/drivers/input/sensors/pressure/Kconfig @@ -669947,7 +669973,7 @@ index 000000000000..8bbaaa148690 + +endif diff --git a/drivers/input/sensors/pressure/Makefile b/drivers/input/sensors/pressure/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..18872b53bb4b --- /dev/null +++ b/drivers/input/sensors/pressure/Makefile @@ -669960,7 +669986,7 @@ index 000000000000..18872b53bb4b +obj-$(CONFIG_PR_MS5607) += pr_ms5607.o + diff --git a/drivers/input/sensors/pressure/pr_ms5607.c b/drivers/input/sensors/pressure/pr_ms5607.c -new file mode 100755 +new file mode 100644 index 000000000000..9833ad5d9a9e --- /dev/null +++ b/drivers/input/sensors/pressure/pr_ms5607.c @@ -670263,7 +670289,7 @@ index 000000000000..9833ad5d9a9e +MODULE_DESCRIPTION("ms5607 pressure driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/psensor/Kconfig b/drivers/input/sensors/psensor/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..c7d32f51e7d0 --- /dev/null +++ b/drivers/input/sensors/psensor/Kconfig @@ -670301,7 +670327,7 @@ index 000000000000..c7d32f51e7d0 +endif + diff --git a/drivers/input/sensors/psensor/Makefile b/drivers/input/sensors/psensor/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..49210d0e71cc --- /dev/null +++ b/drivers/input/sensors/psensor/Makefile @@ -670315,7 +670341,7 @@ index 000000000000..49210d0e71cc +obj-$(CONFIG_PS_STK3410) += ps_stk3410.o +obj-$(CONFIG_PS_EM3071X) += ps_em3071x.o diff --git a/drivers/input/sensors/psensor/ps_al3006.c b/drivers/input/sensors/psensor/ps_al3006.c -new file mode 100755 +new file mode 100644 index 000000000000..3242af2be23f --- /dev/null +++ b/drivers/input/sensors/psensor/ps_al3006.c @@ -670582,7 +670608,7 @@ index 000000000000..3242af2be23f +MODULE_DESCRIPTION("al3006 proximity driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/psensor/ps_ap321xx.c b/drivers/input/sensors/psensor/ps_ap321xx.c -new file mode 100755 +new file mode 100644 index 000000000000..d3711461af20 --- /dev/null +++ b/drivers/input/sensors/psensor/ps_ap321xx.c @@ -670913,7 +670939,7 @@ index 000000000000..d3711461af20 +MODULE_DESCRIPTION("ps_ap321xx proximity driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/psensor/ps_em3071x.c b/drivers/input/sensors/psensor/ps_em3071x.c -new file mode 100755 +new file mode 100644 index 000000000000..5f387348881b --- /dev/null +++ b/drivers/input/sensors/psensor/ps_em3071x.c @@ -671199,7 +671225,7 @@ index 000000000000..5f387348881b +MODULE_DESCRIPTION("em3071x proximity driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/psensor/ps_stk3171.c b/drivers/input/sensors/psensor/ps_stk3171.c -new file mode 100755 +new file mode 100644 index 000000000000..1753bbe65c19 --- /dev/null +++ b/drivers/input/sensors/psensor/ps_stk3171.c @@ -671473,7 +671499,7 @@ index 000000000000..1753bbe65c19 +MODULE_DESCRIPTION("ps_stk3171 proximity driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/psensor/ps_stk3410.c b/drivers/input/sensors/psensor/ps_stk3410.c -new file mode 100755 +new file mode 100644 index 000000000000..90f9a2313d1f --- /dev/null +++ b/drivers/input/sensors/psensor/ps_stk3410.c @@ -671856,7 +671882,7 @@ index 000000000000..90f9a2313d1f +MODULE_DESCRIPTION("stk3410 proximity driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/sensor-dev.c b/drivers/input/sensors/sensor-dev.c -new file mode 100755 +new file mode 100644 index 000000000000..5aeeba175edd --- /dev/null +++ b/drivers/input/sensors/sensor-dev.c @@ -673904,7 +673930,7 @@ index 000000000000..5aeeba175edd +MODULE_DESCRIPTION("User space character device interface for sensors"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/sensor-i2c.c b/drivers/input/sensors/sensor-i2c.c -new file mode 100755 +new file mode 100644 index 000000000000..35c3feec8b32 --- /dev/null +++ b/drivers/input/sensors/sensor-i2c.c @@ -674155,7 +674181,7 @@ index 000000000000..35c3feec8b32 +EXPORT_SYMBOL(sensor_read_reg_normal); + diff --git a/drivers/input/sensors/temperature/Kconfig b/drivers/input/sensors/temperature/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..34edaa7838ac --- /dev/null +++ b/drivers/input/sensors/temperature/Kconfig @@ -674176,7 +674202,7 @@ index 000000000000..34edaa7838ac + +endif diff --git a/drivers/input/sensors/temperature/Makefile b/drivers/input/sensors/temperature/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..6045760d7e93 --- /dev/null +++ b/drivers/input/sensors/temperature/Makefile @@ -674189,7 +674215,7 @@ index 000000000000..6045760d7e93 +obj-$(CONFIG_TMP_MS5607) += tmp_ms5607.o + diff --git a/drivers/input/sensors/temperature/tmp_ms5607.c b/drivers/input/sensors/temperature/tmp_ms5607.c -new file mode 100755 +new file mode 100644 index 000000000000..1e5183ccc11d --- /dev/null +++ b/drivers/input/sensors/temperature/tmp_ms5607.c @@ -674553,7 +674579,7 @@ index 6233541e9173..4a3cd29bd96d 100644 obj-$(CONFIG_TOUCHSCREEN_ILI210X) += ili210x.o obj-$(CONFIG_TOUCHSCREEN_IMX6UL_TSC) += imx6ul_tsc.o diff --git a/drivers/input/touchscreen/cy8c_touchpad.c b/drivers/input/touchscreen/cy8c_touchpad.c -new file mode 100755 +new file mode 100644 index 000000000000..8088cb918c79 --- /dev/null +++ b/drivers/input/touchscreen/cy8c_touchpad.c @@ -674855,7 +674881,7 @@ index 000000000000..8088cb918c79 +MODULE_DESCRIPTION("Cypress Cy8cxxxx touchpad driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/input/touchscreen/cyttsp5/Kconfig b/drivers/input/touchscreen/cyttsp5/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..4bdeb1b8365d --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/Kconfig @@ -675066,7 +675092,7 @@ index 000000000000..4bdeb1b8365d + + diff --git a/drivers/input/touchscreen/cyttsp5/Makefile b/drivers/input/touchscreen/cyttsp5/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..ff1fe526035d --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/Makefile @@ -675095,7 +675121,7 @@ index 000000000000..ff1fe526035d +obj-$(CONFIG_TOUCHSCREEN_CYPRESS_CYTTSP5_DEVICE_ACCESS) += cyttsp5_device_access.o +obj-$(CONFIG_TOUCHSCREEN_CYPRESS_CYTTSP5_TEST_DEVICE_ACCESS_API) += cyttsp5_test_device_access_api.o diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_btn.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_btn.c -new file mode 100755 +new file mode 100644 index 000000000000..52c0eb85d29e --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_btn.c @@ -675470,7 +675496,7 @@ index 000000000000..52c0eb85d29e + return 0; +} diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_core.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_core.c -new file mode 100755 +new file mode 100644 index 000000000000..7fac39a1bbaf --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_core.c @@ -681768,7 +681794,7 @@ index 000000000000..7fac39a1bbaf +MODULE_DESCRIPTION("Parade TrueTouch(R) Standard Product Core Driver"); +MODULE_AUTHOR("Parade Technologies "); diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_core.h b/drivers/input/touchscreen/cyttsp5/cyttsp5_core.h -new file mode 100755 +new file mode 100644 index 000000000000..5989613865c1 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_core.h @@ -681956,7 +681982,7 @@ index 000000000000..5989613865c1 + +#endif /* _LINUX_CYTTSP5_CORE_H */ diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_debug.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_debug.c -new file mode 100755 +new file mode 100644 index 000000000000..f4ebba784936 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_debug.c @@ -682355,7 +682381,7 @@ index 000000000000..f4ebba784936 +MODULE_DESCRIPTION("Parade TrueTouch(R) Standard Product Debug Driver"); +MODULE_AUTHOR("Parade Technologies "); diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_device_access.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_device_access.c -new file mode 100755 +new file mode 100644 index 000000000000..51cd63dc6ac0 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_device_access.c @@ -687580,7 +687606,7 @@ index 000000000000..51cd63dc6ac0 +MODULE_AUTHOR("Parade Technologies "); + diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_devtree.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_devtree.c -new file mode 100755 +new file mode 100644 index 000000000000..9cb9050960b6 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_devtree.c @@ -688371,7 +688397,7 @@ index 000000000000..9cb9050960b6 +MODULE_DESCRIPTION("Parade TrueTouch(R) Standard Product DeviceTree Driver"); +MODULE_AUTHOR("Parade Technologies "); diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_i2c.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_i2c.c -new file mode 100755 +new file mode 100644 index 000000000000..976db422b907 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_i2c.c @@ -688625,7 +688651,7 @@ index 000000000000..976db422b907 +MODULE_DESCRIPTION("Parade TrueTouch(R) Standard Product I2C driver"); +MODULE_AUTHOR("Parade Technologies "); diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_loader.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_loader.c -new file mode 100755 +new file mode 100644 index 000000000000..c900eb206881 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_loader.c @@ -690217,7 +690243,7 @@ index 000000000000..c900eb206881 +MODULE_DESCRIPTION("Parade TrueTouch(R) Standard Product FW Loader Driver"); +MODULE_AUTHOR("Parade Technologies "); diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_mt_common.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_mt_common.c -new file mode 100755 +new file mode 100644 index 000000000000..25e5fa7654d4 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_mt_common.c @@ -691016,7 +691042,7 @@ index 000000000000..25e5fa7654d4 + return 0; +} diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_mta.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_mta.c -new file mode 100755 +new file mode 100644 index 000000000000..d457bb66d360 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_mta.c @@ -691107,7 +691133,7 @@ index 000000000000..d457bb66d360 + md->mt_function.input_register_device = cyttsp5_input_register_device; +} diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_mtb.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_mtb.c -new file mode 100755 +new file mode 100644 index 000000000000..d5f51e9c836f --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_mtb.c @@ -691206,7 +691232,7 @@ index 000000000000..d5f51e9c836f +} + diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_params.h b/drivers/input/touchscreen/cyttsp5/cyttsp5_params.h -new file mode 100755 +new file mode 100644 index 000000000000..7a92d109fa73 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_params.h @@ -692760,7 +692786,7 @@ index 000000000000..7a92d109fa73 +}; + diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid00.h b/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid00.h -new file mode 100755 +new file mode 100644 index 000000000000..939ff2a288ae --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid00.h @@ -694314,7 +694340,7 @@ index 000000000000..939ff2a288ae +}; + diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid01.h b/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid01.h -new file mode 100755 +new file mode 100644 index 000000000000..3dcb64dd3ba7 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid01.h @@ -695868,7 +695894,7 @@ index 000000000000..3dcb64dd3ba7 +}; + diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.c -new file mode 100755 +new file mode 100644 index 000000000000..cc6feaef1031 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.c @@ -696163,7 +696189,7 @@ index 000000000000..cc6feaef1031 +} +#endif diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.h b/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.h -new file mode 100755 +new file mode 100644 index 000000000000..289b014775c0 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.h @@ -696229,7 +696255,7 @@ index 000000000000..289b014775c0 + +#endif /* _LINUX_CYTTSP5_PLATFORM_H */ diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_proximity.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_proximity.c -new file mode 100755 +new file mode 100644 index 000000000000..0dba2c817387 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_proximity.c @@ -696790,7 +696816,7 @@ index 000000000000..0dba2c817387 + return 0; +} diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_regs.h b/drivers/input/touchscreen/cyttsp5/cyttsp5_regs.h -new file mode 100755 +new file mode 100644 index 000000000000..ded98eff2deb --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_regs.h @@ -697998,7 +698024,7 @@ index 000000000000..ded98eff2deb + +#endif /* _CYTTSP5_REGS_H */ diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_spi.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_spi.c -new file mode 100755 +new file mode 100644 index 000000000000..a01b88b0c8a9 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_spi.c @@ -698259,7 +698285,7 @@ index 000000000000..a01b88b0c8a9 +MODULE_DESCRIPTION("Parade TrueTouch(R) Standard Product SPI Driver"); +MODULE_AUTHOR("Parade Technologies "); diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_test_device_access_api.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_test_device_access_api.c -new file mode 100755 +new file mode 100644 index 000000000000..b9517d52d5d4 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_test_device_access_api.c @@ -698707,7 +698733,7 @@ index 000000000000..b9517d52d5d4 +MODULE_DESCRIPTION("Parade TrueTouch(R) Standard Product Device Access Driver API Tester"); +MODULE_AUTHOR("Parade Technologies "); diff --git a/drivers/input/touchscreen/focaltech_touch/Makefile b/drivers/input/touchscreen/focaltech_touch/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..bf7df1543b01 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/Makefile @@ -698731,7 +698757,7 @@ index 000000000000..bf7df1543b01 +obj-y += focaltech_test/ + diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_common.h b/drivers/input/touchscreen/focaltech_touch/focaltech_common.h -new file mode 100755 +new file mode 100644 index 000000000000..7e911d1ac36f --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_common.h @@ -698896,7 +698922,7 @@ index 000000000000..7e911d1ac36f + +#endif /* __LINUX_FOCALTECH_COMMON_H__ */ diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_config.h b/drivers/input/touchscreen/focaltech_touch/focaltech_config.h -new file mode 100755 +new file mode 100644 index 000000000000..18cf1eafaa9a --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_config.h @@ -699146,7 +699172,7 @@ index 000000000000..18cf1eafaa9a + +#endif /* _LINUX_FOCLATECH_CONFIG_H_ */ diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_core.c b/drivers/input/touchscreen/focaltech_touch/focaltech_core.c -new file mode 100755 +new file mode 100644 index 000000000000..c8318c0ce8c0 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_core.c @@ -700935,7 +700961,7 @@ index 000000000000..c8318c0ce8c0 +MODULE_DESCRIPTION("FocalTech Touchscreen Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_core.h b/drivers/input/touchscreen/focaltech_touch/focaltech_core.h -new file mode 100755 +new file mode 100644 index 000000000000..6547719b94a9 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_core.h @@ -701195,7 +701221,7 @@ index 000000000000..6547719b94a9 + +#endif /* __LINUX_FOCALTECH_CORE_H__ */ diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_esdcheck.c b/drivers/input/touchscreen/focaltech_touch/focaltech_esdcheck.c -new file mode 100755 +new file mode 100644 index 000000000000..cb8e6ec18bcf --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_esdcheck.c @@ -701753,7 +701779,7 @@ index 000000000000..cb8e6ec18bcf +#endif /* FTS_ESDCHECK_EN */ + diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_ex_fun.c b/drivers/input/touchscreen/focaltech_touch/focaltech_ex_fun.c -new file mode 100755 +new file mode 100644 index 000000000000..06511c515869 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_ex_fun.c @@ -702889,7 +702915,7 @@ index 000000000000..06511c515869 +} +#endif diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_ex_mode.c b/drivers/input/touchscreen/focaltech_touch/focaltech_ex_mode.c -new file mode 100755 +new file mode 100644 index 000000000000..bca972ebb040 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_ex_mode.c @@ -703277,7 +703303,7 @@ index 000000000000..bca972ebb040 +} + diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_flash.c b/drivers/input/touchscreen/focaltech_touch/focaltech_flash.c -new file mode 100755 +new file mode 100644 index 000000000000..43672a78ddac --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_flash.c @@ -705254,7 +705280,7 @@ index 000000000000..43672a78ddac + +#endif /* #if FTS_AUTO_UPGRADE_EN */ diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_flash.h b/drivers/input/touchscreen/focaltech_touch/focaltech_flash.h -new file mode 100755 +new file mode 100644 index 000000000000..d11f42ca8e1e --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_flash.h @@ -705442,7 +705468,7 @@ index 000000000000..d11f42ca8e1e +u16 fts_crc16_calc_host(u8 *pbuf, u16 length); +#endif diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_flash/Makefile b/drivers/input/touchscreen/focaltech_touch/focaltech_flash/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..133dbcf8d701 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_flash/Makefile @@ -705457,7 +705483,7 @@ index 000000000000..133dbcf8d701 +obj-y += focaltech_upgrade_ft8201.o \ No newline at end of file diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_flash/focaltech_upgrade_ft8201.c b/drivers/input/touchscreen/focaltech_touch/focaltech_flash/focaltech_upgrade_ft8201.c -new file mode 100755 +new file mode 100644 index 000000000000..e32de88b2435 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_flash/focaltech_upgrade_ft8201.c @@ -706496,7 +706522,7 @@ index 000000000000..e32de88b2435 + .force_upgrade = fts_ft8006m_force_upgrade, +}; diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_gesture.c b/drivers/input/touchscreen/focaltech_touch/focaltech_gesture.c -new file mode 100755 +new file mode 100644 index 000000000000..0874729e5d59 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_gesture.c @@ -707099,7 +707125,7 @@ index 000000000000..0874729e5d59 +} +#endif diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_i2c.c b/drivers/input/touchscreen/focaltech_touch/focaltech_i2c.c -new file mode 100755 +new file mode 100644 index 000000000000..5e8294145b28 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_i2c.c @@ -707345,7 +707371,7 @@ index 000000000000..5e8294145b28 +} + diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_point_report_check.c b/drivers/input/touchscreen/focaltech_touch/focaltech_point_report_check.c -new file mode 100755 +new file mode 100644 index 000000000000..7157f444080d --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_point_report_check.c @@ -707486,7 +707512,7 @@ index 000000000000..7157f444080d +#endif /* FTS_POINT_REPORT_CHECK_EN */ + diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_test/Makefile b/drivers/input/touchscreen/focaltech_touch/focaltech_test/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..2a2945ec021a --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/Makefile @@ -707503,7 +707529,7 @@ index 000000000000..2a2945ec021a +obj-y += supported_ic/ + diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test.c b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test.c -new file mode 100755 +new file mode 100644 index 000000000000..991bbba87c70 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test.c @@ -709457,7 +709483,7 @@ index 000000000000..991bbba87c70 + return 0; +} diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test.h b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test.h -new file mode 100755 +new file mode 100644 index 000000000000..bf36233363a1 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test.h @@ -710052,7 +710078,7 @@ index 000000000000..bf36233363a1 +} while (0) +#endif diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test_ini.c b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test_ini.c -new file mode 100755 +new file mode 100644 index 000000000000..a6ea11fd6025 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test_ini.c @@ -711278,7 +711304,7 @@ index 000000000000..a6ea11fd6025 + return ret; +} diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test_ini.h b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test_ini.h -new file mode 100755 +new file mode 100644 index 000000000000..a6c8d50c11d2 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test_ini.h @@ -711428,7 +711454,7 @@ index 000000000000..a6c8d50c11d2 + get_keyword_value("TestItem", name, value) +#endif /* _INI_H */ diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_test/supported_ic/Makefile b/drivers/input/touchscreen/focaltech_touch/focaltech_test/supported_ic/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..2e3a5e524418 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/supported_ic/Makefile @@ -711440,7 +711466,7 @@ index 000000000000..2e3a5e524418 +# Linux driver folder +obj-y += focaltech_test_ft8201.o diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_test/supported_ic/focaltech_test_ft8201.c b/drivers/input/touchscreen/focaltech_touch/focaltech_test/supported_ic/focaltech_test_ft8201.c -new file mode 100755 +new file mode 100644 index 000000000000..a5d666724e55 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/supported_ic/focaltech_test_ft8201.c @@ -712479,11 +712505,8 @@ index 000000000000..a5d666724e55 + .start_test = start_test_ft8201, +}; + -diff --git a/drivers/input/touchscreen/focaltech_touch/include/firmware/fw_sample.h b/drivers/input/touchscreen/focaltech_touch/include/firmware/fw_sample.h -new file mode 100755 -index 000000000000..e69de29bb2d1 diff --git a/drivers/input/touchscreen/focaltech_touch/include/pramboot/FT8006M_Pramboot_V1.6_20180426_le.h b/drivers/input/touchscreen/focaltech_touch/include/pramboot/FT8006M_Pramboot_V1.6_20180426_le.h -new file mode 100755 +new file mode 100644 index 000000000000..0db3f051175a --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/include/pramboot/FT8006M_Pramboot_V1.6_20180426_le.h @@ -712789,7 +712812,7 @@ index 000000000000..0db3f051175a +0x00,0x04,0x00,0x80,0x00,0x02,0x00,0x80, \ No newline at end of file diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/Makefile b/drivers/input/touchscreen/focaltech_touch_ft5436/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..df8d3e5ef10a --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/Makefile @@ -712811,7 +712834,7 @@ index 000000000000..df8d3e5ef10a +obj-y += focaltech_flash.o +obj-y += focaltech_flash/ diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_common.h b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_common.h -new file mode 100755 +new file mode 100644 index 000000000000..1d7ac55572fe --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_common.h @@ -712983,7 +713006,7 @@ index 000000000000..1d7ac55572fe +} while (0) +#endif /* __LINUX_FOCALTECH_COMMON_H__ */ diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_config.h b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_config.h -new file mode 100755 +new file mode 100644 index 000000000000..d30ca81df9a9 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_config.h @@ -713230,7 +713253,7 @@ index 000000000000..d30ca81df9a9 + +#endif /* _LINUX_FOCLATECH_CONFIG_H_ */ diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.c -new file mode 100755 +new file mode 100644 index 000000000000..932b2f866274 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.c @@ -714983,7 +715006,7 @@ index 000000000000..932b2f866274 +MODULE_DESCRIPTION("FocalTech Touchscreen Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.h b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.h -new file mode 100755 +new file mode 100644 index 000000000000..66e98371bf1c --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.h @@ -715252,7 +715275,7 @@ index 000000000000..66e98371bf1c +void fts_irq_enable(void); +#endif /* __LINUX_FOCALTECH_CORE_H__ */ diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_esdcheck.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_esdcheck.c -new file mode 100755 +new file mode 100644 index 000000000000..b34bb26e8529 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_esdcheck.c @@ -715722,7 +715745,7 @@ index 000000000000..b34bb26e8529 +#endif /* FTS_ESDCHECK_EN */ + diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_ex_fun.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_ex_fun.c -new file mode 100755 +new file mode 100644 index 000000000000..b012c093b4d5 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_ex_fun.c @@ -716909,7 +716932,7 @@ index 000000000000..b012c093b4d5 + return 0; +} diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_ex_mode.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_ex_mode.c -new file mode 100755 +new file mode 100644 index 000000000000..c0c970b12e48 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_ex_mode.c @@ -717222,7 +717245,7 @@ index 000000000000..c0c970b12e48 + return 0; +} diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash.c -new file mode 100755 +new file mode 100644 index 000000000000..83bf8f4a6039 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash.c @@ -719239,7 +719262,7 @@ index 000000000000..83bf8f4a6039 + return 0; +} diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash.h b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash.h -new file mode 100755 +new file mode 100644 index 000000000000..cfebe2d12489 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash.h @@ -719450,7 +719473,7 @@ index 000000000000..cfebe2d12489 +int fts_fwupg_upgrade(struct fts_upgrade *upg); +#endif diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash/Makefile b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..17c9595ca5c9 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash/Makefile @@ -719463,7 +719486,7 @@ index 000000000000..17c9595ca5c9 +obj-y += focaltech_upgrade_ft5436.o + diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash/focaltech_upgrade_ft5436.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash/focaltech_upgrade_ft5436.c -new file mode 100755 +new file mode 100644 index 000000000000..7ed7315f0d93 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash/focaltech_upgrade_ft5436.c @@ -719623,7 +719646,7 @@ index 000000000000..7ed7315f0d93 + .upgrade = fts_ft5422_upgrade, +}; diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_gesture.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_gesture.c -new file mode 100755 +new file mode 100644 index 000000000000..b65cf39451d2 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_gesture.c @@ -720089,7 +720112,7 @@ index 000000000000..b65cf39451d2 + return 0; +} diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_i2c.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_i2c.c -new file mode 100755 +new file mode 100644 index 000000000000..f2e335c3db4f --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_i2c.c @@ -720289,7 +720312,7 @@ index 000000000000..f2e335c3db4f +} \ No newline at end of file diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_point_report_check.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_point_report_check.c -new file mode 100755 +new file mode 100644 index 000000000000..1296af1551db --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_point_report_check.c @@ -720430,7 +720453,7 @@ index 000000000000..1296af1551db +#endif /* FTS_POINT_REPORT_CHECK_EN */ + diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/include/firmware/fw_sample.h b/drivers/input/touchscreen/focaltech_touch_ft5436/include/firmware/fw_sample.h -new file mode 100755 +new file mode 100644 index 000000000000..60120df3213d --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/include/firmware/fw_sample.h @@ -723660,7 +723683,7 @@ index 000000000000..60120df3213d +0xe4,0x93,0x7c,0xab,0x22,0xff,0xc9,0x66,0x36,0x99,0x9e,0x61,0x15,0x79, \ No newline at end of file diff --git a/drivers/input/touchscreen/gsl3673.c b/drivers/input/touchscreen/gsl3673.c -new file mode 100755 +new file mode 100644 index 000000000000..2191bb6af26b --- /dev/null +++ b/drivers/input/touchscreen/gsl3673.c @@ -724968,7 +724991,7 @@ index 000000000000..2191bb6af26b +MODULE_AUTHOR("Guan Yuwei, guanyuwei@basewin.com"); +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gsl3673.h b/drivers/input/touchscreen/gsl3673.h -new file mode 100755 +new file mode 100644 index 000000000000..5d8d8ef02bec --- /dev/null +++ b/drivers/input/touchscreen/gsl3673.h @@ -730065,7 +730088,7 @@ index 000000000000..5d8d8ef02bec + +#endif diff --git a/drivers/input/touchscreen/gsl3673_800x1280.c b/drivers/input/touchscreen/gsl3673_800x1280.c -new file mode 100755 +new file mode 100644 index 000000000000..191029084c22 --- /dev/null +++ b/drivers/input/touchscreen/gsl3673_800x1280.c @@ -731318,7 +731341,7 @@ index 000000000000..191029084c22 +MODULE_AUTHOR("Guan Yuwei, guanyuwei@basewin.com"); +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gsl3673_800x1280.h b/drivers/input/touchscreen/gsl3673_800x1280.h -new file mode 100755 +new file mode 100644 index 000000000000..38fa03963eb1 --- /dev/null +++ b/drivers/input/touchscreen/gsl3673_800x1280.h @@ -736511,7 +736534,7 @@ index 000000000000..38fa03963eb1 + +#endif diff --git a/drivers/input/touchscreen/gsl3676/Makefile b/drivers/input/touchscreen/gsl3676/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..27c3264812e1 --- /dev/null +++ b/drivers/input/touchscreen/gsl3676/Makefile @@ -736520,7 +736543,7 @@ index 000000000000..27c3264812e1 +obj-y += gsl3676.o + diff --git a/drivers/input/touchscreen/gsl3676/gsl3676.c b/drivers/input/touchscreen/gsl3676/gsl3676.c -new file mode 100755 +new file mode 100644 index 000000000000..4b1baca365fd --- /dev/null +++ b/drivers/input/touchscreen/gsl3676/gsl3676.c @@ -737787,7 +737810,7 @@ index 000000000000..4b1baca365fd +MODULE_AUTHOR("Guan Yuwei, guanyuwei@basewin.com"); +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gsl3676/rk3368_th863c_10.h b/drivers/input/touchscreen/gsl3676/rk3368_th863c_10.h -new file mode 100755 +new file mode 100644 index 000000000000..617860f76401 --- /dev/null +++ b/drivers/input/touchscreen/gsl3676/rk3368_th863c_10.h @@ -743124,7 +743147,7 @@ index 000000000000..617860f76401 + +#endif diff --git a/drivers/input/touchscreen/gsl_point_id.c b/drivers/input/touchscreen/gsl_point_id.c -new file mode 100755 +new file mode 100644 index 000000000000..624502b6bacc --- /dev/null +++ b/drivers/input/touchscreen/gsl_point_id.c @@ -746230,7 +746253,7 @@ index 000000000000..624502b6bacc + return STATUS_SUCCESS; +}*/ diff --git a/drivers/input/touchscreen/gslx680.c b/drivers/input/touchscreen/gslx680.c -new file mode 100755 +new file mode 100644 index 000000000000..ab970845c64f --- /dev/null +++ b/drivers/input/touchscreen/gslx680.c @@ -748141,7 +748164,7 @@ index 000000000000..ab970845c64f +MODULE_AUTHOR("Guan Yuwei, guanyuwei@basewin.com"); +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gslx680.h b/drivers/input/touchscreen/gslx680.h -new file mode 100755 +new file mode 100644 index 000000000000..2a76ec410c81 --- /dev/null +++ b/drivers/input/touchscreen/gslx680.h @@ -758515,7 +758538,7 @@ index 000000000000..2a76ec410c81 + +#endif diff --git a/drivers/input/touchscreen/gslx6801.c b/drivers/input/touchscreen/gslx6801.c -new file mode 100755 +new file mode 100644 index 000000000000..3c1e1655c0a8 --- /dev/null +++ b/drivers/input/touchscreen/gslx6801.c @@ -760201,7 +760224,7 @@ index 000000000000..3c1e1655c0a8 +MODULE_AUTHOR("Guan Yuwei, guanyuwei@basewin.com"); +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gslx6801.h b/drivers/input/touchscreen/gslx6801.h -new file mode 100755 +new file mode 100644 index 000000000000..45bb3469d2ea --- /dev/null +++ b/drivers/input/touchscreen/gslx6801.h @@ -765162,7 +765185,7 @@ index 000000000000..45bb3469d2ea +}; +#endif diff --git a/drivers/input/touchscreen/gslx680_d708/Makefile b/drivers/input/touchscreen/gslx680_d708/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..86d995c5e6c5 --- /dev/null +++ b/drivers/input/touchscreen/gslx680_d708/Makefile @@ -765177,7 +765200,7 @@ index 000000000000..86d995c5e6c5 +obj-y += rockchip_gslX680.o + diff --git a/drivers/input/touchscreen/gslx680_d708/rockchip_gsl3670.h b/drivers/input/touchscreen/gslx680_d708/rockchip_gsl3670.h -new file mode 100755 +new file mode 100644 index 000000000000..89b74fe3e23c --- /dev/null +++ b/drivers/input/touchscreen/gslx680_d708/rockchip_gsl3670.h @@ -770230,7 +770253,7 @@ index 000000000000..89b74fe3e23c + +#endif diff --git a/drivers/input/touchscreen/gslx680_d708/rockchip_gslX680.c b/drivers/input/touchscreen/gslx680_d708/rockchip_gslX680.c -new file mode 100755 +new file mode 100644 index 000000000000..f75586e2d37a --- /dev/null +++ b/drivers/input/touchscreen/gslx680_d708/rockchip_gslX680.c @@ -771629,7 +771652,7 @@ index 000000000000..f75586e2d37a +MODULE_AUTHOR("Guan Yuwei, guanyuwei@basewin.com"); +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gslx680_d708/rockchip_gslX680_88v.h b/drivers/input/touchscreen/gslx680_d708/rockchip_gslX680_88v.h -new file mode 100755 +new file mode 100644 index 000000000000..f58ba4a8a72b --- /dev/null +++ b/drivers/input/touchscreen/gslx680_d708/rockchip_gslX680_88v.h @@ -776883,7 +776906,7 @@ index 000000000000..f58ba4a8a72b + + diff --git a/drivers/input/touchscreen/gslx680_firefly.c b/drivers/input/touchscreen/gslx680_firefly.c -new file mode 100755 +new file mode 100644 index 000000000000..0786b5ecb311 --- /dev/null +++ b/drivers/input/touchscreen/gslx680_firefly.c @@ -778019,7 +778042,7 @@ index 000000000000..0786b5ecb311 +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("GSLX680 touchscreen controller driver"); diff --git a/drivers/input/touchscreen/gslx680_firefly.h b/drivers/input/touchscreen/gslx680_firefly.h -new file mode 100755 +new file mode 100644 index 000000000000..8f40c59d7d2d --- /dev/null +++ b/drivers/input/touchscreen/gslx680_firefly.h @@ -783145,7 +783168,7 @@ index 000000000000..8f40c59d7d2d + +#endif diff --git a/drivers/input/touchscreen/gslx680_pad.c b/drivers/input/touchscreen/gslx680_pad.c -new file mode 100755 +new file mode 100644 index 000000000000..d61a5ec76e94 --- /dev/null +++ b/drivers/input/touchscreen/gslx680_pad.c @@ -784349,7 +784372,7 @@ index 000000000000..d61a5ec76e94 +MODULE_AUTHOR("Guan Yuwei, guanyuwei@basewin.com"); +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gslx680_pad.h b/drivers/input/touchscreen/gslx680_pad.h -new file mode 100755 +new file mode 100644 index 000000000000..aab1786f221a --- /dev/null +++ b/drivers/input/touchscreen/gslx680_pad.h @@ -794587,7 +794610,7 @@ index 000000000000..aab1786f221a + +#endif diff --git a/drivers/input/touchscreen/gslx680a.c b/drivers/input/touchscreen/gslx680a.c -new file mode 100755 +new file mode 100644 index 000000000000..380a0fd93fa0 --- /dev/null +++ b/drivers/input/touchscreen/gslx680a.c @@ -795913,14 +795936,14 @@ index 000000000000..380a0fd93fa0 +MODULE_AUTHOR("Guan Yuwei, guanyuwei@basewin.com"); +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gt1x/GT5688_Config_20170713_1080_1920.cfg b/drivers/input/touchscreen/gt1x/GT5688_Config_20170713_1080_1920.cfg -new file mode 100755 +new file mode 100644 index 000000000000..2f65c7ee0482 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/GT5688_Config_20170713_1080_1920.cfg @@ -0,0 +1 @@ +0x88,0x38,0x04,0x80,0x07,0x05,0x35,0x1E,0x05,0x40,0x00,0x08,0x50,0x3C,0x53,0x11,0x00,0x00,0x11,0x11,0x14,0x17,0x19,0x1C,0x0A,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x1E,0x28,0x8B,0x2B,0x0C,0x15,0x17,0xDF,0x07,0x04,0xA1,0x00,0x03,0x02,0x24,0x00,0x00,0x28,0x50,0x80,0x14,0x02,0x00,0x00,0x54,0xAD,0x2E,0x9B,0x35,0x8C,0x3B,0x81,0x42,0x79,0x49,0x71,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0x50,0x3C,0xFF,0xFF,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x20,0x78,0x78,0x64,0x00,0x00,0x00,0x00,0x00,0x01,0x08,0x02,0x09,0x03,0x0A,0x04,0x0B,0x05,0x0C,0x06,0x0D,0xFF,0xFF,0x0A,0x09,0x08,0x07,0x06,0x05,0x04,0x03,0x02,0x01,0x00,0x15,0x14,0x13,0x12,0x11,0x10,0x0F,0x0E,0x0D,0x0C,0x0B,0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3C,0x00,0x05,0x1E,0x00,0x02,0x2A,0x1E,0x19,0x14,0x02,0x00,0x03,0x0A,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xFF,0xFF,0x86,0x22,0x03,0x00,0x00,0x33,0x00,0x0F,0x00,0x00,0x00,0x50,0x3C,0x50,0x00,0x00,0x00,0x23,0x13,0x01 diff --git a/drivers/input/touchscreen/gt1x/Makefile b/drivers/input/touchscreen/gt1x/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..2b3fa3680e98 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/Makefile @@ -795934,7 +795957,7 @@ index 000000000000..2b3fa3680e98 +gt1x-ts-y += gt1x_update.o + diff --git a/drivers/input/touchscreen/gt1x/gt1x.c b/drivers/input/touchscreen/gt1x/gt1x.c -new file mode 100755 +new file mode 100644 index 000000000000..f65ca3b916e4 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x.c @@ -796749,7 +796772,7 @@ index 000000000000..f65ca3b916e4 +MODULE_DESCRIPTION("GTP Series Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/touchscreen/gt1x/gt1x.h b/drivers/input/touchscreen/gt1x/gt1x.h -new file mode 100755 +new file mode 100644 index 000000000000..b9339f10b0ad --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x.h @@ -796819,7 +796842,7 @@ index 000000000000..b9339f10b0ad + +#endif /* _GOODIX_GT1X_H_ */ diff --git a/drivers/input/touchscreen/gt1x/gt1x_cfg.h b/drivers/input/touchscreen/gt1x/gt1x_cfg.h -new file mode 100755 +new file mode 100644 index 000000000000..6581aebfeda7 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_cfg.h @@ -796852,7 +796875,7 @@ index 000000000000..6581aebfeda7 + +#endif /* _GOODIX_GT1X_CFG_H_ */ diff --git a/drivers/input/touchscreen/gt1x/gt1x_extents.c b/drivers/input/touchscreen/gt1x/gt1x_extents.c -new file mode 100755 +new file mode 100644 index 000000000000..ed087d8f0031 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_extents.c @@ -797786,7 +797809,7 @@ index 000000000000..ed087d8f0031 +#endif +} diff --git a/drivers/input/touchscreen/gt1x/gt1x_firmware.h b/drivers/input/touchscreen/gt1x/gt1x_firmware.h -new file mode 100755 +new file mode 100644 index 000000000000..7588633397f5 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_firmware.h @@ -798340,7 +798363,7 @@ index 000000000000..7588633397f5 +#endif +#endif diff --git a/drivers/input/touchscreen/gt1x/gt1x_generic.c b/drivers/input/touchscreen/gt1x/gt1x_generic.c -new file mode 100755 +new file mode 100644 index 000000000000..48b29ab50bcd --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_generic.c @@ -800791,7 +800814,7 @@ index 000000000000..48b29ab50bcd +} + diff --git a/drivers/input/touchscreen/gt1x/gt1x_generic.h b/drivers/input/touchscreen/gt1x/gt1x_generic.h -new file mode 100755 +new file mode 100644 index 000000000000..7acc390d47ef --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_generic.h @@ -801392,7 +801415,7 @@ index 000000000000..7acc390d47ef +#endif + diff --git a/drivers/input/touchscreen/gt1x/gt1x_tools.c b/drivers/input/touchscreen/gt1x/gt1x_tools.c -new file mode 100755 +new file mode 100644 index 000000000000..1d824bdafd8a --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_tools.c @@ -801831,7 +801854,7 @@ index 000000000000..1d824bdafd8a + return cmd_head.data_len; +} diff --git a/drivers/input/touchscreen/gt1x/gt1x_update.c b/drivers/input/touchscreen/gt1x/gt1x_update.c -new file mode 100755 +new file mode 100644 index 000000000000..0979bb32d52f --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_update.c @@ -803293,7 +803316,7 @@ index 000000000000..0979bb32d52f + return ret; +} diff --git a/drivers/input/touchscreen/gt9xx/GT9110P(2020)V71_Config_20201028_170326.cfg b/drivers/input/touchscreen/gt9xx/GT9110P(2020)V71_Config_20201028_170326.cfg -new file mode 100755 +new file mode 100644 index 000000000000..62a3d0e496c6 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/GT9110P(2020)V71_Config_20201028_170326.cfg @@ -803319,7 +803342,7 @@ index 000000000000..62a3d0e496c6 +0x03,0x02,0x01,0x00,0x53,0x01 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/GT9110P_Config_20160217_1526_2048_97.cfg b/drivers/input/touchscreen/gt9xx/GT9110P_Config_20160217_1526_2048_97.cfg -new file mode 100755 +new file mode 100644 index 000000000000..952ea845390e --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/GT9110P_Config_20160217_1526_2048_97.cfg @@ -803327,7 +803350,7 @@ index 000000000000..952ea845390e +0x00,0x00,0x06,0x00,0x08,0x0A,0x35,0x00,0x01,0xC8,0x28,0x08,0x5A,0x3C,0x03,0x05,0x00,0x00,0xFF,0x7F,0x00,0x00,0x04,0x18,0x1A,0x1E,0x14,0x8F,0x2F,0xAA,0x2A,0x2C,0x1E,0x14,0x00,0x00,0x00,0x21,0x33,0x2D,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x29,0x19,0x32,0x94,0xC5,0x02,0x08,0x00,0x00,0x04,0x99,0x1A,0x00,0x90,0x1E,0x00,0x87,0x23,0x00,0x81,0x28,0x00,0x7D,0x2E,0x00,0x7D,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x0F,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x19,0x46,0x32,0x0F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x13,0x12,0x11,0x10,0x0F,0x0E,0x0D,0x0C,0x0B,0x0A,0x09,0x08,0x07,0x06,0x05,0x04,0x03,0x02,0x01,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x26,0x25,0x24,0x23,0x22,0x21,0x20,0x1F,0x1E,0x1D,0x19,0x18,0x17,0x16,0x15,0x12,0x11,0x10,0x0F,0x0E,0x09,0x08,0x07,0x00,0x01,0x02,0x03,0x04,0x05,0x06,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x10,0x01 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/GT9271_Config_20170526.cfg b/drivers/input/touchscreen/gt9xx/GT9271_Config_20170526.cfg -new file mode 100755 +new file mode 100644 index 000000000000..a7ac38fe331e --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/GT9271_Config_20170526.cfg @@ -803335,7 +803358,7 @@ index 000000000000..a7ac38fe331e +0x00,0x80,0x07,0xB0,0x04,0x0A,0x3C,0x00,0x01,0x0A,0x28,0x1F,0x55,0x32,0x03,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x1A,0x1E,0x14,0x90,0x2F,0xAA,0x1E,0x20,0x31,0x0D,0x00,0x00,0x00,0x22,0x03,0x1D,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x14,0x2D,0x94,0xD5,0x02,0x08,0x00,0x00,0x04,0x9A,0x15,0x00,0x8C,0x19,0x00,0x80,0x1E,0x00,0x77,0x23,0x00,0x70,0x29,0x00,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x04,0x05,0x06,0x07,0x08,0x09,0x0C,0x0D,0x0E,0x0F,0x10,0x11,0x14,0x15,0x16,0x17,0x18,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x29,0x28,0x27,0x26,0x25,0x24,0x23,0x22,0x21,0x20,0x1F,0x1E,0x1C,0x1B,0x19,0x14,0x13,0x12,0x11,0x10,0x0F,0x0E,0x0D,0x0C,0x0A,0x08,0x07,0x06,0x04,0x02,0x00,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x12,0x01 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/HLS-0102-1398V1-1060-GT911_Config_20201204_V66.cfg b/drivers/input/touchscreen/gt9xx/HLS-0102-1398V1-1060-GT911_Config_20201204_V66.cfg -new file mode 100755 +new file mode 100644 index 000000000000..77b72c416bea --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/HLS-0102-1398V1-1060-GT911_Config_20201204_V66.cfg @@ -803343,7 +803366,7 @@ index 000000000000..77b72c416bea +0x42,0x00,0x03,0x00,0x04,0x0A,0x45,0x03,0x22,0x1F,0x28,0x0F,0x64,0x3C,0x03,0x0F,0x00,0x00,0x00,0x00,0x11,0x00,0x08,0x00,0x00,0x00,0x00,0x8B,0x29,0x0E,0x71,0x6F,0xB2,0x04,0x00,0x00,0x00,0x39,0x02,0x10,0x00,0x21,0x00,0x00,0x00,0x03,0x64,0x32,0x00,0x00,0x00,0x3C,0x78,0x94,0xD5,0x02,0x07,0x00,0x00,0x04,0xC8,0x40,0x00,0xB1,0x4A,0x00,0x9E,0x55,0x00,0x8E,0x61,0x00,0x7F,0x70,0x00,0x7F,0x70,0x00,0x00,0x00,0xF0,0x90,0x3C,0xFF,0xFF,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x1A,0x18,0x16,0x14,0x12,0x10,0x0E,0x0C,0x0A,0x08,0x06,0x04,0x02,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00,0x02,0x04,0x06,0x08,0x0A,0x0C,0x0F,0x10,0x12,0x13,0x16,0x18,0x1C,0x1D,0x1E,0x1F,0x20,0x21,0x22,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF6,0x01 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/Makefile b/drivers/input/touchscreen/gt9xx/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..f63b5f2783a5 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/Makefile @@ -803355,7 +803378,7 @@ index 000000000000..f63b5f2783a5 +goodix_gt9xx-y +=gt9xx.o +goodix_gt9xx-y +=gt9xx_update.o diff --git a/drivers/input/touchscreen/gt9xx/WGJ10162B_GT9271_1060_Config_20140821_1341110X42.cfg b/drivers/input/touchscreen/gt9xx/WGJ10162B_GT9271_1060_Config_20140821_1341110X42.cfg -new file mode 100755 +new file mode 100644 index 000000000000..db5ed0f34b82 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ10162B_GT9271_1060_Config_20140821_1341110X42.cfg @@ -803363,7 +803386,7 @@ index 000000000000..db5ed0f34b82 +0x42,0x80,0x07,0xB0,0x04,0x0A,0x35,0x00,0x02,0x0F,0x28,0x0F,0x5A,0x3C,0x03,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x17,0x19,0x1D,0x14,0x8F,0x2F,0xAA,0x37,0x39,0xD9,0x0B,0x00,0x00,0x00,0x83,0x02,0x1D,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x2A,0x46,0x94,0xC5,0x02,0x07,0x00,0x00,0x04,0x95,0x2C,0x00,0x8A,0x31,0x00,0x81,0x36,0x00,0x79,0x3C,0x00,0x72,0x42,0x00,0x72,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x19,0x18,0x17,0x16,0x15,0x14,0x11,0x10,0x0F,0x0E,0x0D,0x0C,0x09,0x08,0x07,0x06,0x05,0x04,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x04,0x06,0x07,0x08,0x0A,0x0C,0x0D,0x0F,0x10,0x11,0x12,0x13,0x14,0x19,0x1B,0x1C,0x1E,0x1F,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x16,0x01 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/WGJ10162_GT9271_Config_20140820_182456.cfg b/drivers/input/touchscreen/gt9xx/WGJ10162_GT9271_Config_20140820_182456.cfg -new file mode 100755 +new file mode 100644 index 000000000000..96bf8cb7961c --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ10162_GT9271_Config_20140820_182456.cfg @@ -803371,7 +803394,7 @@ index 000000000000..96bf8cb7961c +0x41,0x80,0x07,0xB0,0x04,0x0A,0x31,0x00,0x01,0x08,0x28,0x0F,0x50,0x32,0x03,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x8F,0x2F,0xAA,0x37,0x39,0xD3,0x07,0x00,0x00,0x00,0x02,0x02,0x1D,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x23,0x4B,0x94,0x45,0x02,0x07,0x00,0x00,0x00,0xB5,0x25,0x00,0x9B,0x2C,0x00,0x88,0x33,0x00,0x78,0x3B,0x00,0x6A,0x45,0x00,0x6A,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x19,0x18,0x17,0x16,0x15,0x14,0x11,0x10,0x0F,0x0E,0x0D,0x0C,0x09,0x08,0x07,0x06,0x05,0x04,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x04,0x06,0x07,0x08,0x0A,0x0C,0x0D,0x0F,0x10,0x11,0x12,0x13,0x14,0x19,0x1B,0x1C,0x1E,0x1F,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x8F,0x01 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/WGJ10187_GT910_Config_20140623_104014_0X41.cfg b/drivers/input/touchscreen/gt9xx/WGJ10187_GT910_Config_20140623_104014_0X41.cfg -new file mode 100755 +new file mode 100644 index 000000000000..ffc4679bf2d9 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ10187_GT910_Config_20140623_104014_0X41.cfg @@ -803379,7 +803402,7 @@ index 000000000000..ffc4679bf2d9 +0x00, 0x00, 0x04, 0x58, 0x02, 0x05, 0x34, 0x20, 0x01, 0x1F, 0x14, 0x0F, 0x5A, 0x46, 0x03, 0x05, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x17, 0x19, 0x1B, 0x14, 0x89, 0x08, 0x0A, 0x3A, 0x00, 0x0F, 0x0A, 0x00, 0x00, 0x00, 0x1B, 0x02, 0x25, 0x3C, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x4E, 0x94, 0xC5, 0x02, 0x08, 0x00, 0x00, 0x04, 0x92, 0x2C, 0x00, 0x88, 0x32, 0x00, 0x80, 0x39, 0x00, 0x7B, 0x40, 0x00, 0x76, 0x49, 0x00, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0A, 0x0C, 0x0E, 0x10, 0x12, 0x14, 0x16, 0x18, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x28, 0x24, 0x22, 0x20, 0x1F, 0x1E, 0x1D, 0x0E, 0x0C, 0x0A, 0x08, 0x06, 0x05, 0x04, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x99, 0x01 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/WGJ10187_GT9271_Config_20140623_104014_0X41.cfg b/drivers/input/touchscreen/gt9xx/WGJ10187_GT9271_Config_20140623_104014_0X41.cfg -new file mode 100755 +new file mode 100644 index 000000000000..ffbfe3d547da --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ10187_GT9271_Config_20140623_104014_0X41.cfg @@ -803387,7 +803410,7 @@ index 000000000000..ffbfe3d547da +0x41,0xB0,0x04,0x80,0x07,0x0A,0xF5,0x00,0x01,0x08,0x28,0x0F,0x64,0x32,0x03,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x16,0x19,0x1E,0x14,0x8F,0x2F,0x99,0x41,0x43,0x15,0x0E,0x00,0x00,0x00,0x22,0x03,0x1D,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x00,0x2D,0x62,0x94,0xC5,0x02,0x07,0x17,0x00,0x04,0x92,0x30,0x00,0x86,0x39,0x00,0x7F,0x42,0x00,0x79,0x4D,0x00,0x74,0x5A,0x00,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x17,0x16,0x15,0x14,0x11,0x10,0x0F,0x0E,0x0D,0x0C,0x09,0x08,0x07,0x06,0x05,0x04,0x01,0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x04,0x06,0x07,0x08,0x0A,0x0C,0x0D,0x0F,0x10,0x11,0x12,0x13,0x14,0x29,0x28,0x27,0x26,0x25,0x24,0x23,0x22,0x21,0x20,0x1F,0x1E,0x1C,0x1B,0x19,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x01 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/WGJ89006B_GT911_Config_20140625_085816_0X43.cfg b/drivers/input/touchscreen/gt9xx/WGJ89006B_GT911_Config_20140625_085816_0X43.cfg -new file mode 100755 +new file mode 100644 index 000000000000..1c42d9ef7ce1 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ89006B_GT911_Config_20140625_085816_0X43.cfg @@ -803395,7 +803418,7 @@ index 000000000000..1c42d9ef7ce1 +0x43,0x00,0x10,0x00,0x10,0x0A,0x3D,0x20,0x01,0x08,0x28,0x08,0x50,0x32,0x03,0x05,0x00,0x00,0x00,0x00,0x11,0x00,0x00,0x18,0x1A,0x20,0x14,0x8C,0x2E,0x0E,0x3C,0x3E,0x0C,0x08,0x00,0x00,0x00,0x41,0x03,0x1D,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x33,0x5A,0x94,0xC5,0x02,0x08,0x00,0x00,0x04,0xA0,0x36,0x00,0x8B,0x3C,0x00,0x7C,0x43,0x00,0x6B,0x4C,0x00,0x5F,0x55,0x00,0x5F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x04,0x06,0x08,0x0A,0x0C,0x0E,0x10,0x12,0x14,0x16,0x18,0x1A,0x1C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x04,0x06,0x08,0x0A,0x0C,0x0F,0x10,0x12,0x13,0x14,0x16,0x18,0x1C,0x1D,0x1E,0x1F,0x2A,0x29,0x28,0x26,0x24,0x22,0x21,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0A,0x01 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/WGJ89006B_GT9271_Config_20140625_085816_0X41.cfg b/drivers/input/touchscreen/gt9xx/WGJ89006B_GT9271_Config_20140625_085816_0X41.cfg -new file mode 100755 +new file mode 100644 index 000000000000..7ed0266acfaa --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ89006B_GT9271_Config_20140625_085816_0X41.cfg @@ -803403,7 +803426,7 @@ index 000000000000..7ed0266acfaa +0x41,0x80,0x07,0xB0,0x04,0x0A,0x05,0x00,0x01,0x08,0x28,0x0F,0x50,0x32,0x03,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x8F,0x2F,0x99,0x2B,0x2D,0x31,0x0D,0x00,0x00,0x00,0x01,0x03,0x1D,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x23,0x55,0x94,0xC5,0x02,0x07,0x00,0x00,0x00,0x8C,0x26,0x00,0x7B,0x2D,0x00,0x6C,0x36,0x00,0x61,0x41,0x00,0x58,0x4E,0x00,0x58,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x04,0x05,0x06,0x07,0x08,0x09,0x0C,0x0D,0x0E,0x0F,0x10,0x11,0x14,0x15,0x16,0x17,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x14,0x13,0x12,0x11,0x10,0x0F,0x0D,0x0C,0x0A,0x08,0x07,0x06,0x04,0x02,0x00,0x19,0x1B,0x1C,0x1E,0x1F,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xB5,0x01 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/goodix_tool.c b/drivers/input/touchscreen/gt9xx/goodix_tool.c -new file mode 100755 +new file mode 100644 index 000000000000..b2dffcb5e105 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/goodix_tool.c @@ -804036,7 +804059,7 @@ index 000000000000..b2dffcb5e105 + return -EPERM; +} diff --git a/drivers/input/touchscreen/gt9xx/gt9xx.c b/drivers/input/touchscreen/gt9xx/gt9xx.c -new file mode 100755 +new file mode 100644 index 000000000000..cdc421cfd093 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/gt9xx.c @@ -807278,7 +807301,7 @@ index 000000000000..cdc421cfd093 +MODULE_DESCRIPTION("GTP Series Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/touchscreen/gt9xx/gt9xx.h b/drivers/input/touchscreen/gt9xx/gt9xx.h -new file mode 100755 +new file mode 100644 index 000000000000..acc288575691 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/gt9xx.h @@ -807681,7 +807704,7 @@ index 000000000000..acc288575691 + +#endif /* _GOODIX_GT9XX_H_ */ diff --git a/drivers/input/touchscreen/gt9xx/gt9xx_cfg.h b/drivers/input/touchscreen/gt9xx/gt9xx_cfg.h -new file mode 100755 +new file mode 100644 index 000000000000..2b083c5655f8 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/gt9xx_cfg.h @@ -807752,7 +807775,7 @@ index 000000000000..2b083c5655f8 + +#endif /* _GOODIX_GT9XX_CFG_H_ */ diff --git a/drivers/input/touchscreen/gt9xx/gt9xx_firmware.h b/drivers/input/touchscreen/gt9xx/gt9xx_firmware.h -new file mode 100755 +new file mode 100644 index 000000000000..7dce6045b736 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/gt9xx_firmware.h @@ -810096,7 +810119,7 @@ index 000000000000..7dce6045b736 + +#endif diff --git a/drivers/input/touchscreen/gt9xx/gt9xx_update.c b/drivers/input/touchscreen/gt9xx/gt9xx_update.c -new file mode 100755 +new file mode 100644 index 000000000000..312b1f93be60 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/gt9xx_update.c @@ -813739,7 +813762,7 @@ index 000000000000..312b1f93be60 + +//**************** For GT9XXF End ********************// diff --git a/drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D863_7.h b/drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D863_7.h -new file mode 100755 +new file mode 100644 index 000000000000..af607b6f7c6a --- /dev/null +++ b/drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D863_7.h @@ -814259,7 +814282,7 @@ index 000000000000..af607b6f7c6a +#endif + diff --git a/drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D89.h b/drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D89.h -new file mode 100755 +new file mode 100644 index 000000000000..2a2045660c0a --- /dev/null +++ b/drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D89.h @@ -814779,7 +814802,7 @@ index 000000000000..2a2045660c0a +#endif + diff --git a/drivers/input/touchscreen/hyn_cst2xx/Makefile b/drivers/input/touchscreen/hyn_cst2xx/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..247b6045dd13 --- /dev/null +++ b/drivers/input/touchscreen/hyn_cst2xx/Makefile @@ -814787,7 +814810,7 @@ index 000000000000..247b6045dd13 +obj-$(CONFIG_TOUCHSCREEN_HYN_CST2XX) += hyn_cst2xx.o + diff --git a/drivers/input/touchscreen/hyn_cst2xx/hyn_cst2xx.c b/drivers/input/touchscreen/hyn_cst2xx/hyn_cst2xx.c -new file mode 100755 +new file mode 100644 index 000000000000..689e0a8a7e26 --- /dev/null +++ b/drivers/input/touchscreen/hyn_cst2xx/hyn_cst2xx.c @@ -816763,7 +816786,7 @@ index 000000000000..689e0a8a7e26 +MODULE_ALIAS("platform:hyn_ts"); + diff --git a/drivers/input/touchscreen/tp_gslx680_board.h b/drivers/input/touchscreen/tp_gslx680_board.h -new file mode 100755 +new file mode 100644 index 000000000000..bc90005e215d --- /dev/null +++ b/drivers/input/touchscreen/tp_gslx680_board.h @@ -821677,7 +821700,7 @@ index 000000000000..bc90005e215d + +#endif diff --git a/drivers/input/touchscreen/tp_suspend.h b/drivers/input/touchscreen/tp_suspend.h -new file mode 100755 +new file mode 100644 index 000000000000..e4248663febc --- /dev/null +++ b/drivers/input/touchscreen/tp_suspend.h @@ -821792,7 +821815,7 @@ index 000000000000..e4248663febc +} +#endif diff --git a/drivers/input/touchscreen/vtl_ts/LX20JS06_A1_CT363_V03_5198_121015.dat b/drivers/input/touchscreen/vtl_ts/LX20JS06_A1_CT363_V03_5198_121015.dat -new file mode 100755 +new file mode 100644 index 000000000000..dd2c3d8b25b4 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/LX20JS06_A1_CT363_V03_5198_121015.dat @@ -825895,7 +825918,7 @@ index 000000000000..dd2c3d8b25b4 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 \ No newline at end of file diff --git a/drivers/input/touchscreen/vtl_ts/Makefile b/drivers/input/touchscreen/vtl_ts/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..0d15d7471f7f --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/Makefile @@ -825910,7 +825933,7 @@ index 000000000000..0d15d7471f7f +vtl_ts_ct36x-y +=apk.o + diff --git a/drivers/input/touchscreen/vtl_ts/apk.c b/drivers/input/touchscreen/vtl_ts/apk.c -new file mode 100755 +new file mode 100644 index 000000000000..44db1086d264 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/apk.c @@ -826148,7 +826171,7 @@ index 000000000000..44db1086d264 +}; + diff --git a/drivers/input/touchscreen/vtl_ts/apk.h b/drivers/input/touchscreen/vtl_ts/apk.h -new file mode 100755 +new file mode 100644 index 000000000000..a0a14b6b3cc8 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/apk.h @@ -826161,7 +826184,7 @@ index 000000000000..a0a14b6b3cc8 + +#endif diff --git a/drivers/input/touchscreen/vtl_ts/chip.c b/drivers/input/touchscreen/vtl_ts/chip.c -new file mode 100755 +new file mode 100644 index 000000000000..50004cef1f0c --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/chip.c @@ -827027,7 +827050,7 @@ index 000000000000..50004cef1f0c + + diff --git a/drivers/input/touchscreen/vtl_ts/chip.h b/drivers/input/touchscreen/vtl_ts/chip.h -new file mode 100755 +new file mode 100644 index 000000000000..5ebb121276ed --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/chip.h @@ -827046,7 +827069,7 @@ index 000000000000..5ebb121276ed + +#endif diff --git a/drivers/input/touchscreen/vtl_ts/f307&f317&f316_CT363S_01_V10_F7E9_140212.dat b/drivers/input/touchscreen/vtl_ts/f307&f317&f316_CT363S_01_V10_F7E9_140212.dat -new file mode 100755 +new file mode 100644 index 000000000000..8d43138759b3 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/f307&f317&f316_CT363S_01_V10_F7E9_140212.dat @@ -829101,7 +829124,7 @@ index 000000000000..8d43138759b3 + 0x90,0x3F,0xFF,0x74,0x10,0xF0,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 \ No newline at end of file diff --git a/drivers/input/touchscreen/vtl_ts/lx--js77_97_CT365_V01_E7DA_130419.dat b/drivers/input/touchscreen/vtl_ts/lx--js77_97_CT365_V01_E7DA_130419.dat -new file mode 100755 +new file mode 100644 index 000000000000..d3fc42f43e6b --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/lx--js77_97_CT365_V01_E7DA_130419.dat @@ -831156,7 +831179,7 @@ index 000000000000..d3fc42f43e6b + 0x90,0x3F,0xFF,0x74,0x01,0xF0,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 \ No newline at end of file diff --git a/drivers/input/touchscreen/vtl_ts/tp_fw.h b/drivers/input/touchscreen/vtl_ts/tp_fw.h -new file mode 100755 +new file mode 100644 index 000000000000..df431fcabca8 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/tp_fw.h @@ -833213,7 +833236,7 @@ index 000000000000..df431fcabca8 +0x90, 0x3F, 0xFF, 0x74, 0x10, 0xF0, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; diff --git a/drivers/input/touchscreen/vtl_ts/vtl_ts.c b/drivers/input/touchscreen/vtl_ts/vtl_ts.c -new file mode 100755 +new file mode 100644 index 000000000000..8c8e374ab9d2 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/vtl_ts.c @@ -833947,7 +833970,7 @@ index 000000000000..8c8e374ab9d2 + + diff --git a/drivers/input/touchscreen/vtl_ts/vtl_ts.h b/drivers/input/touchscreen/vtl_ts/vtl_ts.h -new file mode 100755 +new file mode 100644 index 000000000000..95e280688d74 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/vtl_ts.h @@ -834146,7 +834169,7 @@ index 000000000000..95e280688d74 +#endif + diff --git a/drivers/input/touchscreen/vtl_ts/wgj36js07_A1_CT363_V01_0187_140306.dat b/drivers/input/touchscreen/vtl_ts/wgj36js07_A1_CT363_V01_0187_140306.dat -new file mode 100755 +new file mode 100644 index 000000000000..a488e98122a6 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/wgj36js07_A1_CT363_V01_0187_140306.dat @@ -836201,7 +836224,7 @@ index 000000000000..a488e98122a6 + 0x90,0x3F,0xFF,0x74,0x01,0xF0,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 \ No newline at end of file diff --git a/drivers/input/touchscreen/wacom_w9013.c b/drivers/input/touchscreen/wacom_w9013.c -new file mode 100755 +new file mode 100644 index 000000000000..6bbdb01e40ac --- /dev/null +++ b/drivers/input/touchscreen/wacom_w9013.c @@ -836731,7 +836754,7 @@ index 04878caf6da4..fe1256b01f7e 100644 select IOMMU_API select ARM_DMA_USE_IOMMU diff --git a/drivers/iommu/dma-iommu-ops.c b/drivers/iommu/dma-iommu-ops.c -new file mode 100755 +new file mode 100644 index 000000000000..862d7823985e --- /dev/null +++ b/drivers/iommu/dma-iommu-ops.c @@ -838756,10 +838779,10 @@ index 3c24bf45263c..ddcd884d1175 100644 help Support Meson SoC Family GPIO Interrupt Multiplexer diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c -index 5ec091c64d47..985d8de8445f 100644 +index 23ca48741a3f..e814908442db 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c -@@ -2167,6 +2167,8 @@ static struct page *its_allocate_prop_table(gfp_t gfp_flags) +@@ -2192,6 +2192,8 @@ static struct page *its_allocate_prop_table(gfp_t gfp_flags) { struct page *prop_page; @@ -838768,7 +838791,7 @@ index 5ec091c64d47..985d8de8445f 100644 prop_page = alloc_pages(gfp_flags, get_order(LPI_PROPBASE_SZ)); if (!prop_page) return NULL; -@@ -2290,6 +2292,7 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser, +@@ -2315,6 +2317,7 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser, u32 alloc_pages, psz; struct page *page; void *base; @@ -838776,7 +838799,7 @@ index 5ec091c64d47..985d8de8445f 100644 psz = baser->psz; alloc_pages = (PAGE_ORDER_TO_SIZE(order) / psz); -@@ -2301,7 +2304,10 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser, +@@ -2326,7 +2329,10 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser, order = get_order(GITS_BASER_PAGES_MAX * psz); } @@ -838788,7 +838811,7 @@ index 5ec091c64d47..985d8de8445f 100644 if (!page) return -ENOMEM; -@@ -2348,6 +2354,14 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser, +@@ -2373,6 +2379,14 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser, its_write_baser(its, baser, val); tmp = baser->val; @@ -838803,7 +838826,7 @@ index 5ec091c64d47..985d8de8445f 100644 if ((val ^ tmp) & GITS_BASER_SHAREABILITY_MASK) { /* * Shareability didn't stick. Just use -@@ -2930,6 +2944,8 @@ static struct page *its_allocate_pending_table(gfp_t gfp_flags) +@@ -2955,6 +2969,8 @@ static struct page *its_allocate_pending_table(gfp_t gfp_flags) { struct page *pend_page; @@ -838812,7 +838835,7 @@ index 5ec091c64d47..985d8de8445f 100644 pend_page = alloc_pages(gfp_flags | __GFP_ZERO, get_order(LPI_PENDBASE_SZ)); if (!pend_page) -@@ -3077,6 +3093,10 @@ static void its_cpu_init_lpis(void) +@@ -3102,6 +3118,10 @@ static void its_cpu_init_lpis(void) gicr_write_propbaser(val, rbase + GICR_PROPBASER); tmp = gicr_read_propbaser(rbase + GICR_PROPBASER); @@ -838823,7 +838846,7 @@ index 5ec091c64d47..985d8de8445f 100644 if ((tmp ^ val) & GICR_PROPBASER_SHAREABILITY_MASK) { if (!(tmp & GICR_PROPBASER_SHAREABILITY_MASK)) { /* -@@ -3101,6 +3121,10 @@ static void its_cpu_init_lpis(void) +@@ -3126,6 +3146,10 @@ static void its_cpu_init_lpis(void) gicr_write_pendbaser(val, rbase + GICR_PENDBASER); tmp = gicr_read_pendbaser(rbase + GICR_PENDBASER); @@ -838834,7 +838857,7 @@ index 5ec091c64d47..985d8de8445f 100644 if (!(tmp & GICR_PENDBASER_SHAREABILITY_MASK)) { /* * The HW reports non-shareable, we must remove the -@@ -3263,7 +3287,11 @@ static bool its_alloc_table_entry(struct its_node *its, +@@ -3288,7 +3312,11 @@ static bool its_alloc_table_entry(struct its_node *its, /* Allocate memory for 2nd level table */ if (!table[idx]) { @@ -838847,7 +838870,7 @@ index 5ec091c64d47..985d8de8445f 100644 get_order(baser->psz)); if (!page) return false; -@@ -3352,6 +3380,7 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id, +@@ -3377,6 +3405,7 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id, int nr_lpis; int nr_ites; int sz; @@ -838855,7 +838878,7 @@ index 5ec091c64d47..985d8de8445f 100644 if (!its_alloc_device_table(its, dev_id)) return NULL; -@@ -3367,7 +3396,10 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id, +@@ -3392,7 +3421,10 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id, nr_ites = max(2, nvecs); sz = nr_ites * (FIELD_GET(GITS_TYPER_ITT_ENTRY_SIZE, its->typer) + 1); sz = max(sz, ITS_ITT_ALIGN) + ITS_ITT_ALIGN - 1; @@ -838867,7 +838890,7 @@ index 5ec091c64d47..985d8de8445f 100644 if (alloc_lpis) { lpi_map = its_lpi_alloc(nvecs, &lpi_base, &nr_lpis); if (lpi_map) -@@ -3841,8 +3873,6 @@ static void its_vpe_schedule(struct its_vpe *vpe) +@@ -3866,8 +3898,6 @@ static void its_vpe_schedule(struct its_vpe *vpe) val |= vpe->idai ? GICR_VPENDBASER_IDAI : 0; val |= GICR_VPENDBASER_Valid; gicr_write_vpendbaser(val, vlpi_base + GICR_VPENDBASER); @@ -838876,7 +838899,7 @@ index 5ec091c64d47..985d8de8445f 100644 } static void its_vpe_deschedule(struct its_vpe *vpe) -@@ -3890,6 +3920,10 @@ static int its_vpe_set_vcpu_affinity(struct irq_data *d, void *vcpu_info) +@@ -3915,6 +3945,10 @@ static int its_vpe_set_vcpu_affinity(struct irq_data *d, void *vcpu_info) its_vpe_deschedule(vpe); return 0; @@ -838887,7 +838910,7 @@ index 5ec091c64d47..985d8de8445f 100644 case INVALL_VPE: its_vpe_invall(vpe); return 0; -@@ -4051,8 +4085,6 @@ static void its_vpe_4_1_schedule(struct its_vpe *vpe, +@@ -4068,8 +4102,6 @@ static void its_vpe_4_1_schedule(struct its_vpe *vpe, val |= FIELD_PREP(GICR_VPENDBASER_4_1_VPEID, vpe->vpe_id); gicr_write_vpendbaser(val, vlpi_base + GICR_VPENDBASER); @@ -838896,7 +838919,7 @@ index 5ec091c64d47..985d8de8445f 100644 } static void its_vpe_4_1_deschedule(struct its_vpe *vpe, -@@ -4127,6 +4159,10 @@ static int its_vpe_4_1_set_vcpu_affinity(struct irq_data *d, void *vcpu_info) +@@ -4144,6 +4176,10 @@ static int its_vpe_4_1_set_vcpu_affinity(struct irq_data *d, void *vcpu_info) its_vpe_4_1_deschedule(vpe, info); return 0; @@ -838907,7 +838930,7 @@ index 5ec091c64d47..985d8de8445f 100644 case INVALL_VPE: its_vpe_4_1_invall(vpe); return 0; -@@ -4945,6 +4981,7 @@ static int __init its_probe_one(struct resource *res, +@@ -4957,6 +4993,7 @@ static int __init its_probe_one(struct resource *res, u64 baser, tmp, typer; struct page *page; int err; @@ -838915,7 +838938,7 @@ index 5ec091c64d47..985d8de8445f 100644 its_base = ioremap(res->start, SZ_64K); if (!its_base) { -@@ -5013,7 +5050,10 @@ static int __init its_probe_one(struct resource *res, +@@ -5025,7 +5062,10 @@ static int __init its_probe_one(struct resource *res, its->numa_node = numa_node; @@ -838927,7 +838950,7 @@ index 5ec091c64d47..985d8de8445f 100644 get_order(ITS_CMD_QUEUE_SZ)); if (!page) { err = -ENOMEM; -@@ -5044,6 +5084,10 @@ static int __init its_probe_one(struct resource *res, +@@ -5056,6 +5096,10 @@ static int __init its_probe_one(struct resource *res, gits_write_cbaser(baser, its->base + GITS_CBASER); tmp = gits_read_cbaser(its->base + GITS_CBASER); @@ -839448,8 +839471,8 @@ index f0a77473979d..298863171375 100644 obj-$(CONFIG_VIDEO_IMX214) += imx214.o obj-$(CONFIG_VIDEO_IMX219) += imx219.o diff --git a/drivers/media/i2c/gc8034.c b/drivers/media/i2c/gc8034.c -new file mode 100755 -index 000000000000..6edbf5e02995 +new file mode 100644 +index 000000000000..cf4c7a290379 --- /dev/null +++ b/drivers/media/i2c/gc8034.c @@ -0,0 +1,2834 @@ @@ -842288,7 +842311,7 @@ index 000000000000..6edbf5e02995 +MODULE_DESCRIPTION("GalaxyCore gc8034 sensor driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/i2c/rk628_csi.c b/drivers/media/i2c/rk628_csi.c -new file mode 100755 +new file mode 100644 index 000000000000..3fe765c148c7 --- /dev/null +++ b/drivers/media/i2c/rk628_csi.c @@ -844990,7 +845013,7 @@ index 000000000000..3fe765c148c7 +MODULE_AUTHOR("Dingxian Wen "); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/i2c/rk628_csi.h b/drivers/media/i2c/rk628_csi.h -new file mode 100755 +new file mode 100644 index 000000000000..e4aa258663b8 --- /dev/null +++ b/drivers/media/i2c/rk628_csi.h @@ -845368,7 +845391,7 @@ index 62b6cdc8c730..c7cb2135bb56 100644 obj-y += omap/ diff --git a/drivers/media/platform/rockchip-tsp/Kconfig b/drivers/media/platform/rockchip-tsp/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..5394bfa7c63c --- /dev/null +++ b/drivers/media/platform/rockchip-tsp/Kconfig @@ -845386,7 +845409,7 @@ index 000000000000..5394bfa7c63c + Say N hera if you do not want to use the processor. + diff --git a/drivers/media/platform/rockchip-tsp/Makefile b/drivers/media/platform/rockchip-tsp/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..ca555d0ef9e9 --- /dev/null +++ b/drivers/media/platform/rockchip-tsp/Makefile @@ -845398,7 +845421,7 @@ index 000000000000..ca555d0ef9e9 + +obj-$(CONFIG_ROCKCHIP_TSP) += rockchip_tsp.o diff --git a/drivers/media/platform/rockchip-tsp/rockchip_tsp.c b/drivers/media/platform/rockchip-tsp/rockchip_tsp.c -new file mode 100755 +new file mode 100644 index 000000000000..830147909eeb --- /dev/null +++ b/drivers/media/platform/rockchip-tsp/rockchip_tsp.c @@ -846586,7 +846609,7 @@ index 000000000000..830147909eeb +MODULE_AUTHOR("Jerry Xu "); +MODULE_ALIAS("platform:" MODE_NAME); diff --git a/drivers/media/platform/rockchip-tsp/rockchip_tsp.h b/drivers/media/platform/rockchip-tsp/rockchip_tsp.h -new file mode 100755 +new file mode 100644 index 000000000000..bafe641cdf9f --- /dev/null +++ b/drivers/media/platform/rockchip-tsp/rockchip_tsp.h @@ -846822,7 +846845,7 @@ index 000000000000..bafe641cdf9f + +#endif diff --git a/drivers/media/platform/rockchip/cif/Kconfig b/drivers/media/platform/rockchip/cif/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..592842bf3386 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/Kconfig @@ -846868,7 +846891,7 @@ index 000000000000..592842bf3386 +endchoice + diff --git a/drivers/media/platform/rockchip/cif/Makefile b/drivers/media/platform/rockchip/cif/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..279be843e093 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/Makefile @@ -846885,7 +846908,7 @@ index 000000000000..279be843e093 + cif-scale.o \ + common.o diff --git a/drivers/media/platform/rockchip/cif/capture.c b/drivers/media/platform/rockchip/cif/capture.c -new file mode 100755 +new file mode 100644 index 000000000000..9832721da8e3 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/capture.c @@ -854806,7 +854829,7 @@ index 000000000000..9832721da8e3 +} + diff --git a/drivers/media/platform/rockchip/cif/cif-luma.c b/drivers/media/platform/rockchip/cif/cif-luma.c -new file mode 100755 +new file mode 100644 index 000000000000..9d751df3c4e5 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/cif-luma.c @@ -855332,7 +855355,7 @@ index 000000000000..9d751df3c4e5 + vb2_queue_release(vdev->queue); +} diff --git a/drivers/media/platform/rockchip/cif/cif-luma.h b/drivers/media/platform/rockchip/cif/cif-luma.h -new file mode 100755 +new file mode 100644 index 000000000000..f57d19c4123a --- /dev/null +++ b/drivers/media/platform/rockchip/cif/cif-luma.h @@ -855421,7 +855444,7 @@ index 000000000000..f57d19c4123a + +#endif /* _RKCIF_LUMA_H */ diff --git a/drivers/media/platform/rockchip/cif/cif-scale.c b/drivers/media/platform/rockchip/cif/cif-scale.c -new file mode 100755 +new file mode 100644 index 000000000000..afcf8801f425 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/cif-scale.c @@ -856629,7 +856652,7 @@ index 000000000000..afcf8801f425 +} + diff --git a/drivers/media/platform/rockchip/cif/common.c b/drivers/media/platform/rockchip/cif/common.c -new file mode 100755 +new file mode 100644 index 000000000000..7442dfe82c14 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/common.c @@ -856822,7 +856845,7 @@ index 000000000000..7442dfe82c14 +} + diff --git a/drivers/media/platform/rockchip/cif/common.h b/drivers/media/platform/rockchip/cif/common.h -new file mode 100755 +new file mode 100644 index 000000000000..86dbd55d1283 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/common.h @@ -856855,7 +856878,7 @@ index 000000000000..86dbd55d1283 +#endif /* _RKCIF_COMMON_H */ + diff --git a/drivers/media/platform/rockchip/cif/dev.c b/drivers/media/platform/rockchip/cif/dev.c -new file mode 100755 +new file mode 100644 index 000000000000..5f59c9401059 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/dev.c @@ -858789,7 +858812,7 @@ index 000000000000..5f59c9401059 +MODULE_DESCRIPTION("Rockchip CIF platform driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/platform/rockchip/cif/dev.h b/drivers/media/platform/rockchip/cif/dev.h -new file mode 100755 +new file mode 100644 index 000000000000..a6f210bd8166 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/dev.h @@ -859581,7 +859604,7 @@ index 000000000000..a6f210bd8166 + +#endif diff --git a/drivers/media/platform/rockchip/cif/hw.c b/drivers/media/platform/rockchip/cif/hw.c -new file mode 100755 +new file mode 100644 index 000000000000..a85f2e14c8e7 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/hw.c @@ -860773,7 +860796,7 @@ index 000000000000..a85f2e14c8e7 +MODULE_DESCRIPTION("Rockchip CIF platform driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/platform/rockchip/cif/hw.h b/drivers/media/platform/rockchip/cif/hw.h -new file mode 100755 +new file mode 100644 index 000000000000..b5698f7c35e6 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/hw.h @@ -860909,7 +860932,7 @@ index 000000000000..b5698f7c35e6 + +#endif diff --git a/drivers/media/platform/rockchip/cif/mipi-csi2.c b/drivers/media/platform/rockchip/cif/mipi-csi2.c -new file mode 100755 +new file mode 100644 index 000000000000..fb2312e2bb63 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/mipi-csi2.c @@ -861855,7 +861878,7 @@ index 000000000000..fb2312e2bb63 +MODULE_AUTHOR("Macrofly.xu "); +MODULE_LICENSE("GPL"); diff --git a/drivers/media/platform/rockchip/cif/mipi-csi2.h b/drivers/media/platform/rockchip/cif/mipi-csi2.h -new file mode 100755 +new file mode 100644 index 000000000000..e04a7dd2eef3 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/mipi-csi2.h @@ -862020,7 +862043,7 @@ index 000000000000..e04a7dd2eef3 + +#endif diff --git a/drivers/media/platform/rockchip/cif/procfs.c b/drivers/media/platform/rockchip/cif/procfs.c -new file mode 100755 +new file mode 100644 index 000000000000..43d6e2c232b0 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/procfs.c @@ -862432,7 +862455,7 @@ index 000000000000..43d6e2c232b0 + +#endif diff --git a/drivers/media/platform/rockchip/cif/procfs.h b/drivers/media/platform/rockchip/cif/procfs.h -new file mode 100755 +new file mode 100644 index 000000000000..798533849cd9 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/procfs.h @@ -862463,7 +862486,7 @@ index 000000000000..798533849cd9 + +#endif diff --git a/drivers/media/platform/rockchip/cif/regs.h b/drivers/media/platform/rockchip/cif/regs.h -new file mode 100755 +new file mode 100644 index 000000000000..d9a1303c16af --- /dev/null +++ b/drivers/media/platform/rockchip/cif/regs.h @@ -863448,7 +863471,7 @@ index 000000000000..d9a1303c16af + +#endif diff --git a/drivers/media/platform/rockchip/cif/subdev-itf.c b/drivers/media/platform/rockchip/cif/subdev-itf.c -new file mode 100755 +new file mode 100644 index 000000000000..3cf240ee4945 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/subdev-itf.c @@ -864089,7 +864112,7 @@ index 000000000000..3cf240ee4945 +MODULE_DESCRIPTION("Rockchip CIF platform driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/platform/rockchip/cif/subdev-itf.h b/drivers/media/platform/rockchip/cif/subdev-itf.h -new file mode 100755 +new file mode 100644 index 000000000000..a1ebbe02a820 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/subdev-itf.h @@ -864164,7 +864187,7 @@ index 000000000000..a1ebbe02a820 + +#endif diff --git a/drivers/media/platform/rockchip/cif/version.h b/drivers/media/platform/rockchip/cif/version.h -new file mode 100755 +new file mode 100644 index 000000000000..627b4a3a11e5 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/version.h @@ -864244,7 +864267,7 @@ index 000000000000..627b4a3a11e5 + +#endif diff --git a/drivers/media/platform/rockchip/isp/Kconfig b/drivers/media/platform/rockchip/isp/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..98a530a171f1 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/Kconfig @@ -864289,7 +864312,7 @@ index 000000000000..98a530a171f1 + +endif diff --git a/drivers/media/platform/rockchip/isp/Makefile b/drivers/media/platform/rockchip/isp/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..52cac629003f --- /dev/null +++ b/drivers/media/platform/rockchip/isp/Makefile @@ -864337,7 +864360,7 @@ index 000000000000..52cac629003f + +video_rkisp-$(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) += rkisp_tb_helper.o diff --git a/drivers/media/platform/rockchip/isp/bridge.c b/drivers/media/platform/rockchip/isp/bridge.c -new file mode 100755 +new file mode 100644 index 000000000000..51c8254ccfe2 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/bridge.c @@ -864972,7 +864995,7 @@ index 000000000000..51c8254ccfe2 +} +EXPORT_SYMBOL(rkisp_get_bridge_sd); diff --git a/drivers/media/platform/rockchip/isp/bridge.h b/drivers/media/platform/rockchip/isp/bridge.h -new file mode 100755 +new file mode 100644 index 000000000000..8310b13df88a --- /dev/null +++ b/drivers/media/platform/rockchip/isp/bridge.h @@ -865083,7 +865106,7 @@ index 000000000000..8310b13df88a + +#endif diff --git a/drivers/media/platform/rockchip/isp/bridge_v20.c b/drivers/media/platform/rockchip/isp/bridge_v20.c -new file mode 100755 +new file mode 100644 index 000000000000..ff1d4af07424 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/bridge_v20.c @@ -866183,7 +866206,7 @@ index 000000000000..ff1d4af07424 + dev->frame_qst.function = rkisp_bridge_frame_done_early; +} diff --git a/drivers/media/platform/rockchip/isp/bridge_v30.c b/drivers/media/platform/rockchip/isp/bridge_v30.c -new file mode 100755 +new file mode 100644 index 000000000000..c0b639bddd56 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/bridge_v30.c @@ -866425,7 +866448,7 @@ index 000000000000..c0b639bddd56 + dev->cfg = &mp_cfg; +} diff --git a/drivers/media/platform/rockchip/isp/capture.c b/drivers/media/platform/rockchip/isp/capture.c -new file mode 100755 +new file mode 100644 index 000000000000..476c147b5f60 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture.c @@ -868148,7 +868171,7 @@ index 000000000000..476c147b5f60 + rkisp_mi_v30_isr(mis_val, dev); +} diff --git a/drivers/media/platform/rockchip/isp/capture.h b/drivers/media/platform/rockchip/isp/capture.h -new file mode 100755 +new file mode 100644 index 000000000000..5a9251a9c973 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture.h @@ -868449,7 +868472,7 @@ index 000000000000..5a9251a9c973 +int rkisp_fop_release(struct file *file); +#endif /* _RKISP_PATH_VIDEO_H */ diff --git a/drivers/media/platform/rockchip/isp/capture_v1x.c b/drivers/media/platform/rockchip/isp/capture_v1x.c -new file mode 100755 +new file mode 100644 index 000000000000..b829bd5e512a --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v1x.c @@ -869412,7 +869435,7 @@ index 000000000000..b829bd5e512a + } +} diff --git a/drivers/media/platform/rockchip/isp/capture_v1x.h b/drivers/media/platform/rockchip/isp/capture_v1x.h -new file mode 100755 +new file mode 100644 index 000000000000..f26f1bde0010 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v1x.h @@ -869435,7 +869458,7 @@ index 000000000000..f26f1bde0010 + +#endif diff --git a/drivers/media/platform/rockchip/isp/capture_v20.c b/drivers/media/platform/rockchip/isp/capture_v20.c -new file mode 100755 +new file mode 100644 index 000000000000..4dbb87110d54 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v20.c @@ -871410,7 +871433,7 @@ index 000000000000..4dbb87110d54 + } +} diff --git a/drivers/media/platform/rockchip/isp/capture_v21.c b/drivers/media/platform/rockchip/isp/capture_v21.c -new file mode 100755 +new file mode 100644 index 000000000000..4bef12f6a9a4 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v21.c @@ -873115,7 +873138,7 @@ index 000000000000..4bef12f6a9a4 + } +} diff --git a/drivers/media/platform/rockchip/isp/capture_v2x.h b/drivers/media/platform/rockchip/isp/capture_v2x.h -new file mode 100755 +new file mode 100644 index 000000000000..8ec036998a4a --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v2x.h @@ -873169,7 +873192,7 @@ index 000000000000..8ec036998a4a + +#endif diff --git a/drivers/media/platform/rockchip/isp/capture_v30.c b/drivers/media/platform/rockchip/isp/capture_v30.c -new file mode 100755 +new file mode 100644 index 000000000000..05fad30e2ba3 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v30.c @@ -874670,7 +874693,7 @@ index 000000000000..05fad30e2ba3 + v4l2_warn(&dev->v4l2_dev, "RD_SIZE_ERR:0x%08x\n", state); +} diff --git a/drivers/media/platform/rockchip/isp/capture_v3x.h b/drivers/media/platform/rockchip/isp/capture_v3x.h -new file mode 100755 +new file mode 100644 index 000000000000..cb3d59391e87 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v3x.h @@ -874699,7 +874722,7 @@ index 000000000000..cb3d59391e87 + +#endif diff --git a/drivers/media/platform/rockchip/isp/common.c b/drivers/media/platform/rockchip/isp/common.c -new file mode 100755 +new file mode 100644 index 000000000000..30b69b204914 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/common.c @@ -875074,7 +875097,7 @@ index 000000000000..30b69b204914 + rkisp_free_buffer(dev, &hw->dummy_buf); +} diff --git a/drivers/media/platform/rockchip/isp/common.h b/drivers/media/platform/rockchip/isp/common.h -new file mode 100755 +new file mode 100644 index 000000000000..6ff84a21b216 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/common.h @@ -875292,7 +875315,7 @@ index 000000000000..6ff84a21b216 +void rkisp_set_clk_rate(struct clk *clk, unsigned long rate); +#endif /* _RKISP_COMMON_H */ diff --git a/drivers/media/platform/rockchip/isp/csi.c b/drivers/media/platform/rockchip/isp/csi.c -new file mode 100755 +new file mode 100644 index 000000000000..2ffd02c73e0d --- /dev/null +++ b/drivers/media/platform/rockchip/isp/csi.c @@ -875935,7 +875958,7 @@ index 000000000000..2ffd02c73e0d + media_entity_cleanup(&sd->entity); +} diff --git a/drivers/media/platform/rockchip/isp/csi.h b/drivers/media/platform/rockchip/isp/csi.h -new file mode 100755 +new file mode 100644 index 000000000000..4a8c7020078b --- /dev/null +++ b/drivers/media/platform/rockchip/isp/csi.h @@ -876024,7 +876047,7 @@ index 000000000000..4a8c7020078b +void rkisp_csi_sof(struct rkisp_device *dev, u8 id); +#endif diff --git a/drivers/media/platform/rockchip/isp/dev.c b/drivers/media/platform/rockchip/isp/dev.c -new file mode 100755 +new file mode 100644 index 000000000000..e8628681d570 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/dev.c @@ -876943,7 +876966,7 @@ index 000000000000..e8628681d570 +MODULE_DESCRIPTION("Rockchip ISP platform driver"); +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/media/platform/rockchip/isp/dev.h b/drivers/media/platform/rockchip/isp/dev.h -new file mode 100755 +new file mode 100644 index 000000000000..e057491111fa --- /dev/null +++ b/drivers/media/platform/rockchip/isp/dev.h @@ -877187,7 +877210,7 @@ index 000000000000..e057491111fa +}; +#endif diff --git a/drivers/media/platform/rockchip/isp/dmarx.c b/drivers/media/platform/rockchip/isp/dmarx.c -new file mode 100755 +new file mode 100644 index 000000000000..0dcc080d7cdc --- /dev/null +++ b/drivers/media/platform/rockchip/isp/dmarx.c @@ -878376,7 +878399,7 @@ index 000000000000..0dcc080d7cdc + } +} diff --git a/drivers/media/platform/rockchip/isp/dmarx.h b/drivers/media/platform/rockchip/isp/dmarx.h -new file mode 100755 +new file mode 100644 index 000000000000..348096e286ef --- /dev/null +++ b/drivers/media/platform/rockchip/isp/dmarx.h @@ -878449,7 +878472,7 @@ index 000000000000..348096e286ef +int rkisp_register_dmarx_vdev(struct rkisp_device *dev); +#endif /* _RKISP_DMARX_H */ diff --git a/drivers/media/platform/rockchip/isp/hw.c b/drivers/media/platform/rockchip/isp/hw.c -new file mode 100755 +new file mode 100644 index 000000000000..899bee986397 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/hw.c @@ -879474,7 +879497,7 @@ index 000000000000..899bee986397 + +module_init(rkisp_hw_drv_init); diff --git a/drivers/media/platform/rockchip/isp/hw.h b/drivers/media/platform/rockchip/isp/hw.h -new file mode 100755 +new file mode 100644 index 000000000000..dce2f0a715ee --- /dev/null +++ b/drivers/media/platform/rockchip/isp/hw.h @@ -879569,7 +879592,7 @@ index 000000000000..dce2f0a715ee +void rkisp_soft_reset(struct rkisp_hw_dev *dev, bool is_secure); +#endif diff --git a/drivers/media/platform/rockchip/isp/isp_external.h b/drivers/media/platform/rockchip/isp/isp_external.h -new file mode 100755 +new file mode 100644 index 000000000000..655c4b943835 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_external.h @@ -879619,7 +879642,7 @@ index 000000000000..655c4b943835 + +#endif diff --git a/drivers/media/platform/rockchip/isp/isp_ispp.h b/drivers/media/platform/rockchip/isp/isp_ispp.h -new file mode 100755 +new file mode 100644 index 000000000000..98300cae0347 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_ispp.h @@ -879763,7 +879786,7 @@ index 000000000000..98300cae0347 + +#endif diff --git a/drivers/media/platform/rockchip/isp/isp_mipi_luma.c b/drivers/media/platform/rockchip/isp/isp_mipi_luma.c -new file mode 100755 +new file mode 100644 index 000000000000..ebca58e7102f --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_mipi_luma.c @@ -880293,7 +880316,7 @@ index 000000000000..ebca58e7102f + vb2_queue_release(vdev->queue); +} diff --git a/drivers/media/platform/rockchip/isp/isp_mipi_luma.h b/drivers/media/platform/rockchip/isp/isp_mipi_luma.h -new file mode 100755 +new file mode 100644 index 000000000000..537a9d6a0796 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_mipi_luma.h @@ -880378,7 +880401,7 @@ index 000000000000..537a9d6a0796 + +#endif /* _RKISP_ISP_LUMA_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_params.c b/drivers/media/platform/rockchip/isp/isp_params.c -new file mode 100755 +new file mode 100644 index 000000000000..c5e91d18f973 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params.c @@ -880843,7 +880866,7 @@ index 000000000000..c5e91d18f973 +} + diff --git a/drivers/media/platform/rockchip/isp/isp_params.h b/drivers/media/platform/rockchip/isp/isp_params.h -new file mode 100755 +new file mode 100644 index 000000000000..fb4e3a2d7569 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params.h @@ -880996,7 +881019,7 @@ index 000000000000..fb4e3a2d7569 + +#endif /* _RKISP_ISP_PARAM_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_params_v1x.c b/drivers/media/platform/rockchip/isp/isp_params_v1x.c -new file mode 100755 +new file mode 100644 index 000000000000..4ca6c6dbbd2c --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v1x.c @@ -883354,7 +883377,7 @@ index 000000000000..4ca6c6dbbd2c +} + diff --git a/drivers/media/platform/rockchip/isp/isp_params_v1x.h b/drivers/media/platform/rockchip/isp/isp_params_v1x.h -new file mode 100755 +new file mode 100644 index 000000000000..316bef51eaca --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v1x.h @@ -883447,7 +883470,7 @@ index 000000000000..316bef51eaca + +#endif /* _RKISP_ISP_PARAM_V1X_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_params_v21.c b/drivers/media/platform/rockchip/isp/isp_params_v21.c -new file mode 100755 +new file mode 100644 index 000000000000..eeb242a14a79 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v21.c @@ -887648,7 +887671,7 @@ index 000000000000..eeb242a14a79 + params_vdev->priv_val = NULL; +} diff --git a/drivers/media/platform/rockchip/isp/isp_params_v21.h b/drivers/media/platform/rockchip/isp/isp_params_v21.h -new file mode 100755 +new file mode 100644 index 000000000000..860b9156f761 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v21.h @@ -887829,7 +887852,7 @@ index 000000000000..860b9156f761 + +#endif /* _RKISP_ISP_PARAM_V21_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_params_v2x.c b/drivers/media/platform/rockchip/isp/isp_params_v2x.c -new file mode 100755 +new file mode 100644 index 000000000000..656834e2a922 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v2x.c @@ -892301,7 +892324,7 @@ index 000000000000..656834e2a922 +} + diff --git a/drivers/media/platform/rockchip/isp/isp_params_v2x.h b/drivers/media/platform/rockchip/isp/isp_params_v2x.h -new file mode 100755 +new file mode 100644 index 000000000000..707ada18205b --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v2x.h @@ -892666,7 +892689,7 @@ index 000000000000..707ada18205b + +#endif /* _RKISP_ISP_PARAM_V2X_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_params_v3x.c b/drivers/media/platform/rockchip/isp/isp_params_v3x.c -new file mode 100755 +new file mode 100644 index 000000000000..2f35b42e1d7c --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v3x.c @@ -897360,7 +897383,7 @@ index 000000000000..2f35b42e1d7c + } +} diff --git a/drivers/media/platform/rockchip/isp/isp_params_v3x.h b/drivers/media/platform/rockchip/isp/isp_params_v3x.h -new file mode 100755 +new file mode 100644 index 000000000000..3f9d6989d453 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v3x.h @@ -897576,7 +897599,7 @@ index 000000000000..3f9d6989d453 + +#endif /* _RKISP_ISP_PARAM_V3X_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_stats.c b/drivers/media/platform/rockchip/isp/isp_stats.c -new file mode 100755 +new file mode 100644 index 000000000000..e472dbdb7bee --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats.c @@ -897955,7 +897978,7 @@ index 000000000000..e472dbdb7bee +} + diff --git a/drivers/media/platform/rockchip/isp/isp_stats.h b/drivers/media/platform/rockchip/isp/isp_stats.h -new file mode 100755 +new file mode 100644 index 000000000000..249ed2535585 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats.h @@ -898050,7 +898073,7 @@ index 000000000000..249ed2535585 + +#endif /* _RKISP_ISP_STATS_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v1x.c b/drivers/media/platform/rockchip/isp/isp_stats_v1x.c -new file mode 100755 +new file mode 100644 index 000000000000..dce904b5f7c5 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v1x.c @@ -898476,7 +898499,7 @@ index 000000000000..dce904b5f7c5 +} + diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v1x.h b/drivers/media/platform/rockchip/isp/isp_stats_v1x.h -new file mode 100755 +new file mode 100644 index 000000000000..8f1853d4b01d --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v1x.h @@ -898524,7 +898547,7 @@ index 000000000000..8f1853d4b01d + +#endif /* _RKISP_ISP_STATS_V1X_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v21.c b/drivers/media/platform/rockchip/isp/isp_stats_v21.c -new file mode 100755 +new file mode 100644 index 000000000000..956775f3bbaf --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v21.c @@ -899696,7 +899719,7 @@ index 000000000000..956775f3bbaf + rkisp_free_buffer(stats_vdev->dev, &stats_vdev->stats_buf[i]); +} diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v21.h b/drivers/media/platform/rockchip/isp/isp_stats_v21.h -new file mode 100755 +new file mode 100644 index 000000000000..c1dba6c65933 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v21.h @@ -899754,7 +899777,7 @@ index 000000000000..c1dba6c65933 + +#endif /* _RKISP_ISP_STATS_V21_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v2x.c b/drivers/media/platform/rockchip/isp/isp_stats_v2x.c -new file mode 100755 +new file mode 100644 index 000000000000..6e458a571b18 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v2x.c @@ -901286,7 +901309,7 @@ index 000000000000..6e458a571b18 +} + diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v2x.h b/drivers/media/platform/rockchip/isp/isp_stats_v2x.h -new file mode 100755 +new file mode 100644 index 000000000000..5793ebfefcbb --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v2x.h @@ -901362,7 +901385,7 @@ index 000000000000..5793ebfefcbb + +#endif /* _RKISP_ISP_STATS_V2X_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v3x.c b/drivers/media/platform/rockchip/isp/isp_stats_v3x.c -new file mode 100755 +new file mode 100644 index 000000000000..7d1883c37ba8 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v3x.c @@ -902677,7 +902700,7 @@ index 000000000000..7d1883c37ba8 + +} diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v3x.h b/drivers/media/platform/rockchip/isp/isp_stats_v3x.h -new file mode 100755 +new file mode 100644 index 000000000000..1b40c571f19e --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v3x.h @@ -902735,7 +902758,7 @@ index 000000000000..1b40c571f19e + +#endif /* _RKISP_ISP_STATS_V3X_H */ diff --git a/drivers/media/platform/rockchip/isp/procfs.c b/drivers/media/platform/rockchip/isp/procfs.c -new file mode 100755 +new file mode 100644 index 000000000000..4594789ac355 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/procfs.c @@ -903546,7 +903569,7 @@ index 000000000000..4594789ac355 + +#endif /* CONFIG_PROC_FS */ diff --git a/drivers/media/platform/rockchip/isp/procfs.h b/drivers/media/platform/rockchip/isp/procfs.h -new file mode 100755 +new file mode 100644 index 000000000000..09c650abc5cb --- /dev/null +++ b/drivers/media/platform/rockchip/isp/procfs.h @@ -903573,7 +903596,7 @@ index 000000000000..09c650abc5cb + +#endif diff --git a/drivers/media/platform/rockchip/isp/regs.c b/drivers/media/platform/rockchip/isp/regs.c -new file mode 100755 +new file mode 100644 index 000000000000..908e05d8c6a0 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/regs.c @@ -903907,7 +903930,7 @@ index 000000000000..908e05d8c6a0 + update_rsz_shadow(stream, async); +} diff --git a/drivers/media/platform/rockchip/isp/regs.h b/drivers/media/platform/rockchip/isp/regs.h -new file mode 100755 +new file mode 100644 index 000000000000..7b7f5972a3a9 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/regs.h @@ -905944,7 +905967,7 @@ index 000000000000..7b7f5972a3a9 + +#endif /* _RKISP_REGS_H */ diff --git a/drivers/media/platform/rockchip/isp/regs_v2x.h b/drivers/media/platform/rockchip/isp/regs_v2x.h -new file mode 100755 +new file mode 100644 index 000000000000..9e55bdfa7783 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/regs_v2x.h @@ -908667,7 +908690,7 @@ index 000000000000..9e55bdfa7783 + +#endif /* _RKISP_REGS_V2X_H */ diff --git a/drivers/media/platform/rockchip/isp/regs_v3x.h b/drivers/media/platform/rockchip/isp/regs_v3x.h -new file mode 100755 +new file mode 100644 index 000000000000..b8db3e46f439 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/regs_v3x.h @@ -910495,7 +910518,7 @@ index 000000000000..b8db3e46f439 + +#endif /* _RKISP_REGS_V3X_H */ diff --git a/drivers/media/platform/rockchip/isp/rkisp.c b/drivers/media/platform/rockchip/isp/rkisp.c -new file mode 100755 +new file mode 100644 index 000000000000..31bbb5eb09d0 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/rkisp.c @@ -914079,7 +914102,7 @@ index 000000000000..31bbb5eb09d0 +} + diff --git a/drivers/media/platform/rockchip/isp/rkisp.h b/drivers/media/platform/rockchip/isp/rkisp.h -new file mode 100755 +new file mode 100644 index 000000000000..bb19692e8a87 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/rkisp.h @@ -914282,7 +914305,7 @@ index 000000000000..bb19692e8a87 + +#endif /* _RKISP_H */ diff --git a/drivers/media/platform/rockchip/isp/rkisp_tb_helper.c b/drivers/media/platform/rockchip/isp/rkisp_tb_helper.c -new file mode 100755 +new file mode 100644 index 000000000000..a32e5fe5e370 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/rkisp_tb_helper.c @@ -914554,7 +914577,7 @@ index 000000000000..a32e5fe5e370 +} +EXPORT_SYMBOL(rkisp_tb_get_state); diff --git a/drivers/media/platform/rockchip/isp/rkisp_tb_helper.h b/drivers/media/platform/rockchip/isp/rkisp_tb_helper.h -new file mode 100755 +new file mode 100644 index 000000000000..79d06469a354 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/rkisp_tb_helper.h @@ -914593,7 +914616,7 @@ index 000000000000..79d06469a354 + +#endif diff --git a/drivers/media/platform/rockchip/isp/version.h b/drivers/media/platform/rockchip/isp/version.h -new file mode 100755 +new file mode 100644 index 000000000000..fd10553869e9 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/version.h @@ -914823,7 +914846,7 @@ index 000000000000..fd10553869e9 + +#endif diff --git a/drivers/media/platform/rockchip/isp/videobuf2-rdma-sg.c b/drivers/media/platform/rockchip/isp/videobuf2-rdma-sg.c -new file mode 100755 +new file mode 100644 index 000000000000..5fe71b21d930 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/videobuf2-rdma-sg.c @@ -915437,7 +915460,7 @@ index 000000000000..5fe71b21d930 +}; +EXPORT_SYMBOL_GPL(vb2_rdma_sg_memops); diff --git a/drivers/media/platform/rockchip/isp1/Kconfig b/drivers/media/platform/rockchip/isp1/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..5637cc758cc5 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/Kconfig @@ -915455,7 +915478,7 @@ index 000000000000..5637cc758cc5 + help + Support for ISP1 on the rockchip SoC. diff --git a/drivers/media/platform/rockchip/isp1/Makefile b/drivers/media/platform/rockchip/isp1/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..788e3d97978a --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/Makefile @@ -915471,7 +915494,7 @@ index 000000000000..788e3d97978a + capture.o \ + dmarx.o diff --git a/drivers/media/platform/rockchip/isp1/capture.c b/drivers/media/platform/rockchip/isp1/capture.c -new file mode 100755 +new file mode 100644 index 000000000000..e61d59a4000a --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/capture.c @@ -917790,7 +917813,7 @@ index 000000000000..e61d59a4000a + } +} diff --git a/drivers/media/platform/rockchip/isp1/capture.h b/drivers/media/platform/rockchip/isp1/capture.h -new file mode 100755 +new file mode 100644 index 000000000000..8613618352e9 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/capture.h @@ -918015,7 +918038,7 @@ index 000000000000..8613618352e9 +int rkisp1_fop_release(struct file *file); +#endif /* _RKISP1_PATH_VIDEO_H */ diff --git a/drivers/media/platform/rockchip/isp1/common.h b/drivers/media/platform/rockchip/isp1/common.h -new file mode 100755 +new file mode 100644 index 000000000000..f20a0829c96c --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/common.h @@ -918154,7 +918177,7 @@ index 000000000000..f20a0829c96c + +#endif /* _RKISP1_COMMON_H */ diff --git a/drivers/media/platform/rockchip/isp1/dev.c b/drivers/media/platform/rockchip/isp1/dev.c -new file mode 100755 +new file mode 100644 index 000000000000..4e548f0ae81b --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/dev.c @@ -919360,7 +919383,7 @@ index 000000000000..4e548f0ae81b +MODULE_DESCRIPTION("Rockchip ISP1 platform driver"); +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/media/platform/rockchip/isp1/dev.h b/drivers/media/platform/rockchip/isp1/dev.h -new file mode 100755 +new file mode 100644 index 000000000000..980f7711302d --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/dev.h @@ -919539,7 +919562,7 @@ index 000000000000..980f7711302d + +#endif diff --git a/drivers/media/platform/rockchip/isp1/dmarx.c b/drivers/media/platform/rockchip/isp1/dmarx.c -new file mode 100755 +new file mode 100644 index 000000000000..7ac08d249c0b --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/dmarx.c @@ -920232,7 +920255,7 @@ index 000000000000..7ac08d249c0b + } +} diff --git a/drivers/media/platform/rockchip/isp1/dmarx.h b/drivers/media/platform/rockchip/isp1/dmarx.h -new file mode 100755 +new file mode 100644 index 000000000000..abc3b39aa0b5 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/dmarx.h @@ -920267,7 +920290,7 @@ index 000000000000..abc3b39aa0b5 +int rkisp1_register_dmarx_vdev(struct rkisp1_device *dev); +#endif /* _RKISP1_DMARX_H */ diff --git a/drivers/media/platform/rockchip/isp1/isp_params.c b/drivers/media/platform/rockchip/isp1/isp_params.c -new file mode 100755 +new file mode 100644 index 000000000000..5315aabf3957 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/isp_params.c @@ -922928,7 +922951,7 @@ index 000000000000..5315aabf3957 + vb2_queue_release(vdev->queue); +} diff --git a/drivers/media/platform/rockchip/isp1/isp_params.h b/drivers/media/platform/rockchip/isp1/isp_params.h -new file mode 100755 +new file mode 100644 index 000000000000..ea707b7cf0e4 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/isp_params.h @@ -923085,7 +923108,7 @@ index 000000000000..ea707b7cf0e4 + +#endif /* _RKISP1_ISP_H */ diff --git a/drivers/media/platform/rockchip/isp1/isp_stats.c b/drivers/media/platform/rockchip/isp1/isp_stats.c -new file mode 100755 +new file mode 100644 index 000000000000..b682f6a4f9d1 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/isp_stats.c @@ -923775,7 +923798,7 @@ index 000000000000..b682f6a4f9d1 + vb2_queue_release(vdev->queue); +} diff --git a/drivers/media/platform/rockchip/isp1/isp_stats.h b/drivers/media/platform/rockchip/isp1/isp_stats.h -new file mode 100755 +new file mode 100644 index 000000000000..bdb4779b1f69 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/isp_stats.h @@ -923893,7 +923916,7 @@ index 000000000000..bdb4779b1f69 + +#endif /* _RKISP1_ISP_STATS_H */ diff --git a/drivers/media/platform/rockchip/isp1/regs.c b/drivers/media/platform/rockchip/isp1/regs.c -new file mode 100755 +new file mode 100644 index 000000000000..82f6cd92475e --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/regs.c @@ -924143,7 +924166,7 @@ index 000000000000..82f6cd92475e + return !(readl(base + CIF_MI_CTRL_SHD) & CIF_MI_CTRL_SHD_SP_IN_ENABLED); +} diff --git a/drivers/media/platform/rockchip/isp1/regs.h b/drivers/media/platform/rockchip/isp1/regs.h -new file mode 100755 +new file mode 100644 index 000000000000..d31ef1b127f5 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/regs.h @@ -926143,7 +926166,7 @@ index 000000000000..d31ef1b127f5 + +#endif /* _RKISP1_REGS_H */ diff --git a/drivers/media/platform/rockchip/isp1/rkisp1.c b/drivers/media/platform/rockchip/isp1/rkisp1.c -new file mode 100755 +new file mode 100644 index 000000000000..07246bca865c --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/rkisp1.c @@ -928022,7 +928045,7 @@ index 000000000000..07246bca865c +} + diff --git a/drivers/media/platform/rockchip/isp1/rkisp1.h b/drivers/media/platform/rockchip/isp1/rkisp1.h -new file mode 100755 +new file mode 100644 index 000000000000..afafc2c0f78f --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/rkisp1.h @@ -928191,7 +928214,7 @@ index 000000000000..afafc2c0f78f + +#endif /* _RKISP1_H */ diff --git a/drivers/media/platform/rockchip/isp1/version.h b/drivers/media/platform/rockchip/isp1/version.h -new file mode 100755 +new file mode 100644 index 000000000000..3bfb0c98fd6e --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/version.h @@ -928258,7 +928281,7 @@ index 000000000000..3bfb0c98fd6e + +#endif diff --git a/drivers/media/platform/rockchip/ispp/Kconfig b/drivers/media/platform/rockchip/ispp/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..7de4f688633b --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/Kconfig @@ -928295,7 +928318,7 @@ index 000000000000..7de4f688633b + +endif diff --git a/drivers/media/platform/rockchip/ispp/Makefile b/drivers/media/platform/rockchip/ispp/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..6148f70ff50a --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/Makefile @@ -928324,7 +928347,7 @@ index 000000000000..6148f70ff50a +video_rkispp-objs += fec.o +endif diff --git a/drivers/media/platform/rockchip/ispp/common.c b/drivers/media/platform/rockchip/ispp/common.c -new file mode 100755 +new file mode 100644 index 000000000000..91bd4cb96840 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/common.c @@ -928925,7 +928948,7 @@ index 000000000000..91bd4cb96840 + return false; +} diff --git a/drivers/media/platform/rockchip/ispp/common.h b/drivers/media/platform/rockchip/ispp/common.h -new file mode 100755 +new file mode 100644 index 000000000000..0d24cbb6c2d0 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/common.h @@ -929076,7 +929099,7 @@ index 000000000000..0d24cbb6c2d0 +void rkispp_set_clk_rate(struct clk *clk, unsigned long rate); +#endif diff --git a/drivers/media/platform/rockchip/ispp/dev.c b/drivers/media/platform/rockchip/ispp/dev.c -new file mode 100755 +new file mode 100644 index 000000000000..54fa571f8de1 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/dev.c @@ -929467,7 +929490,7 @@ index 000000000000..54fa571f8de1 +MODULE_DESCRIPTION("Rockchip ISPP platform driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/platform/rockchip/ispp/dev.h b/drivers/media/platform/rockchip/ispp/dev.h -new file mode 100755 +new file mode 100644 index 000000000000..32a6736bbb1c --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/dev.h @@ -929533,7 +929556,7 @@ index 000000000000..32a6736bbb1c +}; +#endif diff --git a/drivers/media/platform/rockchip/ispp/fec.c b/drivers/media/platform/rockchip/ispp/fec.c -new file mode 100755 +new file mode 100644 index 000000000000..a742dc18b8c7 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/fec.c @@ -930019,7 +930042,7 @@ index 000000000000..a742dc18b8c7 + v4l2_device_unregister(&hw->fec_dev.v4l2_dev); +} diff --git a/drivers/media/platform/rockchip/ispp/fec.h b/drivers/media/platform/rockchip/ispp/fec.h -new file mode 100755 +new file mode 100644 index 000000000000..b89615a0747d --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/fec.h @@ -930052,7 +930075,7 @@ index 000000000000..b89615a0747d + +#endif diff --git a/drivers/media/platform/rockchip/ispp/hw.c b/drivers/media/platform/rockchip/ispp/hw.c -new file mode 100755 +new file mode 100644 index 000000000000..2d0466070fd6 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/hw.c @@ -930568,7 +930591,7 @@ index 000000000000..2d0466070fd6 +module_init(rkispp_hw_drv_init); +#endif diff --git a/drivers/media/platform/rockchip/ispp/hw.h b/drivers/media/platform/rockchip/ispp/hw.h -new file mode 100755 +new file mode 100644 index 000000000000..8eb2585ecb71 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/hw.h @@ -930641,7 +930664,7 @@ index 000000000000..8eb2585ecb71 +void rkispp_soft_reset(struct rkispp_hw_dev *hw_dev); +#endif diff --git a/drivers/media/platform/rockchip/ispp/ispp.c b/drivers/media/platform/rockchip/ispp/ispp.c -new file mode 100755 +new file mode 100644 index 000000000000..e1efba145533 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/ispp.c @@ -931237,7 +931260,7 @@ index 000000000000..e1efba145533 + media_entity_cleanup(&sd->entity); +} diff --git a/drivers/media/platform/rockchip/ispp/ispp.h b/drivers/media/platform/rockchip/ispp/ispp.h -new file mode 100755 +new file mode 100644 index 000000000000..baa07a09352c --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/ispp.h @@ -931293,7 +931316,7 @@ index 000000000000..baa07a09352c +void rkispp_unregister_subdev(struct rkispp_device *dev); +#endif diff --git a/drivers/media/platform/rockchip/ispp/params.c b/drivers/media/platform/rockchip/ispp/params.c -new file mode 100755 +new file mode 100644 index 000000000000..9d82b959b3c9 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/params.c @@ -931726,7 +931749,7 @@ index 000000000000..9d82b959b3c9 + vfree(params_vdev->cur_params); +} diff --git a/drivers/media/platform/rockchip/ispp/params.h b/drivers/media/platform/rockchip/ispp/params.h -new file mode 100755 +new file mode 100644 index 000000000000..a5083891ac1f --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/params.h @@ -931801,7 +931824,7 @@ index 000000000000..a5083891ac1f + +#endif diff --git a/drivers/media/platform/rockchip/ispp/params_v10.c b/drivers/media/platform/rockchip/ispp/params_v10.c -new file mode 100755 +new file mode 100644 index 000000000000..9430d0b84797 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/params_v10.c @@ -932546,7 +932569,7 @@ index 000000000000..9430d0b84797 + params_vdev->params_ops = &rkispp_params_ops; +} diff --git a/drivers/media/platform/rockchip/ispp/params_v20.c b/drivers/media/platform/rockchip/ispp/params_v20.c -new file mode 100755 +new file mode 100644 index 000000000000..03c944c8af0d --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/params_v20.c @@ -932761,7 +932784,7 @@ index 000000000000..03c944c8af0d + params_vdev->params_ops = &rkispp_params_ops; +} diff --git a/drivers/media/platform/rockchip/ispp/procfs.c b/drivers/media/platform/rockchip/ispp/procfs.c -new file mode 100755 +new file mode 100644 index 000000000000..9cee3fc71ce1 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/procfs.c @@ -932910,7 +932933,7 @@ index 000000000000..9cee3fc71ce1 +} +#endif /* CONFIG_PROC_FS */ diff --git a/drivers/media/platform/rockchip/ispp/procfs.h b/drivers/media/platform/rockchip/ispp/procfs.h -new file mode 100755 +new file mode 100644 index 000000000000..21ea0c471b58 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/procfs.h @@ -932937,7 +932960,7 @@ index 000000000000..21ea0c471b58 + +#endif diff --git a/drivers/media/platform/rockchip/ispp/regs.h b/drivers/media/platform/rockchip/ispp/regs.h -new file mode 100755 +new file mode 100644 index 000000000000..bc9f66766e0c --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/regs.h @@ -933466,7 +933489,7 @@ index 000000000000..bc9f66766e0c + +#endif /* _RKISPP_REGS_H */ diff --git a/drivers/media/platform/rockchip/ispp/stats.c b/drivers/media/platform/rockchip/ispp/stats.c -new file mode 100755 +new file mode 100644 index 000000000000..df011710b1aa --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stats.c @@ -933860,7 +933883,7 @@ index 000000000000..df011710b1aa +} + diff --git a/drivers/media/platform/rockchip/ispp/stats.h b/drivers/media/platform/rockchip/ispp/stats.h -new file mode 100755 +new file mode 100644 index 000000000000..e4d43bf25bde --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stats.h @@ -933919,7 +933942,7 @@ index 000000000000..e4d43bf25bde + +#endif /* _RKISPP_STATS_H */ diff --git a/drivers/media/platform/rockchip/ispp/stream.c b/drivers/media/platform/rockchip/ispp/stream.c -new file mode 100755 +new file mode 100644 index 000000000000..a2f4a96bdec2 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stream.c @@ -935941,7 +935964,7 @@ index 000000000000..a2f4a96bdec2 + } +} diff --git a/drivers/media/platform/rockchip/ispp/stream.h b/drivers/media/platform/rockchip/ispp/stream.h -new file mode 100755 +new file mode 100644 index 000000000000..8ffde026109d --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stream.h @@ -936227,7 +936250,7 @@ index 000000000000..8ffde026109d +void rkispp_start_3a_run(struct rkispp_device *dev); +#endif diff --git a/drivers/media/platform/rockchip/ispp/stream_v10.c b/drivers/media/platform/rockchip/ispp/stream_v10.c -new file mode 100755 +new file mode 100644 index 000000000000..9a6ed6d89fda --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stream_v10.c @@ -937966,7 +937989,7 @@ index 000000000000..9a6ed6d89fda + stream_vdev->stream_ops = &rkispp_stream_ops; +} diff --git a/drivers/media/platform/rockchip/ispp/stream_v20.c b/drivers/media/platform/rockchip/ispp/stream_v20.c -new file mode 100755 +new file mode 100644 index 000000000000..728a9c0afdf8 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stream_v20.c @@ -938435,7 +938458,7 @@ index 000000000000..728a9c0afdf8 + stream_vdev->stream_ops = &rkispp_stream_ops; +} diff --git a/drivers/media/platform/rockchip/ispp/version.h b/drivers/media/platform/rockchip/ispp/version.h -new file mode 100755 +new file mode 100644 index 000000000000..b7f01737aa92 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/version.h @@ -938579,7 +938602,7 @@ index 000000000000..b7f01737aa92 + +#endif diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c -index 6334f99f1854..e4603e2833d7 100644 +index c03e7f3e7b5c..b3a568fdbb9d 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -12,6 +12,7 @@ @@ -938590,7 +938613,7 @@ index 6334f99f1854..e4603e2833d7 100644 #include #include #include -@@ -2331,7 +2332,11 @@ static int uvc_probe(struct usb_interface *intf, +@@ -2346,7 +2347,11 @@ static int uvc_probe(struct usb_interface *intf, } uvc_trace(UVC_TRACE_PROBE, "UVC device initialized.\n"); @@ -939905,10 +939928,10 @@ index d109b9f14407..fd755d98af84 100644 MODULE_LICENSE("GPL"); MODULE_AUTHOR("Chris Zhong "); diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c -index 599b7317b59a..f3f8000f0bb0 100644 +index 2c9f157ac16d..7423e3276f25 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c -@@ -2902,6 +2902,9 @@ static void mmc_blk_remove_debugfs(struct mmc_card *card, +@@ -2947,6 +2947,9 @@ static void mmc_blk_remove_debugfs(struct mmc_card *card, #endif /* CONFIG_DEBUG_FS */ @@ -939942,10 +939965,10 @@ index a6c814fdbf0a..16746d211718 100644 extern bool use_spi_crc; diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c -index 03e2f965a96a..8d5e68527880 100644 +index b949a4468bf5..9ca75caa1b28 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c -@@ -523,6 +523,9 @@ static int mmc_validate_host_caps(struct mmc_host *host) +@@ -549,6 +549,9 @@ static int mmc_validate_host_caps(struct mmc_host *host) return 0; } @@ -939955,7 +939978,7 @@ index 03e2f965a96a..8d5e68527880 100644 /** * mmc_add_host - initialise host hardware * @host: mmc host -@@ -591,3 +594,45 @@ void mmc_free_host(struct mmc_host *host) +@@ -618,3 +621,45 @@ void mmc_free_host(struct mmc_host *host) } EXPORT_SYMBOL(mmc_free_host); @@ -940002,7 +940025,7 @@ index 03e2f965a96a..8d5e68527880 100644 +} +EXPORT_SYMBOL(mmc_host_rescan); diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c -index 99a4ce68d82f..11b4cc339309 100644 +index 85c2947ed45e..ccaccc0098a8 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -3,9 +3,15 @@ @@ -940915,7 +940938,7 @@ index da5923a92e60..0b53484e9306 100644 /* DMA ops for Internal/External DMAC interface */ diff --git a/drivers/mmc/host/rk_sdmmc.h b/drivers/mmc/host/rk_sdmmc.h -new file mode 100755 +new file mode 100644 index 000000000000..cad989246002 --- /dev/null +++ b/drivers/mmc/host/rk_sdmmc.h @@ -941308,7 +941331,7 @@ index 000000000000..cad989246002 + +#endif /* _DW_MMC_H_ */ diff --git a/drivers/mmc/host/rk_sdmmc_ops.c b/drivers/mmc/host/rk_sdmmc_ops.c -new file mode 100755 +new file mode 100644 index 000000000000..96f20d2dcfc7 --- /dev/null +++ b/drivers/mmc/host/rk_sdmmc_ops.c @@ -941508,7 +941531,7 @@ index 000000000000..96f20d2dcfc7 + +MODULE_LICENSE("GPL"); diff --git a/drivers/mmc/host/rk_sdmmc_ops.h b/drivers/mmc/host/rk_sdmmc_ops.h -new file mode 100755 +new file mode 100644 index 000000000000..8261d69f561d --- /dev/null +++ b/drivers/mmc/host/rk_sdmmc_ops.h @@ -943459,7 +943482,7 @@ index 24e6145d4eae..be661832cef8 100644 obj-$(CONFIG_DWMAC_STI) += dwmac-sti.o obj-$(CONFIG_DWMAC_STM32) += dwmac-stm32.o diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.c -new file mode 100755 +new file mode 100644 index 000000000000..541788f9e2c8 --- /dev/null +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.c @@ -945078,7 +945101,7 @@ index 000000000000..541788f9e2c8 + return 0; +} diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.h b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.h -new file mode 100755 +new file mode 100644 index 000000000000..d71989b0fc74 --- /dev/null +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.h @@ -946363,7 +946386,7 @@ index 8f01fcbe9396..9736aa0ab7fd 100644 break; case MWIFIEX_USB_EP_DATA: diff --git a/drivers/net/wireless/rockchip_wlan/Kconfig b/drivers/net/wireless/rockchip_wlan/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..d77741df5cc0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/Kconfig @@ -946408,7 +946431,7 @@ index 000000000000..d77741df5cc0 + +endif # WL_ROCKCHIP diff --git a/drivers/net/wireless/rockchip_wlan/Makefile b/drivers/net/wireless/rockchip_wlan/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..8279a393719f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/Makefile @@ -946417,7 +946440,7 @@ index 000000000000..8279a393719f +obj-$(CONFIG_BCMDHD) += rkwifi/ +obj-$(CONFIG_WL_ROCKCHIP) += rkwifi/rk_wifi_config.o diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/Kconfig b/drivers/net/wireless/rockchip_wlan/rkwifi/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..2ec5138b79a7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/Kconfig @@ -946456,7 +946479,7 @@ index 000000000000..2ec5138b79a7 + help + default to add wlan1 interface diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/Makefile b/drivers/net/wireless/rockchip_wlan/rkwifi/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..e4e2c6964a6b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/Makefile @@ -946472,7 +946495,7 @@ index 000000000000..e4e2c6964a6b +clean: + find . -name '*.o*' -exec rm -f {} \; diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/Kconfig b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..3e6e78888be2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/Kconfig @@ -946537,7 +946560,7 @@ index 000000000000..3e6e78888be2 + Interrupt from SDIO DAT[1] +endchoice diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/Makefile b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..b8b4c353ee61 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/Makefile @@ -946801,7 +946824,7 @@ index 000000000000..b8b4c353ee61 +EXTRA_CFLAGS += -Wno-unused-const-variable +EXTRA_CFLAGS += -Wno-non-literal-null-conversion diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/aiutils.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/aiutils.c -new file mode 100755 +new file mode 100644 index 000000000000..cc0b854d34d5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/aiutils.c @@ -948906,7 +948929,7 @@ index 000000000000..cc0b854d34d5 + SPINWAIT((R_REG(sii->osh, &ai->resetstatus) != 0), 300); +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcm_app_utils.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcm_app_utils.c -new file mode 100755 +new file mode 100644 index 000000000000..76490b575fae --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcm_app_utils.c @@ -949945,7 +949968,7 @@ index 000000000000..76490b575fae + return res; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmbloom.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmbloom.c -new file mode 100755 +new file mode 100644 index 000000000000..80eb786f035a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmbloom.c @@ -950194,7 +950217,7 @@ index 000000000000..80eb786f035a + return BCME_OK; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmevent.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmevent.c -new file mode 100755 +new file mode 100644 index 000000000000..40bdb4bfda4f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmevent.c @@ -950596,7 +950619,7 @@ index 000000000000..40bdb4bfda4f + return err; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh.c -new file mode 100755 +new file mode 100644 index 000000000000..b59edd7540ca --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh.c @@ -951495,7 +951518,7 @@ index 000000000000..b59edd7540ca +} +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_linux.c -new file mode 100755 +new file mode 100644 index 000000000000..84cc71992635 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_linux.c @@ -952025,7 +952048,7 @@ index 000000000000..84cc71992635 + +#endif /* BCMSDH_MODULE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc.c -new file mode 100755 +new file mode 100644 index 000000000000..01f7fa23b2b3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc.c @@ -953832,7 +953855,7 @@ index 000000000000..01f7fa23b2b3 + sdmmc_set_clock_rate(sd, hz); +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc_linux.c -new file mode 100755 +new file mode 100644 index 000000000000..a2d34724f6c4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc_linux.c @@ -954219,7 +954242,7 @@ index 000000000000..a2d34724f6c4 + sdio_unregister_driver(&bcmsdh_sdmmc_driver); +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdspi_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdspi_linux.c -new file mode 100755 +new file mode 100644 index 000000000000..86d4cb9e3575 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdspi_linux.c @@ -954663,7 +954686,7 @@ index 000000000000..86d4cb9e3575 +} +#endif /* !BCMSPI_ANDROID */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmspibrcm.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmspibrcm.c -new file mode 100755 +new file mode 100644 index 000000000000..c0431638b995 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmspibrcm.c @@ -956469,7 +956492,7 @@ index 000000000000..c0431638b995 + return SDIOH_API_RC_FAIL; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmstdlib_s.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmstdlib_s.c -new file mode 100755 +new file mode 100644 index 000000000000..269db4c3c0c1 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmstdlib_s.c @@ -956789,7 +956812,7 @@ index 000000000000..269db4c3c0c1 + return (dlen + bytes_to_copy); +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmutils.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmutils.c -new file mode 100755 +new file mode 100644 index 000000000000..c9b01bd66820 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmutils.c @@ -961174,7 +961197,7 @@ index 000000000000..c9b01bd66820 + } +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.c -new file mode 100755 +new file mode 100644 index 000000000000..fc916db9cb61 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.c @@ -962674,7 +962697,7 @@ index 000000000000..fc916db9cb61 + return channel_width; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.h -new file mode 100755 +new file mode 100644 index 000000000000..ad3a6a4ae693 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.h @@ -963496,7 +963519,7 @@ index 000000000000..ad3a6a4ae693 +extern uint8 channel_bw_to_width(chanspec_t chspec); +#endif /* _bcmwifi_channels_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rates.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rates.h -new file mode 100755 +new file mode 100644 index 000000000000..196ff0fe0eff --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rates.h @@ -964334,7 +964357,7 @@ index 000000000000..196ff0fe0eff + +#endif /* _bcmwifi_rates_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rspec.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rspec.h -new file mode 100755 +new file mode 100644 index 000000000000..5c3d4a674814 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rspec.h @@ -964553,7 +964576,7 @@ index 000000000000..5c3d4a674814 + +#endif /* _bcmwifi_rspec_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmxtlv.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmxtlv.c -new file mode 100755 +new file mode 100644 index 000000000000..51d0f5aaf623 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmxtlv.c @@ -965182,7 +965205,7 @@ index 000000000000..51d0f5aaf623 + return dst_next; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus.c -new file mode 100755 +new file mode 100644 index 000000000000..3de52fac5172 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus.c @@ -968091,7 +968114,7 @@ index 000000000000..3de52fac5172 + +#endif /* #ifdef LINUX_EXTERNAL_MODULE_DBUS */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb.c -new file mode 100755 +new file mode 100644 index 000000000000..3be28b2da9d4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb.c @@ -969270,7 +969293,7 @@ index 000000000000..3be28b2da9d4 + } +} /* dbus_bus_fw_get */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb_linux.c -new file mode 100755 +new file mode 100644 index 000000000000..2d999b12bc94 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb_linux.c @@ -972680,7 +972703,7 @@ index 000000000000..2d999b12bc94 +} +#endif /* BCMUSBDEV_COMPOSITE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd.h -new file mode 100755 +new file mode 100644 index 000000000000..427e96ea33bb --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd.h @@ -976119,7 +976142,7 @@ index 000000000000..427e96ea33bb +#endif /* WL_MONITOR */ +#endif /* _dhd_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_bus.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_bus.h -new file mode 100755 +new file mode 100644 index 000000000000..c5b07cf493d9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_bus.h @@ -976482,7 +976505,7 @@ index 000000000000..c5b07cf493d9 +extern void dhd_bwm_bt_resume(struct dhd_bus *bus); +#endif /* _dhd_bus_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_buzzz.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_buzzz.h -new file mode 100755 +new file mode 100644 index 000000000000..342cc004d25a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_buzzz.h @@ -976526,7 +976549,7 @@ index 000000000000..342cc004d25a + +#endif /* _DHD_BUZZZ_H_INCLUDED_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ccode.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ccode.c -new file mode 100755 +new file mode 100644 index 000000000000..fe9a826325e6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ccode.c @@ -976806,7 +976829,7 @@ index 000000000000..fe9a826325e6 +} +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cdc.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cdc.c -new file mode 100755 +new file mode 100644 index 000000000000..44cd1cbf24e6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cdc.c @@ -977793,7 +977816,7 @@ index 000000000000..44cd1cbf24e6 + return 0; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.c -new file mode 100755 +new file mode 100644 index 000000000000..51a13e092a3e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.c @@ -978131,7 +978154,7 @@ index 000000000000..51a13e092a3e + return ret; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.h -new file mode 100755 +new file mode 100644 index 000000000000..88c2e0a16bcc --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.h @@ -978192,7 +978215,7 @@ index 000000000000..88c2e0a16bcc +s32 wl_dongle_roam(struct net_device *ndev, u32 roamvar, u32 bcn_timeout); +#endif /* __DHD_CFG80211__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_common.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_common.c -new file mode 100755 +new file mode 100644 index 000000000000..df11fa183e60 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_common.c @@ -985694,7 +985717,7 @@ index 000000000000..df11fa183e60 +} +#endif /* DISABLE_HE_ENAB || CUSTOM_CONTROL_HE_ENAB */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.c -new file mode 100755 +new file mode 100644 index 000000000000..c4713ded8a23 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.c @@ -990430,7 +990453,7 @@ index 000000000000..c4713ded8a23 + dhd->conf = NULL; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.h -new file mode 100755 +new file mode 100644 index 000000000000..6af9c7b18013 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.h @@ -990820,7 +990843,7 @@ index 000000000000..6af9c7b18013 +#endif +#endif /* _dhd_config_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.c -new file mode 100755 +new file mode 100644 index 000000000000..dd1a0681bf4f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.c @@ -991046,7 +991069,7 @@ index 000000000000..dd1a0681bf4f +} + diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.h -new file mode 100755 +new file mode 100644 index 000000000000..bcc712c2999b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.h @@ -991129,7 +991152,7 @@ index 000000000000..bcc712c2999b +#endif /* __DHD_CSI_H__ */ + diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_gpio.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_gpio.c -new file mode 100755 +new file mode 100644 index 000000000000..8553e74562dc --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_gpio.c @@ -991414,7 +991437,7 @@ index 000000000000..8553e74562dc + */ +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_hikey.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_hikey.c -new file mode 100755 +new file mode 100644 index 000000000000..8acb153a45e3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_hikey.c @@ -991714,7 +991737,7 @@ index 000000000000..8acb153a45e3 +device_initcall(dhd_wlan_init); +#endif /* BOARD_HIKEY_MODULAR */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_memprealloc.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_memprealloc.c -new file mode 100755 +new file mode 100644 index 000000000000..1c0f3ca65e7a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_memprealloc.c @@ -992282,7 +992305,7 @@ index 000000000000..1c0f3ca65e7a +EXPORT_SYMBOL(dhd_exit_wlan_mem); +#endif /* CONFIG_BROADCOM_WIFI_RESERVED_MEM */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg.h -new file mode 100755 +new file mode 100644 index 000000000000..4bc2511c6da2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg.h @@ -992655,7 +992678,7 @@ index 000000000000..4bc2511c6da2 + +#endif /* _dhd_dbg_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.c -new file mode 100755 +new file mode 100644 index 000000000000..c909431c0b46 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.c @@ -993087,7 +993110,7 @@ index 000000000000..c909431c0b46 + memset(ring->ring_buf, 0, ring->ring_size); +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.h -new file mode 100755 +new file mode 100644 index 000000000000..c6deb98f2ace --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.h @@ -993234,7 +993257,7 @@ index 000000000000..c6deb98f2ace +void dhd_dbg_ring_start(dhd_dbg_ring_t *ring); +#endif /* __DHD_DBG_RING_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.c -new file mode 100755 +new file mode 100644 index 000000000000..a6066289c543 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.c @@ -995651,7 +995674,7 @@ index 000000000000..a6066289c543 + MFREE(dhdp->osh, dhdp->dbg, sizeof(dhd_dbg_t)); +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.h -new file mode 100755 +new file mode 100644 index 000000000000..008c45316f1c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.h @@ -996510,7 +996533,7 @@ index 000000000000..008c45316f1c +#endif /* DHD_DEBUG */ +#endif /* _dhd_debug_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug_linux.c -new file mode 100755 +new file mode 100644 index 000000000000..2f33db421877 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug_linux.c @@ -997032,7 +997055,7 @@ index 000000000000..2f33db421877 + return dhd_dbg_detach(dhdp); +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.c -new file mode 100755 +new file mode 100644 index 000000000000..d457437d39ed --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.c @@ -998276,7 +998299,7 @@ index 000000000000..d457437d39ed + return BCME_OK; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.h -new file mode 100755 +new file mode 100644 index 000000000000..ac2639d19396 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.h @@ -998571,7 +998594,7 @@ index 000000000000..ac2639d19396 +extern uint8 dhd_flow_rings_ifindex2role(dhd_pub_t *dhdp, uint8 ifindex); +#endif /* _dhd_flowrings_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_gpio.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_gpio.c -new file mode 100755 +new file mode 100644 index 000000000000..cdb70099fb19 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_gpio.c @@ -998927,7 +998950,7 @@ index 000000000000..cdb70099fb19 +} + diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.c -new file mode 100755 +new file mode 100644 index 000000000000..3772fdfca4e5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.c @@ -1000362,7 +1000385,7 @@ index 000000000000..3772fdfca4e5 +} +#endif /* DHDTCPSYNC_FLOOD_BLK */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.h -new file mode 100755 +new file mode 100644 index 000000000000..45be081e3473 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.h @@ -1000465,8 +1000488,8 @@ index 000000000000..45be081e3473 + +#endif /* _dhd_ip_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.c -new file mode 100755 -index 000000000000..b6d43d44d222 +new file mode 100644 +index 000000000000..ae5ed32b7bdc --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.c @@ -0,0 +1,22464 @@ @@ -1022935,7 +1022958,7 @@ index 000000000000..b6d43d44d222 +} +#endif /* defiend(WLDWDS) && defined(FOURADDR_AUTO_BRG) */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.h -new file mode 100755 +new file mode 100644 index 000000000000..f2b295f54f5b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.h @@ -1023389,7 +1023412,7 @@ index 000000000000..f2b295f54f5b + +#endif /* __DHD_LINUX_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_exportfs.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_exportfs.c -new file mode 100755 +new file mode 100644 index 000000000000..6518b357aa30 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_exportfs.c @@ -1024815,7 +1024838,7 @@ index 000000000000..6518b357aa30 + kobject_put(&dhd->dhd_conf_file_kobj); +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_lb.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_lb.c -new file mode 100755 +new file mode 100644 index 000000000000..30dfaa2b7e41 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_lb.c @@ -1026145,7 +1026168,7 @@ index 000000000000..30dfaa2b7e41 + +#endif /* DHD_LB_TXP */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.c -new file mode 100755 +new file mode 100644 index 000000000000..3efe02c9ed49 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.c @@ -1027623,7 +1027646,7 @@ index 000000000000..3efe02c9ed49 +} +#endif /* DHD_RX_DUMP */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.h -new file mode 100755 +new file mode 100644 index 000000000000..12bb32fd5dae --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.h @@ -1027754,7 +1027777,7 @@ index 000000000000..12bb32fd5dae + +#endif /* __DHD_LINUX_PKTDUMP_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_platdev.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_platdev.c -new file mode 100755 +new file mode 100644 index 000000000000..93961824abae --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_platdev.c @@ -1028801,7 +1028824,7 @@ index 000000000000..93961824abae + return err; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_priv.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_priv.h -new file mode 100755 +new file mode 100644 index 000000000000..9959c2c50141 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_priv.h @@ -1029239,7 +1029262,7 @@ index 000000000000..9959c2c50141 + +#endif /* __DHD_LINUX_PRIV_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_sched.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_sched.c -new file mode 100755 +new file mode 100644 index 000000000000..7980b02c65ab --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_sched.c @@ -1029297,7 +1029320,7 @@ index 000000000000..7980b02c65ab + return rc; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.c -new file mode 100755 +new file mode 100644 index 000000000000..26c66add8aa3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.c @@ -1029700,7 +1029723,7 @@ index 000000000000..26c66add8aa3 + } +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.h -new file mode 100755 +new file mode 100644 index 000000000000..f6c77c4b30b0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.h @@ -1029799,7 +1029822,7 @@ index 000000000000..f6c77c4b30b0 +void dhd_deferred_work_set_skip(void *work, u8 event, bool set); +#endif /* _dhd_linux_wq_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.c -new file mode 100755 +new file mode 100644 index 000000000000..713422a713cc --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.c @@ -1030594,7 +1030617,7 @@ index 000000000000..713422a713cc +} +#endif /* SHOW_LOGTRACE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.h -new file mode 100755 +new file mode 100644 index 000000000000..4645ccb890ab --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.h @@ -1030640,7 +1030663,7 @@ index 000000000000..4645ccb890ab + +#endif /* _dhd_mschdbg_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_msgbuf.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_msgbuf.c -new file mode 100755 +new file mode 100644 index 000000000000..ab8c9b399308 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_msgbuf.c @@ -1041808,7 +1041831,7 @@ index 000000000000..ab8c9b399308 +} +#endif /* DHD_MAP_LOGGING */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.c -new file mode 100755 +new file mode 100644 index 000000000000..45dd0e66ea04 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.c @@ -1053432,7 +1053455,7 @@ index 000000000000..45dd0e66ea04 + return TRUE; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.h -new file mode 100755 +new file mode 100644 index 000000000000..9fe53dcf0b02 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.h @@ -1054034,7 +1054057,7 @@ index 000000000000..9fe53dcf0b02 + +#endif /* dhd_pcie_h */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie_linux.c -new file mode 100755 +new file mode 100644 index 000000000000..3fb799247421 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie_linux.c @@ -1056778,7 +1056801,7 @@ index 000000000000..3fb799247421 +} +EXPORT_SYMBOL(dhd_bus_check_driver_up); diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.c -new file mode 100755 +new file mode 100644 index 000000000000..005c03e3d181 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.c @@ -1061242,7 +1061265,7 @@ index 000000000000..005c03e3d181 +} +#endif /* PNO_SUPPORT */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.h -new file mode 100755 +new file mode 100644 index 000000000000..903a732554c0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.h @@ -1061838,7 +1061861,7 @@ index 000000000000..903a732554c0 + +#endif /* __DHD_PNO_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_proto.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_proto.h -new file mode 100755 +new file mode 100644 index 000000000000..b83c1bdc0b83 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_proto.h @@ -1062087,7 +1062110,7 @@ index 000000000000..b83c1bdc0b83 +#endif /* DHD_MAP_LOGGING */ +#endif /* _dhd_proto_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_rtt.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_rtt.c -new file mode 100755 +new file mode 100644 index 000000000000..49e367890f47 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_rtt.c @@ -1066196,7 +1066219,7 @@ index 000000000000..49e367890f47 + return err; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_rtt.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_rtt.h -new file mode 100755 +new file mode 100644 index 000000000000..d0c6af209db6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_rtt.h @@ -1066739,7 +1066762,7 @@ index 000000000000..d0c6af209db6 + +#endif /* __DHD_RTT_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_sdio.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_sdio.c -new file mode 100755 +new file mode 100644 index 000000000000..3638be21d754 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_sdio.c @@ -1077235,7 +1077258,7 @@ index 000000000000..3638be21d754 +} \ No newline at end of file diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_static_buf.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_static_buf.c -new file mode 100755 +new file mode 100644 index 000000000000..2df6b62cd6b2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_static_buf.c @@ -1077827,7 +1077850,7 @@ index 000000000000..2df6b62cd6b2 + +module_exit(dhd_static_buf_exit); diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.c -new file mode 100755 +new file mode 100644 index 000000000000..bafcb0b5c7e4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.c @@ -1082449,7 +1082472,7 @@ index 000000000000..bafcb0b5c7e4 + +#endif /* PROP_TXSTATUS */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.h -new file mode 100755 +new file mode 100644 index 000000000000..b8ee0f14efe2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.h @@ -1083251,7 +1083274,7 @@ index 000000000000..b8ee0f14efe2 + +#endif /* __wlfc_host_driver_definitions_h__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_stats.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_stats.h -new file mode 100755 +new file mode 100644 index 000000000000..5bd8e4613da0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_stats.h @@ -1083644,7 +1083667,7 @@ index 000000000000..5bd8e4613da0 + +#endif /* _dngl_stats_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_wlhdr.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_wlhdr.h -new file mode 100755 +new file mode 100644 index 000000000000..d71ebb65d63d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_wlhdr.h @@ -1083694,7 +1083717,7 @@ index 000000000000..d71ebb65d63d +#define WL_HEADER_VER 1 +#endif /* _dngl_wlhdr_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.c -new file mode 100755 +new file mode 100644 index 000000000000..fa9ff43e5c2c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.c @@ -1083813,7 +1083836,7 @@ index 000000000000..fa9ff43e5c2c + return bcm_tlv_dot11_defrag(buf, buf_len, id, id_ext, NULL, ie_len); +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.h -new file mode 100755 +new file mode 100644 index 000000000000..57c149dfdff3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.h @@ -1083858,7 +1083881,7 @@ index 000000000000..57c149dfdff3 + +#endif /* __FRAG_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hdf_public_ap6275s.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hdf_public_ap6275s.h -new file mode 100755 +new file mode 100644 index 000000000000..5daf2bfb6c49 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hdf_public_ap6275s.h @@ -1083989,7 +1084012,7 @@ index 000000000000..5daf2bfb6c49 +extern int32_t HdfConnect(NetDevice *hnetDev, WlanConnectParams *param); +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktpool.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktpool.c -new file mode 100755 +new file mode 100644 index 000000000000..09c2520b8fec --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktpool.c @@ -1085423,7 +1085446,7 @@ index 000000000000..09c2520b8fec +} +#endif /* BCMPKTPOOL */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktq.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktq.c -new file mode 100755 +new file mode 100644 index 000000000000..f4768ff69096 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktq.c @@ -1086858,7 +1086881,7 @@ index 000000000000..f4768ff69096 + +#endif /* HND_PKTQ_THREAD_SAFE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndlhl.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndlhl.c -new file mode 100755 +new file mode 100644 index 000000000000..fd229c2f585b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndlhl.c @@ -1087402,7 +1087425,7 @@ index 000000000000..fd229c2f585b + } +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndmem.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndmem.c -new file mode 100755 +new file mode 100644 index 000000000000..fde6108c50e2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndmem.c @@ -1087838,7 +1087861,7 @@ index 000000000000..fde6108c50e2 + return err; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndpmu.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndpmu.c -new file mode 100755 +new file mode 100644 index 000000000000..cb8294f25274 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndpmu.c @@ -1088633,7 +1088656,7 @@ index 000000000000..cb8294f25274 +} +#endif /* BCMPMU_STATS */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11.h -new file mode 100755 +new file mode 100644 index 000000000000..cd46e747cc8b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11.h @@ -1094003,7 +1094026,7 @@ index 000000000000..cd46e747cc8b + +#endif /* _802_11_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11e.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11e.h -new file mode 100755 +new file mode 100644 index 000000000000..7b1414961ee1 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11e.h @@ -1094149,7 +1094172,7 @@ index 000000000000..7b1414961ee1 + +#endif /* _802_11e_CAC_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11s.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11s.h -new file mode 100755 +new file mode 100644 index 000000000000..91ca2f3b1ce4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11s.h @@ -1094490,7 +1094513,7 @@ index 000000000000..91ca2f3b1ce4 + +#endif /* #ifndef _802_11s_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.1d.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.1d.h -new file mode 100755 +new file mode 100644 index 000000000000..06364be73fa8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.1d.h @@ -1094550,7 +1094573,7 @@ index 000000000000..06364be73fa8 + +#endif /* _802_1_D__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.3.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.3.h -new file mode 100755 +new file mode 100644 index 000000000000..496ca3a3795e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.3.h @@ -1094612,7 +1094635,7 @@ index 000000000000..496ca3a3795e + +#endif /* #ifndef _802_3_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/aidmp.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/aidmp.h -new file mode 100755 +new file mode 100644 index 000000000000..8c826062d436 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/aidmp.h @@ -1095048,7 +1095071,7 @@ index 000000000000..8c826062d436 + +#endif /* _AIDMP_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_cfg.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_cfg.h -new file mode 100755 +new file mode 100644 index 000000000000..63c72e481fe8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_cfg.h @@ -1095087,7 +1095110,7 @@ index 000000000000..63c72e481fe8 +#define _bcm_cfg_h_ +#endif /* _bcm_cfg_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_mpool_pub.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_mpool_pub.h -new file mode 100755 +new file mode 100644 index 000000000000..347d53a862d2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_mpool_pub.h @@ -1095444,7 +1095467,7 @@ index 000000000000..347d53a862d2 + +#endif /* _BCM_MPOOL_PUB_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_ring.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_ring.h -new file mode 100755 +new file mode 100644 index 000000000000..978e5dd2f554 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_ring.h @@ -1096064,7 +1096087,7 @@ index 000000000000..978e5dd2f554 + +#endif /* ! __bcm_ring_h_included__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmarp.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmarp.h -new file mode 100755 +new file mode 100644 index 000000000000..f0fc3e32fda9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmarp.h @@ -1096161,7 +1096184,7 @@ index 000000000000..f0fc3e32fda9 + +#endif /* !defined(_bcmarp_h_) */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmbloom.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmbloom.h -new file mode 100755 +new file mode 100644 index 000000000000..cb572307e126 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmbloom.h @@ -1096247,7 +1096270,7 @@ index 000000000000..cb572307e126 + +#endif /* _bcmbloom_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmcdc.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmcdc.h -new file mode 100755 +new file mode 100644 index 000000000000..e88366426909 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmcdc.h @@ -1096375,7 +1096398,7 @@ index 000000000000..e88366426909 + +#endif /* _bcmcdc_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdefs.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdefs.h -new file mode 100755 +new file mode 100644 index 000000000000..393ec7d10e12 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdefs.h @@ -1096997,7 +1097020,7 @@ index 000000000000..393ec7d10e12 + +#endif /* _bcmdefs_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdevs.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdevs.h -new file mode 100755 +new file mode 100644 index 000000000000..afc6b54d9e0b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdevs.h @@ -1097948,7 +1097971,7 @@ index 000000000000..afc6b54d9e0b + +#endif /* _BCMDEVS_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdhcp.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdhcp.h -new file mode 100755 +new file mode 100644 index 000000000000..da46d1a717b5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdhcp.h @@ -1098047,7 +1098070,7 @@ index 000000000000..da46d1a717b5 + +#endif /* #ifndef _bcmdhcp_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmendian.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmendian.h -new file mode 100755 +new file mode 100644 index 000000000000..7eecf9f16115 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmendian.h @@ -1098470,7 +1098493,7 @@ index 000000000000..7eecf9f16115 +#endif /* !__GNUC__ */ +#endif /* !_BCMENDIAN_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmeth.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmeth.h -new file mode 100755 +new file mode 100644 index 000000000000..4ac3c376ca98 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmeth.h @@ -1098592,7 +1098615,7 @@ index 000000000000..4ac3c376ca98 + +#endif /* _BCMETH_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmevent.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmevent.h -new file mode 100755 +new file mode 100644 index 000000000000..fc47263e81e2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmevent.h @@ -1099895,7 +1099918,7 @@ index 000000000000..fc47263e81e2 + +#endif /* _BCMEVENT_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmicmp.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmicmp.h -new file mode 100755 +new file mode 100644 index 000000000000..472ec722339b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmicmp.h @@ -1099991,7 +1100014,7 @@ index 000000000000..472ec722339b + +#endif /* #ifndef _bcmicmp_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmiov.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmiov.h -new file mode 100755 +new file mode 100644 index 000000000000..42633f8c7d32 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmiov.h @@ -1100354,7 +1100377,7 @@ index 000000000000..42633f8c7d32 + +#endif /* _bcmiov_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmip.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmip.h -new file mode 100755 +new file mode 100644 index 000000000000..cec5b903c6f4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmip.h @@ -1100611,7 +1100634,7 @@ index 000000000000..cec5b903c6f4 + +#endif /* _bcmip_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmipv6.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmipv6.h -new file mode 100755 +new file mode 100644 index 000000000000..88cac9009183 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmipv6.h @@ -1100779,7 +1100802,7 @@ index 000000000000..88cac9009183 + +#endif /* !defined(_bcmipv6_h_) */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmmsgbuf.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmmsgbuf.h -new file mode 100755 +new file mode 100644 index 000000000000..4215d3298c21 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmmsgbuf.h @@ -1102180,7 +1102203,7 @@ index 000000000000..4215d3298c21 + +#endif /* _bcmmsgbuf_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmnvram.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmnvram.h -new file mode 100755 +new file mode 100644 index 000000000000..988ac4813a5f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmnvram.h @@ -1102515,7 +1102538,7 @@ index 000000000000..988ac4813a5f + +#endif /* _bcmnvram_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcie.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcie.h -new file mode 100755 +new file mode 100644 index 000000000000..8f80018ac9dd --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcie.h @@ -1103058,7 +1103081,7 @@ index 000000000000..8f80018ac9dd + +#endif /* _bcmpcie_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcispi.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcispi.h -new file mode 100755 +new file mode 100644 index 000000000000..6308a3aaf7f5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcispi.h @@ -1103246,7 +1103269,7 @@ index 000000000000..6308a3aaf7f5 + +#endif /* _BCM_PCI_SPI_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmperf.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmperf.h -new file mode 100755 +new file mode 100644 index 000000000000..8ac9001f55eb --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmperf.h @@ -1103292,7 +1103315,7 @@ index 000000000000..8ac9001f55eb +#define BCMPERF_GETINSTRCOUNT(x) ((x) = 0) +#endif /* _BCMPERF_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdbus.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdbus.h -new file mode 100755 +new file mode 100644 index 000000000000..b9759b9b186e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdbus.h @@ -1103482,7 +1103505,7 @@ index 000000000000..b9759b9b186e + +#endif /* _sdio_api_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh.h -new file mode 100755 +new file mode 100644 index 000000000000..b2300ec635c6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh.h @@ -1103767,7 +1103790,7 @@ index 000000000000..b2300ec635c6 + +#endif /* _bcmsdh_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh_sdmmc.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh_sdmmc.h -new file mode 100755 +new file mode 100644 index 000000000000..4e3c72d194ce --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh_sdmmc.h @@ -1103903,7 +1103926,7 @@ index 000000000000..4e3c72d194ce + +#endif /* __BCMSDH_SDMMC_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdpcm.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdpcm.h -new file mode 100755 +new file mode 100644 index 000000000000..09a81c24398f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdpcm.h @@ -1104219,7 +1104242,7 @@ index 000000000000..09a81c24398f + +#endif /* _bcmsdpcm_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdspi.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdspi.h -new file mode 100755 +new file mode 100644 index 000000000000..2d299a140cb3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdspi.h @@ -1104364,7 +1104387,7 @@ index 000000000000..2d299a140cb3 + +#endif /* _BCM_SD_SPI_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdstd.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdstd.h -new file mode 100755 +new file mode 100644 index 000000000000..5132d4340ecd --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdstd.h @@ -1104652,7 +1104675,7 @@ index 000000000000..5132d4340ecd +extern SDIOH_API_RC sdioh_detach(osl_t *osh, sdioh_info_t *sd); +#endif /* _BCM_SD_STD_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspi.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspi.h -new file mode 100755 +new file mode 100644 index 000000000000..6f71ddc9519e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspi.h @@ -1104702,7 +1104725,7 @@ index 000000000000..6f71ddc9519e + +#endif /* _BCM_SPI_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspibrcm.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspibrcm.h -new file mode 100755 +new file mode 100644 index 000000000000..2d9f972496c3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspibrcm.h @@ -1104876,7 +1104899,7 @@ index 000000000000..2d9f972496c3 + +#endif /* _BCM_SPI_BRCM_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_fmt.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_fmt.h -new file mode 100755 +new file mode 100644 index 000000000000..e1bd05548c1f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_fmt.h @@ -1105896,7 +1105919,7 @@ index 000000000000..e1bd05548c1f + +#endif /* _bcmsrom_fmt_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_tbl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_tbl.h -new file mode 100755 +new file mode 100644 index 000000000000..aa72338de34f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_tbl.h @@ -1107361,7 +1107384,7 @@ index 000000000000..aa72338de34f + +#endif /* _bcmsrom_tbl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmstdlib_s.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmstdlib_s.h -new file mode 100755 +new file mode 100644 index 000000000000..b80b3195fda5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmstdlib_s.h @@ -1107419,7 +1107442,7 @@ index 000000000000..b80b3195fda5 +#endif /* !BWL_NO_INTERNAL_STDLIB_SUPPORT */ +#endif /* _bcmstdlib_s_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtcp.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtcp.h -new file mode 100755 +new file mode 100644 index 000000000000..6803cad809c3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtcp.h @@ -1107518,7 +1107541,7 @@ index 000000000000..6803cad809c3 + +#endif /* #ifndef _bcmtcp_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtlv.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtlv.h -new file mode 100755 +new file mode 100644 index 000000000000..279840e41a35 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtlv.h @@ -1107867,7 +1107890,7 @@ index 000000000000..279840e41a35 + +#endif /* _bcmtlv_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmudp.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmudp.h -new file mode 100755 +new file mode 100644 index 000000000000..397bc5985e25 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmudp.h @@ -1107934,7 +1107957,7 @@ index 000000000000..397bc5985e25 + +#endif /* #ifndef _bcmudp_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmutils.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmutils.h -new file mode 100755 +new file mode 100644 index 000000000000..c779ea07ea2d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmutils.h @@ -1109282,7 +1109305,7 @@ index 000000000000..c779ea07ea2d + +#endif /* _bcmutils_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/brcm_nl80211.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/brcm_nl80211.h -new file mode 100755 +new file mode 100644 index 000000000000..0e0aa766a678 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/brcm_nl80211.h @@ -1109361,7 +1109384,7 @@ index 000000000000..0e0aa766a678 + +#endif /* _brcm_nl80211_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dbus.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dbus.h -new file mode 100755 +new file mode 100644 index 000000000000..e4b87288b3d6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dbus.h @@ -1109966,7 +1109989,7 @@ index 000000000000..e4b87288b3d6 +void dbus_flowctrl_tx(void *dbi, bool on); +#endif /* __DBUS_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhd_daemon.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhd_daemon.h -new file mode 100755 +new file mode 100644 index 000000000000..785b440116cc --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhd_daemon.h @@ -1110039,7 +1110062,7 @@ index 000000000000..785b440116cc + +#endif /* __BCM_DHDD_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhdioctl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhdioctl.h -new file mode 100755 +new file mode 100644 index 000000000000..f7012a0f5115 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhdioctl.h @@ -1110323,7 +1110346,7 @@ index 000000000000..f7012a0f5115 + +#endif /* _dhdioctl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dnglevent.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dnglevent.h -new file mode 100755 +new file mode 100644 index 000000000000..ec2cbbaf0b1f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dnglevent.h @@ -1110471,7 +1110494,7 @@ index 000000000000..ec2cbbaf0b1f + +#endif /* _DNGLEVENT_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/eapol.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/eapol.h -new file mode 100755 +new file mode 100644 index 000000000000..08a296828189 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/eapol.h @@ -1110760,7 +1110783,7 @@ index 000000000000..08a296828189 + +#endif /* _eapol_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/epivers.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/epivers.h -new file mode 100755 +new file mode 100644 index 000000000000..23f8d324361b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/epivers.h @@ -1110818,7 +1110841,7 @@ index 000000000000..23f8d324361b + +#endif /* _epivers_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/etd.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/etd.h -new file mode 100755 +new file mode 100644 index 000000000000..a2181daf525e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/etd.h @@ -1111450,7 +1111473,7 @@ index 000000000000..a2181daf525e + +#endif /* _ETD_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/ethernet.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/ethernet.h -new file mode 100755 +new file mode 100644 index 000000000000..41c9b62b0d5c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/ethernet.h @@ -1111681,7 +1111704,7 @@ index 000000000000..41c9b62b0d5c + +#endif /* _NET_ETHERNET_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log.h -new file mode 100755 +new file mode 100644 index 000000000000..e43715d72646 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log.h @@ -1112110,7 +1112133,7 @@ index 000000000000..e43715d72646 + +#endif /* _EVENT_LOG_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_payload.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_payload.h -new file mode 100755 +new file mode 100644 index 000000000000..fc110219ec75 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_payload.h @@ -1113133,7 +1113156,7 @@ index 000000000000..fc110219ec75 + +#endif /* _EVENT_LOG_PAYLOAD_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_set.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_set.h -new file mode 100755 +new file mode 100644 index 000000000000..47c991c20019 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_set.h @@ -1113263,7 +1113286,7 @@ index 000000000000..47c991c20019 + +#endif /* _EVENT_LOG_SET_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_tag.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_tag.h -new file mode 100755 +new file mode 100644 index 000000000000..144ed7275932 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_tag.h @@ -1113748,7 +1113771,7 @@ index 000000000000..144ed7275932 +} event_log_extended_hdr_t; +#endif /* _EVENT_LOG_TAG_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_trace.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_trace.h -new file mode 100755 +new file mode 100644 index 000000000000..0c6fc6b262a0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_trace.h @@ -1113878,7 +1113901,7 @@ index 000000000000..0c6fc6b262a0 + +#endif /* _WL_DIAG_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/fils.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/fils.h -new file mode 100755 +new file mode 100644 index 000000000000..1d3c8e0b52a8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/fils.h @@ -1114179,7 +1114202,7 @@ index 000000000000..1d3c8e0b52a8 + +#endif /* __FILSAUTH_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_armtrap.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_armtrap.h -new file mode 100755 +new file mode 100644 index 000000000000..177ef53141fe --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_armtrap.h @@ -1114275,7 +1114298,7 @@ index 000000000000..177ef53141fe + +#endif /* _hnd_armtrap_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_cons.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_cons.h -new file mode 100755 +new file mode 100644 index 000000000000..81a699d8b5de --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_cons.h @@ -1114368,7 +1114391,7 @@ index 000000000000..81a699d8b5de + +#endif /* _hnd_cons_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_debug.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_debug.h -new file mode 100755 +new file mode 100644 index 000000000000..b8dca36b84c6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_debug.h @@ -1114543,7 +1114566,7 @@ index 000000000000..b8dca36b84c6 + +#endif /* _HND_DEBUG_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktpool.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktpool.h -new file mode 100755 +new file mode 100644 index 000000000000..57f222967488 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktpool.h @@ -1114793,7 +1114816,7 @@ index 000000000000..57f222967488 + +#endif /* _hnd_pktpool_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktq.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktq.h -new file mode 100755 +new file mode 100644 index 000000000000..824bbc1420d9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktq.h @@ -1115125,7 +1115148,7 @@ index 000000000000..824bbc1420d9 + +#endif /* _hnd_pktq_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_trap.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_trap.h -new file mode 100755 +new file mode 100644 index 000000000000..caf006ee26d9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_trap.h @@ -1115171,7 +1115194,7 @@ index 000000000000..caf006ee26d9 + +#endif /* _hnd_trap_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndchipc.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndchipc.h -new file mode 100755 +new file mode 100644 index 000000000000..be9a2e65cb55 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndchipc.h @@ -1115231,7 +1115254,7 @@ index 000000000000..be9a2e65cb55 + +#endif /* _hndchipc_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndlhl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndlhl.h -new file mode 100755 +new file mode 100644 index 000000000000..c6794464ebe7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndlhl.h @@ -1115299,7 +1115322,7 @@ index 000000000000..c6794464ebe7 +#define LHL_IS_PSMODE_1(sih) (si_lhl_ps_mode(sih) == LHL_PS_MODE_1) +#endif /* _hndlhl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndmem.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndmem.h -new file mode 100755 +new file mode 100644 index 000000000000..de348e7d3c45 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndmem.h @@ -1115386,7 +1115409,7 @@ index 000000000000..de348e7d3c45 + uint32 mem_start, uint32 size, hndmem_config_t config); +#endif /* _HNDMEM_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndoobr.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndoobr.h -new file mode 100755 +new file mode 100644 index 000000000000..88e2952cf7c5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndoobr.h @@ -1115468,7 +1115491,7 @@ index 000000000000..88e2952cf7c5 + +#endif /* _hndoobr_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndpmu.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndpmu.h -new file mode 100755 +new file mode 100644 index 000000000000..df3b31bf46ee --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndpmu.h @@ -1115554,7 +1115577,7 @@ index 000000000000..df3b31bf46ee +#endif /* BCMPMU_STATS */ +#endif /* _hndpmu_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndsoc.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndsoc.h -new file mode 100755 +new file mode 100644 index 000000000000..b4cb16001b97 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndsoc.h @@ -1115911,7 +1115934,7 @@ index 000000000000..b4cb16001b97 +#define PMU_BASE_OFFSET 0x00012000 /* PMU offset is changed for ccrev >= 56 */ +#endif /* _HNDSOC_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_osl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_osl.h -new file mode 100755 +new file mode 100644 index 000000000000..bb916706702d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_osl.h @@ -1116553,7 +1116576,7 @@ index 000000000000..bb916706702d +extern uint32 osl_do_gettimediff(struct osl_timespec *cur_ts, struct osl_timespec *old_ts); +#endif /* _linux_osl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_pkt.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_pkt.h -new file mode 100755 +new file mode 100644 index 000000000000..30fff18479f3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_pkt.h @@ -1116795,7 +1116818,7 @@ index 000000000000..30fff18479f3 + +#endif /* _linux_pkt_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linuxver.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linuxver.h -new file mode 100755 +new file mode 100644 index 000000000000..32ad78f6c932 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linuxver.h @@ -1117701,7 +1117724,7 @@ index 000000000000..32ad78f6c932 + +#endif /* _linuxver_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/lpflags.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/lpflags.h -new file mode 100755 +new file mode 100644 index 000000000000..ed0ff7825b08 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/lpflags.h @@ -1117753,7 +1117776,7 @@ index 000000000000..ed0ff7825b08 + +#endif /* _lpflags_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/mbo.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/mbo.h -new file mode 100755 +new file mode 100644 index 000000000000..eef005063065 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/mbo.h @@ -1118045,7 +1118068,7 @@ index 000000000000..eef005063065 + +#endif /* __MBO_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/miniopt.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/miniopt.h -new file mode 100755 +new file mode 100644 index 000000000000..1c1d8e9e2004 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/miniopt.h @@ -1118131,7 +1118154,7 @@ index 000000000000..1c1d8e9e2004 + +#endif /* MINI_OPT_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msf.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msf.h -new file mode 100755 +new file mode 100644 index 000000000000..5f0022e53250 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msf.h @@ -1118204,7 +1118227,7 @@ index 000000000000..5f0022e53250 + +#endif /* _WLC_MSF_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msgtrace.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msgtrace.h -new file mode 100755 +new file mode 100644 index 000000000000..c871c7ce620d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msgtrace.h @@ -1118273,7 +1118296,7 @@ index 000000000000..c871c7ce620d + +#endif /* _MSGTRACE_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/nan.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/nan.h -new file mode 100755 +new file mode 100644 index 000000000000..bdb07f8460da --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/nan.h @@ -1119838,7 +1119861,7 @@ index 000000000000..bdb07f8460da + +#endif /* _NAN_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl.h -new file mode 100755 +new file mode 100644 index 000000000000..2a7aec17d1db --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl.h @@ -1120222,7 +1120245,7 @@ index 000000000000..2a7aec17d1db + +#endif /* _osl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_decl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_decl.h -new file mode 100755 +new file mode 100644 index 000000000000..a5643079c831 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_decl.h @@ -1120266,7 +1120289,7 @@ index 000000000000..a5643079c831 +extern unsigned int lmtest; /* low memory test */ +#endif // endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_ext.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_ext.h -new file mode 100755 +new file mode 100644 index 000000000000..2c182ca29bd1 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_ext.h @@ -1121038,7 +1121061,7 @@ index 000000000000..2c182ca29bd1 + +#endif /* _osl_ext_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/p2p.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/p2p.h -new file mode 100755 +new file mode 100644 index 000000000000..b68d5c32e466 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/p2p.h @@ -1121746,7 +1121769,7 @@ index 000000000000..b68d5c32e466 + +#endif /* _P2P_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_end.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_end.h -new file mode 100755 +new file mode 100644 index 000000000000..64c7579ae26c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_end.h @@ -1121812,7 +1121835,7 @@ index 000000000000..64c7579ae26c +#undef BWL_PRE_PACKED_STRUCT +#undef BWL_POST_PACKED_STRUCT diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_start.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_start.h -new file mode 100755 +new file mode 100644 index 000000000000..097611ed404a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_start.h @@ -1121923,7 +1121946,7 @@ index 000000000000..097611ed404a + #error "Unknown compiler!" +#endif // endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcicfg.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcicfg.h -new file mode 100755 +new file mode 100644 index 000000000000..c8ec32a62406 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcicfg.h @@ -1122331,7 +1122354,7 @@ index 000000000000..c8ec32a62406 + +#endif /* _h_pcicfg_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcie_core.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcie_core.h -new file mode 100755 +new file mode 100644 index 000000000000..592ad25e4832 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcie_core.h @@ -1123530,7 +1123553,7 @@ index 000000000000..592ad25e4832 + +#endif /* _PCIE_CORE_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/rte_ioctl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/rte_ioctl.h -new file mode 100755 +new file mode 100644 index 000000000000..90669be876b4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/rte_ioctl.h @@ -1123640,7 +1123663,7 @@ index 000000000000..90669be876b4 +} d11_dmalpbk_args_t; +#endif /* _rte_ioctl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbchipc.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbchipc.h -new file mode 100755 +new file mode 100644 index 000000000000..f7eb1cfde400 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbchipc.h @@ -1128265,7 +1128288,7 @@ index 000000000000..f7eb1cfde400 + +#endif /* _SBCHIPC_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbconfig.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbconfig.h -new file mode 100755 +new file mode 100644 index 000000000000..b05cd510aa0b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbconfig.h @@ -1128557,7 +1128580,7 @@ index 000000000000..b05cd510aa0b + +#endif /* _SBCONFIG_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbgci.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbgci.h -new file mode 100755 +new file mode 100644 index 000000000000..bbf0e4337124 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbgci.h @@ -1128837,7 +1128860,7 @@ index 000000000000..bbf0e4337124 + +#endif /* _SBGCI_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhndarm.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhndarm.h -new file mode 100755 +new file mode 100644 index 000000000000..ee1279a4a807 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhndarm.h @@ -1128985,7 +1129008,7 @@ index 000000000000..ee1279a4a807 + +#endif /* _sbhndarm_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhnddma.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhnddma.h -new file mode 100755 +new file mode 100644 index 000000000000..52a39dc6d415 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhnddma.h @@ -1129441,7 +1129464,7 @@ index 000000000000..52a39dc6d415 + +#endif /* _sbhnddma_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbpcmcia.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbpcmcia.h -new file mode 100755 +new file mode 100644 index 000000000000..8b6c6cf45556 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbpcmcia.h @@ -1129585,7 +1129608,7 @@ index 000000000000..8b6c6cf45556 +#define SBTMH_INT_STATUS 0x40000 /* sb interrupt status */ +#endif /* _SBPCMCIA_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdio.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdio.h -new file mode 100755 +new file mode 100644 index 000000000000..ba7d66266afb --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdio.h @@ -1129780,7 +1129803,7 @@ index 000000000000..ba7d66266afb + +#endif /* _SBSDIO_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdpcmdev.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdpcmdev.h -new file mode 100755 +new file mode 100644 index 000000000000..7134247e7cf4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdpcmdev.h @@ -1130098,7 +1130121,7 @@ index 000000000000..7134247e7cf4 + +#endif /* _sbsdpcmdev_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsocram.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsocram.h -new file mode 100755 +new file mode 100644 index 000000000000..5e709aa52d4e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsocram.h @@ -1130309,7 +1130332,7 @@ index 000000000000..5e709aa52d4e + +#endif /* _SBSOCRAM_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsysmem.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsysmem.h -new file mode 100755 +new file mode 100644 index 000000000000..065b3f1980f6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsysmem.h @@ -1130496,7 +1130519,7 @@ index 000000000000..065b3f1980f6 + +#endif /* _SBSYSMEM_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdio.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdio.h -new file mode 100755 +new file mode 100644 index 000000000000..844fc2780d5b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdio.h @@ -1131128,7 +1131151,7 @@ index 000000000000..844fc2780d5b +#endif /* def BCMSDIO */ +#endif /* _SDIO_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdioh.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdioh.h -new file mode 100755 +new file mode 100644 index 000000000000..327d1c4d0e1f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdioh.h @@ -1131585,7 +1131608,7 @@ index 000000000000..327d1c4d0e1f + +#endif /* _SDIOH_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdiovar.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdiovar.h -new file mode 100755 +new file mode 100644 index 000000000000..bfbe2bf94390 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdiovar.h @@ -1131716,7 +1131739,7 @@ index 000000000000..bfbe2bf94390 + +#endif /* _sdiovar_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdspi.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdspi.h -new file mode 100755 +new file mode 100644 index 000000000000..d42f4c783490 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdspi.h @@ -1131801,7 +1131824,7 @@ index 000000000000..d42f4c783490 + +#endif /* _SD_SPI_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/siutils.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/siutils.h -new file mode 100755 +new file mode 100644 index 000000000000..eba0d0a97c89 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/siutils.h @@ -1132617,7 +1132640,7 @@ index 000000000000..eba0d0a97c89 + +#endif /* _siutils_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/spid.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/spid.h -new file mode 100755 +new file mode 100644 index 000000000000..3a08b59986ac --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/spid.h @@ -1132792,7 +1132815,7 @@ index 000000000000..3a08b59986ac + +#endif /* _SPI_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/trxhdr.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/trxhdr.h -new file mode 100755 +new file mode 100644 index 000000000000..b717e62017d9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/trxhdr.h @@ -1132894,7 +1132917,7 @@ index 000000000000..b717e62017d9 + +#endif /* _TRX_HDR_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/typedefs.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/typedefs.h -new file mode 100755 +new file mode 100644 index 000000000000..c446005668db --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/typedefs.h @@ -1133268,7 +1133291,7 @@ index 000000000000..c446005668db +#include +#endif /* _TYPEDEFS_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/usbrdl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/usbrdl.h -new file mode 100755 +new file mode 100644 index 000000000000..f15fbd697cea --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/usbrdl.h @@ -1133409,7 +1133432,7 @@ index 000000000000..f15fbd697cea + +#endif /* _USB_RDL_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/vlan.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/vlan.h -new file mode 100755 +new file mode 100644 index 000000000000..ddc64a9381cb --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/vlan.h @@ -1133513,7 +1133536,7 @@ index 000000000000..ddc64a9381cb + +#endif /* _vlan_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlfc_proto.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlfc_proto.h -new file mode 100755 +new file mode 100644 index 000000000000..0b592c6a2bc6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlfc_proto.h @@ -1133933,7 +1133956,7 @@ index 000000000000..0b592c6a2bc6 + +#endif /* __wlfc_proto_definitions_h__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl.h -new file mode 100755 +new file mode 100644 index 000000000000..7f14967db99d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl.h @@ -1154691,7 +1154714,7 @@ index 000000000000..7f14967db99d +} wlc_nr5gcx_status_v1_t; +#endif /* _wlioctl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl_defs.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl_defs.h -new file mode 100755 +new file mode 100644 index 000000000000..100b836284ce --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl_defs.h @@ -1157163,7 +1157186,7 @@ index 000000000000..100b836284ce +/* === Place holder for cnx and nan cfgs === */ +#endif /* wlioctl_defs_h */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl_utils.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl_utils.h -new file mode 100755 +new file mode 100644 index 000000000000..6dee521a3853 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl_utils.h @@ -1157231,7 +1157254,7 @@ index 000000000000..6dee521a3853 + +#endif /* _wlioctl_utils_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wpa.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wpa.h -new file mode 100755 +new file mode 100644 index 000000000000..d618ea91b1ee --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wpa.h @@ -1157549,7 +1157572,7 @@ index 000000000000..d618ea91b1ee + +#endif /* _proto_wpa_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wps.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wps.h -new file mode 100755 +new file mode 100644 index 000000000000..c2ebace54013 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wps.h @@ -1157941,7 +1157964,7 @@ index 000000000000..c2ebace54013 + +#endif /* _WPS_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl.c -new file mode 100755 +new file mode 100644 index 000000000000..321ee05c4ccb --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl.c @@ -1160072,7 +1160095,7 @@ index 000000000000..321ee05c4ccb +} \ No newline at end of file diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl_priv.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl_priv.h -new file mode 100755 +new file mode 100644 index 000000000000..f56f292c0ecf --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl_priv.h @@ -1160263,7 +1160286,7 @@ index 000000000000..f56f292c0ecf + +#endif /* _LINUX_OSL_PRIV_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_pkt.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_pkt.c -new file mode 100755 +new file mode 100644 index 000000000000..e66ea740c092 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_pkt.c @@ -1160963,7 +1160986,7 @@ index 000000000000..e66ea740c092 +} +#endif /* LINUX_VERSION >= 3.6.0 && TSQ_MULTIPLIER */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/otpdefs.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/otpdefs.h -new file mode 100755 +new file mode 100644 index 000000000000..542e5a90b3f3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/otpdefs.h @@ -1161091,7 +1161114,7 @@ index 000000000000..542e5a90b3f3 +char *dhd_get_plat_sku(void); +#endif /* _OTPDEFS_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/pcie_core.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/pcie_core.c -new file mode 100755 +new file mode 100644 index 000000000000..dd54c675a180 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/pcie_core.c @@ -1161256,7 +1161279,7 @@ index 000000000000..dd54c675a180 + +#endif /* BCMDRIVER */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/sbutils.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/sbutils.c -new file mode 100755 +new file mode 100644 index 000000000000..bd22c9aab076 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/sbutils.c @@ -1162356,7 +1162379,7 @@ index 000000000000..bd22c9aab076 +} +#endif // endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils.c -new file mode 100755 +new file mode 100644 index 000000000000..1f9cc39d17a4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils.c @@ -1166163,7 +1166186,7 @@ index 000000000000..1f9cc39d17a4 + (si_numcoreunits(sih, SR_CORE_ID) > 4)); +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils_priv.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils_priv.h -new file mode 100755 +new file mode 100644 index 000000000000..1686e888248d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils_priv.h @@ -1166525,7 +1166548,7 @@ index 000000000000..1686e888248d + +#endif /* _siutils_priv_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.c -new file mode 100755 +new file mode 100644 index 000000000000..f1ca3f2270c9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.c @@ -1173175,7 +1173198,7 @@ index 000000000000..f1ca3f2270c9 +} +#endif /* WL_STATIC_IF */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.h -new file mode 100755 +new file mode 100644 index 000000000000..46af4b736f77 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.h @@ -1173601,7 +1173624,7 @@ index 000000000000..46af4b736f77 +); +#endif /* _wl_android_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android_ext.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android_ext.c -new file mode 100755 +new file mode 100644 index 000000000000..dd9784bc0733 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android_ext.c @@ -1181581,7 +1181604,7 @@ index 000000000000..dd9784bc0733 + + diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.c -new file mode 100755 +new file mode 100644 index 000000000000..1534f3919a3e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.c @@ -1206626,7 +1206649,7 @@ index 000000000000..1534f3919a3e + return ret; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.h -new file mode 100755 +new file mode 100644 index 000000000000..39e827d8b887 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.h @@ -1209083,7 +1209106,7 @@ index 000000000000..39e827d8b887 +s32 wl_cfg80211_autochannel(struct net_device *dev, char* command, int total_len); +#endif /* _wl_cfg80211_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg_btcoex.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg_btcoex.c -new file mode 100755 +new file mode 100644 index 000000000000..4780d116e5fe --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg_btcoex.c @@ -1209658,7 +1209681,7 @@ index 000000000000..4780d116e5fe + return (snprintf(command, sizeof("OK"), "OK") + 1); +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.c -new file mode 100755 +new file mode 100644 index 000000000000..70a2022b0c9f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.c @@ -1217846,7 +1217869,7 @@ index 000000000000..70a2022b0c9f +} +#endif /* WL_NAN */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.h -new file mode 100755 +new file mode 100644 index 000000000000..6eca82b8067c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.h @@ -1218751,7 +1218774,7 @@ index 000000000000..6eca82b8067c +}; +#endif /* _wl_cfgnan_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.c -new file mode 100755 +new file mode 100644 index 000000000000..673566e4a696 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.c @@ -1221549,7 +1221572,7 @@ index 000000000000..673566e4a696 + return false; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.h -new file mode 100755 +new file mode 100644 index 000000000000..e47f8af9b4d6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.h @@ -1222013,7 +1222036,7 @@ index 000000000000..e47f8af9b4d6 + (len == WL_P2P_WILDCARD_SSID_LEN)) +#endif /* _wl_cfgp2p_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgscan.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgscan.c -new file mode 100755 +new file mode 100644 index 000000000000..6de12e1432d7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgscan.c @@ -1225367,7 +1225390,7 @@ index 000000000000..6de12e1432d7 + return; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgscan.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgscan.h -new file mode 100755 +new file mode 100644 index 000000000000..ddd133514b6f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgscan.h @@ -1225474,7 +1225497,7 @@ index 000000000000..ddd133514b6f +extern void wl_notify_scan_done(struct bcm_cfg80211 *cfg, bool aborted); +#endif /* _wl_cfgscan_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.c -new file mode 100755 +new file mode 100644 index 000000000000..b2f6cb5087d0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.c @@ -1234231,7 +1234254,7 @@ index 000000000000..b2f6cb5087d0 +} +#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(3, 13, 0)) || defined(WL_VENDOR_EXT_SUPPORT) */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.h -new file mode 100755 +new file mode 100644 index 000000000000..b70aa354dad3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.h @@ -1234958,7 +1234981,7 @@ index 000000000000..b70aa354dad3 + +#endif /* _wl_cfgvendor_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_dbg.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_dbg.h -new file mode 100755 +new file mode 100644 index 000000000000..640907ea81ff --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_dbg.h @@ -1235345,7 +1235368,7 @@ index 000000000000..640907ea81ff +extern uint32 wl_msg_level2; +#endif /* _wl_dbg_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.c -new file mode 100755 +new file mode 100644 index 000000000000..9403d0600998 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.c @@ -1237043,7 +1237066,7 @@ index 000000000000..9403d0600998 +#endif /* WL_ESCAN */ + diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.h -new file mode 100755 +new file mode 100644 index 000000000000..7e4241eae508 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.h @@ -1237127,7 +1237150,7 @@ index 000000000000..7e4241eae508 +#endif /* _wl_escan_ */ + diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_event.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_event.c -new file mode 100755 +new file mode 100644 index 000000000000..fd2cb3cd0eee --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_event.c @@ -1237639,7 +1237662,7 @@ index 000000000000..fd2cb3cd0eee +} +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_ext_genl.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_ext_genl.c -new file mode 100755 +new file mode 100644 index 000000000000..316f9ea6cbf2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_ext_genl.c @@ -1238214,7 +1238237,7 @@ index 000000000000..316f9ea6cbf2 +#endif + diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.c -new file mode 100755 +new file mode 100644 index 000000000000..3eee7339f455 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.c @@ -1242562,7 +1242585,7 @@ index 000000000000..3eee7339f455 + +#endif /* USE_IW */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.h -new file mode 100755 +new file mode 100644 index 000000000000..ba2cae8bd7c6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.h @@ -1242746,7 +1242769,7 @@ index 000000000000..ba2cae8bd7c6 + +#endif /* _wl_iw_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_linux_mon.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_linux_mon.c -new file mode 100755 +new file mode 100644 index 000000000000..920eb42dba27 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_linux_mon.c @@ -1243226,7 +1243249,7 @@ index 000000000000..920eb42dba27 + return 0; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_roam.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_roam.c -new file mode 100755 +new file mode 100644 index 000000000000..a7d49bddc3e6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_roam.c @@ -1243607,7 +1243630,7 @@ index 000000000000..a7d49bddc3e6 +#endif /* ROAM_CHANNEL_CACHE */ +#endif /* ESCAN_CHANNEL_CACHE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.c -new file mode 100755 +new file mode 100644 index 000000000000..4a1aae7316e0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.c @@ -1244148,7 +1244171,7 @@ index 000000000000..4a1aae7316e0 + return 0; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.h -new file mode 100755 +new file mode 100644 index 000000000000..772152e79070 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.h @@ -1244289,7 +1244312,7 @@ index 000000000000..772152e79070 + +#endif /* __WLDEV_COMMON_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c b/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c -new file mode 100755 +new file mode 100644 index 000000000000..82799df987e8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c @@ -1244998,7 +1245021,7 @@ index 9d2f511f13fa..c098ecc33ae3 100644 #define PORT_LINK_FAST_LINK_MODE BIT(7) #define PORT_LINK_MODE_MASK GENMASK(21, 16) diff --git a/drivers/pci/controller/dwc/pcie-dw-rockchip.c b/drivers/pci/controller/dwc/pcie-dw-rockchip.c -new file mode 100755 +new file mode 100644 index 000000000000..fa40f51e469d --- /dev/null +++ b/drivers/pci/controller/dwc/pcie-dw-rockchip.c @@ -1246793,7 +1246816,7 @@ index 000000000000..fa40f51e469d +MODULE_DESCRIPTION("RockChip PCIe Controller driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c -index 990a00e08bc5..92cced721d20 100644 +index 1aa84035a8bc..435abb8c6423 100644 --- a/drivers/pci/controller/pcie-rockchip.c +++ b/drivers/pci/controller/pcie-rockchip.c @@ -14,6 +14,7 @@ @@ -1246813,7 +1246836,7 @@ index 990a00e08bc5..92cced721d20 100644 +MODULE_DESCRIPTION("Rockchip AXI PCIe driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/pci/controller/rockchip-pcie-dma.c b/drivers/pci/controller/rockchip-pcie-dma.c -new file mode 100755 +new file mode 100644 index 000000000000..edcd58e9a710 --- /dev/null +++ b/drivers/pci/controller/rockchip-pcie-dma.c @@ -1247582,7 +1247605,7 @@ index 000000000000..edcd58e9a710 +} +EXPORT_SYMBOL_GPL(rk_pcie_dma_obj_remove); diff --git a/drivers/pci/controller/rockchip-pcie-dma.h b/drivers/pci/controller/rockchip-pcie-dma.h -new file mode 100755 +new file mode 100644 index 000000000000..50e203b7f51f --- /dev/null +++ b/drivers/pci/controller/rockchip-pcie-dma.h @@ -1247968,7 +1247991,7 @@ index c3cfc7f0af5c..9858a3730828 100644 obj-$(CONFIG_PHY_ROCKCHIP_USB) += phy-rockchip-usb.o +obj-$(CONFIG_PHY_ROCKCHIP_USBDP) += phy-rockchip-usbdp.o diff --git a/drivers/phy/rockchip/phy-rockchip-csi2-dphy-common.h b/drivers/phy/rockchip/phy-rockchip-csi2-dphy-common.h -new file mode 100755 +new file mode 100644 index 000000000000..7af000b42785 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-csi2-dphy-common.h @@ -1248114,7 +1248137,7 @@ index 000000000000..7af000b42785 + +#endif diff --git a/drivers/phy/rockchip/phy-rockchip-csi2-dphy-hw.c b/drivers/phy/rockchip/phy-rockchip-csi2-dphy-hw.c -new file mode 100755 +new file mode 100644 index 000000000000..4aada197a7b3 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-csi2-dphy-hw.c @@ -1249349,7 +1249372,7 @@ index 000000000000..4aada197a7b3 +MODULE_DESCRIPTION("Rockchip MIPI CSI2 DPHY HW driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-csi2-dphy.c b/drivers/phy/rockchip/phy-rockchip-csi2-dphy.c -new file mode 100755 +new file mode 100644 index 000000000000..6ce85e8ede17 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-csi2-dphy.c @@ -1250514,7 +1250537,7 @@ index 000000000000..6ce85e8ede17 +MODULE_DESCRIPTION("Rockchip MIPI CSI2 DPHY driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-inno-combphy.c b/drivers/phy/rockchip/phy-rockchip-inno-combphy.c -new file mode 100755 +new file mode 100644 index 000000000000..8b93016edce5 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-inno-combphy.c @@ -1252330,7 +1252353,7 @@ index 8af8c6c5cc02..f3380b0aa324 100644 }; MODULE_DEVICE_TABLE(of, inno_dsidphy_of_match); diff --git a/drivers/phy/rockchip/phy-rockchip-inno-hdmi-phy.c b/drivers/phy/rockchip/phy-rockchip-inno-hdmi-phy.c -new file mode 100755 +new file mode 100644 index 000000000000..23f1e5d87ea9 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-inno-hdmi-phy.c @@ -1253968,7 +1253991,7 @@ index 000000000000..23f1e5d87ea9 +MODULE_DESCRIPTION("Innosilion HDMI 2.0 Transmitter PHY Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c b/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c -index 9ca20c947283..2b0f5f2b4f33 100644 +index 2b0f5f2b4f33..38a535acfce1 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c @@ -590,11 +590,12 @@ unsigned long inno_hdmi_phy_rk3228_clk_recalc_rate(struct clk_hw *hw, @@ -1253988,7 +1254011,7 @@ index 9ca20c947283..2b0f5f2b4f33 100644 static long inno_hdmi_phy_rk3228_clk_round_rate(struct clk_hw *hw, diff --git a/drivers/phy/rockchip/phy-rockchip-inno-mipi-dphy.c b/drivers/phy/rockchip/phy-rockchip-inno-mipi-dphy.c -new file mode 100755 +new file mode 100644 index 000000000000..b49b1aad2a09 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-inno-mipi-dphy.c @@ -1258818,7 +1258841,7 @@ index cab6a94bf161..b75f14be09e3 100644 }, }; diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb3.c b/drivers/phy/rockchip/phy-rockchip-inno-usb3.c -new file mode 100755 +new file mode 100644 index 000000000000..f345f23afbd1 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb3.c @@ -1259938,7 +1259961,7 @@ index 000000000000..f345f23afbd1 +MODULE_DESCRIPTION("Rockchip USB 3.0 PHY driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-inno-video-combo-phy.c b/drivers/phy/rockchip/phy-rockchip-inno-video-combo-phy.c -new file mode 100755 +new file mode 100644 index 000000000000..4166d4bacb42 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-inno-video-combo-phy.c @@ -1260818,7 +1260841,7 @@ index 000000000000..4166d4bacb42 +MODULE_DESCRIPTION("Innosilicon MIPI/LVDS/TTL Video Combo PHY driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-inno-video-phy.c b/drivers/phy/rockchip/phy-rockchip-inno-video-phy.c -new file mode 100755 +new file mode 100644 index 000000000000..22d26f1413d9 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-inno-video-phy.c @@ -1261069,7 +1261092,7 @@ index 000000000000..22d26f1413d9 +MODULE_DESCRIPTION("Innosilicon LVDS/TTL PHY driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-mipi-rx.c b/drivers/phy/rockchip/phy-rockchip-mipi-rx.c -new file mode 100755 +new file mode 100644 index 000000000000..e80a4c1e8881 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-mipi-rx.c @@ -1262971,7 +1262994,7 @@ index 000000000000..e80a4c1e8881 +MODULE_DESCRIPTION("Rockchip MIPI RX DPHY driver"); +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c -new file mode 100755 +new file mode 100644 index 000000000000..c844328377d9 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c @@ -1264322,7 +1264345,7 @@ index 000000000000..c844328377d9 +MODULE_DESCRIPTION("Rockchip NANENG COMBPHY driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-naneng-edp.c b/drivers/phy/rockchip/phy-rockchip-naneng-edp.c -new file mode 100755 +new file mode 100644 index 000000000000..209ce9d0384a --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-naneng-edp.c @@ -1264806,7 +1264829,7 @@ index 000000000000..209ce9d0384a +MODULE_DESCRIPTION("Rockchip Naneng eDP Transmitter PHY driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-naneng-usb2.c b/drivers/phy/rockchip/phy-rockchip-naneng-usb2.c -new file mode 100755 +new file mode 100644 index 000000000000..7edd532a6000 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-naneng-usb2.c @@ -1266784,7 +1266807,7 @@ index 75216091d901..2f47a3e7fd88 100644 * No documented timeout value for phy operation below, * so we make it large enough here. And we use loop-break diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-dcphy.c b/drivers/phy/rockchip/phy-rockchip-samsung-dcphy.c -new file mode 100755 +new file mode 100644 index 000000000000..bd8a0acaec3d --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-samsung-dcphy.c @@ -1269306,7 +1269329,7 @@ index 000000000000..2c04aa3b6e05 + +#endif diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx-hdmi.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx-hdmi.c -new file mode 100755 +new file mode 100644 index 000000000000..15f361facdf3 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx-hdmi.c @@ -1271670,7 +1271693,7 @@ index 000000000000..15f361facdf3 +MODULE_DESCRIPTION("Samsung HDMI-DP Transmitter Combphy Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c -new file mode 100755 +new file mode 100644 index 000000000000..2d142cf731d1 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c @@ -1272909,7 +1272932,7 @@ index 000000000000..2d142cf731d1 +MODULE_DESCRIPTION("Rockchip HDMI/DP Combo PHY with Samsung IP block"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c b/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c -new file mode 100755 +new file mode 100644 index 000000000000..aff349b75c9f --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c @@ -1283412,7 +1283435,7 @@ index 8454285977eb..a891018fe72e 100644 } diff --git a/drivers/phy/rockchip/phy-rockchip-usbdp.c b/drivers/phy/rockchip/phy-rockchip-usbdp.c -new file mode 100755 +new file mode 100644 index 000000000000..71f09dcaf21a --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-usbdp.c @@ -1285119,7 +1285142,7 @@ index 815095326e2d..d14f4f5c0a8e 100644 config PINCTRL_SINGLE tristate "One-register-per-pin type device tree based pinctrl driver" diff --git a/drivers/pinctrl/pinctrl-rk628.c b/drivers/pinctrl/pinctrl-rk628.c -new file mode 100755 +new file mode 100644 index 000000000000..75138e788ef7 --- /dev/null +++ b/drivers/pinctrl/pinctrl-rk628.c @@ -1289559,7 +1289582,7 @@ index 2a454098eaaa..7af6f74df96a 100644 +MODULE_ALIAS("platform:pinctrl-rockchip"); +MODULE_DEVICE_TABLE(of, rockchip_pinctrl_dt_match); diff --git a/drivers/pinctrl/pinctrl-rockchip.h b/drivers/pinctrl/pinctrl-rockchip.h -new file mode 100755 +new file mode 100644 index 000000000000..cd1662db5c97 --- /dev/null +++ b/drivers/pinctrl/pinctrl-rockchip.h @@ -1289842,7 +1289865,7 @@ index 000000000000..cd1662db5c97 + +#endif diff --git a/drivers/power/ec_battery.c b/drivers/power/ec_battery.c -new file mode 100755 +new file mode 100644 index 000000000000..9627cd1a0a11 --- /dev/null +++ b/drivers/power/ec_battery.c @@ -1290326,7 +1290349,7 @@ index 1c5af2fef142..c5067eb75370 100644 static struct platform_driver gpio_poweroff_driver = { .probe = gpio_poweroff_probe, diff --git a/drivers/power/reset/reboot-mode.h b/drivers/power/reset/reboot-mode.h -new file mode 100755 +new file mode 100644 index 000000000000..342df786d043 --- /dev/null +++ b/drivers/power/reset/reboot-mode.h @@ -1290520,7 +1290543,7 @@ index be24529157be..148eb8105803 100644 return ret; } diff --git a/drivers/power/supply/bq25700_charger.c b/drivers/power/supply/bq25700_charger.c -new file mode 100755 +new file mode 100644 index 000000000000..5b2a516509ed --- /dev/null +++ b/drivers/power/supply/bq25700_charger.c @@ -1292802,7 +1292825,7 @@ index 2b1df9c33969..932b890a8f3d 100644 static const char * const POWER_SUPPLY_HEALTH_TEXT[] = { diff --git a/drivers/power/supply/rk816_battery.c b/drivers/power/supply/rk816_battery.c -new file mode 100755 +new file mode 100644 index 000000000000..d204a0129a8d --- /dev/null +++ b/drivers/power/supply/rk816_battery.c @@ -1297980,7 +1298003,7 @@ index 000000000000..d204a0129a8d +MODULE_ALIAS("platform:rk816-battery"); +MODULE_AUTHOR("chenjh"); diff --git a/drivers/power/supply/rk816_battery.h b/drivers/power/supply/rk816_battery.h -new file mode 100755 +new file mode 100644 index 000000000000..b8b467114c1f --- /dev/null +++ b/drivers/power/supply/rk816_battery.h @@ -1298272,7 +1298295,7 @@ index 000000000000..b8b467114c1f + +#endif diff --git a/drivers/power/supply/rk817_battery.c b/drivers/power/supply/rk817_battery.c -new file mode 100755 +new file mode 100644 index 000000000000..d9003ad9e534 --- /dev/null +++ b/drivers/power/supply/rk817_battery.c @@ -1301696,7 +1301719,7 @@ index 000000000000..d9003ad9e534 +MODULE_DESCRIPTION("RK817 Battery driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/power/supply/rk817_charger.c b/drivers/power/supply/rk817_charger.c -new file mode 100755 +new file mode 100644 index 000000000000..b7e4f7627bdb --- /dev/null +++ b/drivers/power/supply/rk817_charger.c @@ -1303500,7 +1303523,7 @@ index 000000000000..b7e4f7627bdb +MODULE_DESCRIPTION("RK817 Charge driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/power/supply/rk818_battery.c b/drivers/power/supply/rk818_battery.c -new file mode 100755 +new file mode 100644 index 000000000000..90ff1fac163c --- /dev/null +++ b/drivers/power/supply/rk818_battery.c @@ -1307128,7 +1307151,7 @@ index 000000000000..90ff1fac163c +MODULE_ALIAS("platform:rk818-battery"); +MODULE_AUTHOR("chenjh"); diff --git a/drivers/power/supply/rk818_battery.h b/drivers/power/supply/rk818_battery.h -new file mode 100755 +new file mode 100644 index 000000000000..66cbbe9dac4c --- /dev/null +++ b/drivers/power/supply/rk818_battery.h @@ -1307302,7 +1307325,7 @@ index 000000000000..66cbbe9dac4c + +#endif diff --git a/drivers/power/supply/rk818_charger.c b/drivers/power/supply/rk818_charger.c -new file mode 100755 +new file mode 100644 index 000000000000..56961effd13c --- /dev/null +++ b/drivers/power/supply/rk818_charger.c @@ -1309270,7 +1309293,7 @@ index 912e2184f918..8cfbd8d6b478 100644 * Make the charging functionality controllable by a write to the * command register unless pin control is specified in the platform diff --git a/drivers/power/sy6982c_charger.c b/drivers/power/sy6982c_charger.c -new file mode 100755 +new file mode 100644 index 000000000000..dfa82c3f8d27 --- /dev/null +++ b/drivers/power/sy6982c_charger.c @@ -1309677,7 +1309700,7 @@ index 000000000000..dfa82c3f8d27 +MODULE_ALIAS("platform:sy6982c-charger"); +MODULE_AUTHOR("chen Shunqing"); diff --git a/drivers/power/universal_charger.c b/drivers/power/universal_charger.c -new file mode 100755 +new file mode 100644 index 000000000000..0f7b4c9e8003 --- /dev/null +++ b/drivers/power/universal_charger.c @@ -1310403,7 +1310426,7 @@ index 1f3079562b38..e6394eb8176b 100644 MODULE_AUTHOR("Beniamino Galvani "); MODULE_DESCRIPTION("Rockchip SoC PWM driver"); diff --git a/drivers/pwm/sysfs.c b/drivers/pwm/sysfs.c -index 9903c3a7eced..54619969dce6 100644 +index b8417a8d2ef9..937c0235b9be 100644 --- a/drivers/pwm/sysfs.c +++ b/drivers/pwm/sysfs.c @@ -103,6 +103,43 @@ static ssize_t duty_cycle_store(struct device *child, @@ -1310522,7 +1310545,7 @@ index 6ebae516258e..17e3300e71d5 100644 ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c -index c2b6b1befcf2..ee4f9a653635 100644 +index 50cbfe54c7db..7efd88cc3f75 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -51,6 +51,7 @@ static LIST_HEAD(regulator_map_list); @@ -1310900,7 +1310923,7 @@ index c2b6b1befcf2..ee4f9a653635 100644 static int regulator_register_resolve_supply(struct device *dev, void *data) { struct regulator_dev *rdev = dev_to_rdev(dev); -@@ -5526,6 +5866,7 @@ void regulator_unregister(struct regulator_dev *rdev) +@@ -5522,6 +5862,7 @@ void regulator_unregister(struct regulator_dev *rdev) mutex_lock(®ulator_list_mutex); @@ -1310908,7 +1310931,7 @@ index c2b6b1befcf2..ee4f9a653635 100644 WARN_ON(rdev->open_count); regulator_remove_coupling(rdev); unset_regulator_supplies(rdev); -@@ -5957,7 +6298,11 @@ static int __init regulator_init(void) +@@ -5953,7 +6294,11 @@ static int __init regulator_init(void) } /* init early to allow our consumers to complete system booting */ @@ -1311617,7 +1311640,7 @@ index 1af12074a75a..534028ec15c2 100644 }; diff --git a/drivers/regulator/lp8752.c b/drivers/regulator/lp8752.c -new file mode 100755 +new file mode 100644 index 000000000000..cf8e685f304a --- /dev/null +++ b/drivers/regulator/lp8752.c @@ -1311939,7 +1311962,7 @@ index 000000000000..cf8e685f304a +MODULE_AUTHOR("Zhang Qing "); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/regulator/mp8865-regulator.c b/drivers/regulator/mp8865-regulator.c -new file mode 100755 +new file mode 100644 index 000000000000..607e3a8f2df4 --- /dev/null +++ b/drivers/regulator/mp8865-regulator.c @@ -1313101,7 +1313124,7 @@ index e926c1a85846..bb8b2f604a24 100644 MODULE_AUTHOR("Chris Zhong "); MODULE_AUTHOR("Zhang Qing "); diff --git a/drivers/regulator/scmi-regulator.c b/drivers/regulator/scmi-regulator.c -new file mode 100755 +new file mode 100644 index 000000000000..9a4297276098 --- /dev/null +++ b/drivers/regulator/scmi-regulator.c @@ -1313528,7 +1313551,7 @@ index 000000000000..9a4297276098 +MODULE_DESCRIPTION("ARM SCMI regulator driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/regulator/syr82x.c b/drivers/regulator/syr82x.c -new file mode 100755 +new file mode 100644 index 000000000000..4f7b0892a3bc --- /dev/null +++ b/drivers/regulator/syr82x.c @@ -1314054,7 +1314077,7 @@ index 000000000000..4f7b0892a3bc +MODULE_DESCRIPTION("syr82x PMIC driver"); + diff --git a/drivers/regulator/tps549b22-regulator.c b/drivers/regulator/tps549b22-regulator.c -new file mode 100755 +new file mode 100644 index 000000000000..bae2a67f4345 --- /dev/null +++ b/drivers/regulator/tps549b22-regulator.c @@ -1314497,7 +1314520,7 @@ index 000000000000..bae2a67f4345 +MODULE_AUTHOR("derrick.huang@rock-chips.com"); +MODULE_DESCRIPTION(" tps549b22 dcdc driver"); diff --git a/drivers/regulator/xz3216.c b/drivers/regulator/xz3216.c -new file mode 100755 +new file mode 100644 index 000000000000..54182559b161 --- /dev/null +++ b/drivers/regulator/xz3216.c @@ -1314907,7 +1314930,7 @@ index 000000000000..54182559b161 +MODULE_AUTHOR("zhangqing "); +MODULE_DESCRIPTION("xz3216 PMIC driver"); diff --git a/drivers/rk_nand/Kconfig b/drivers/rk_nand/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..c49a1c28b702 --- /dev/null +++ b/drivers/rk_nand/Kconfig @@ -1314923,7 +1314946,7 @@ index 000000000000..c49a1c28b702 + +endif diff --git a/drivers/rk_nand/Makefile b/drivers/rk_nand/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..dbd156f6e78b --- /dev/null +++ b/drivers/rk_nand/Makefile @@ -1314938,7 +1314961,7 @@ index 000000000000..dbd156f6e78b +rk_ftl-$(CONFIG_ARM) += rk_zftl_arm32.o rk_ftlv5_arm32.o +endif diff --git a/drivers/rk_nand/rk_ftl_api.h b/drivers/rk_nand/rk_ftl_api.h -new file mode 100755 +new file mode 100644 index 000000000000..ebde01e3dbb6 --- /dev/null +++ b/drivers/rk_nand/rk_ftl_api.h @@ -1314985,7 +1315008,7 @@ index 000000000000..ebde01e3dbb6 +#endif + diff --git a/drivers/rk_nand/rk_ftl_arm_v7.S b/drivers/rk_nand/rk_ftl_arm_v7.S -new file mode 100755 +new file mode 100644 index 000000000000..db549c3b269e --- /dev/null +++ b/drivers/rk_nand/rk_ftl_arm_v7.S @@ -1345156,7 +1345179,7 @@ index 000000000000..db549c3b269e +.LC200: + .ascii "\0013vendor storage %x,%x,%x\012\000" diff --git a/drivers/rk_nand/rk_ftl_arm_v7_thumb.S b/drivers/rk_nand/rk_ftl_arm_v7_thumb.S -new file mode 100755 +new file mode 100644 index 000000000000..a67898acb677 --- /dev/null +++ b/drivers/rk_nand/rk_ftl_arm_v7_thumb.S @@ -1375354,7 +1375377,7 @@ index 000000000000..a67898acb677 +.LC200: + .ascii "\0013vendor storage %x,%x,%x\012\000" diff --git a/drivers/rk_nand/rk_ftl_arm_v8.S b/drivers/rk_nand/rk_ftl_arm_v8.S -new file mode 100755 +new file mode 100644 index 000000000000..537155f1fcde --- /dev/null +++ b/drivers/rk_nand/rk_ftl_arm_v8.S @@ -1403328,7 +1403351,7 @@ index 000000000000..537155f1fcde +.LC199: + .string "\0013vendor storage %x,%x,%x\n" diff --git a/drivers/rk_nand/rk_ftlv5_arm32.S b/drivers/rk_nand/rk_ftlv5_arm32.S -new file mode 100755 +new file mode 100644 index 000000000000..26e2a694fb6d --- /dev/null +++ b/drivers/rk_nand/rk_ftlv5_arm32.S @@ -1430946,7 +1430969,7 @@ index 000000000000..26e2a694fb6d +.LC167: + .ascii "erase power lost blk = %x vpc=%x\012\000" diff --git a/drivers/rk_nand/rk_ftlv5_arm64.S b/drivers/rk_nand/rk_ftlv5_arm64.S -new file mode 100755 +new file mode 100644 index 000000000000..260a57d855b5 --- /dev/null +++ b/drivers/rk_nand/rk_ftlv5_arm64.S @@ -1456584,7 +1456607,7 @@ index 000000000000..260a57d855b5 +.LC166: + .string "erase power lost blk = %x vpc=%x\n" diff --git a/drivers/rk_nand/rk_nand_base.c b/drivers/rk_nand/rk_nand_base.c -new file mode 100755 +new file mode 100644 index 000000000000..9d5e2fb02baa --- /dev/null +++ b/drivers/rk_nand/rk_nand_base.c @@ -1457046,7 +1457069,7 @@ index 000000000000..9d5e2fb02baa +MODULE_ALIAS("rknand"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/rk_nand/rk_nand_base.h b/drivers/rk_nand/rk_nand_base.h -new file mode 100755 +new file mode 100644 index 000000000000..023e58d5fc5c --- /dev/null +++ b/drivers/rk_nand/rk_nand_base.h @@ -1457098,7 +1457121,7 @@ index 000000000000..023e58d5fc5c +void rknand_dev_cache_flush(void); +#endif diff --git a/drivers/rk_nand/rk_nand_blk.c b/drivers/rk_nand/rk_nand_blk.c -new file mode 100755 +new file mode 100644 index 000000000000..7d1c46966481 --- /dev/null +++ b/drivers/rk_nand/rk_nand_blk.c @@ -1457815,7 +1457838,7 @@ index 000000000000..7d1c46966481 + pr_info("rknand_shutdown:OK\n"); +} diff --git a/drivers/rk_nand/rk_nand_blk.h b/drivers/rk_nand/rk_nand_blk.h -new file mode 100755 +new file mode 100644 index 000000000000..681c625f5081 --- /dev/null +++ b/drivers/rk_nand/rk_nand_blk.h @@ -1457888,7 +1457911,7 @@ index 000000000000..681c625f5081 +int nand_blk_add_whole_disk(void); +#endif diff --git a/drivers/rk_nand/rk_zftl_arm32.S b/drivers/rk_nand/rk_zftl_arm32.S -new file mode 100755 +new file mode 100644 index 000000000000..ec6959a4c9c9 --- /dev/null +++ b/drivers/rk_nand/rk_zftl_arm32.S @@ -1494989,7 +1495012,7 @@ index 000000000000..ec6959a4c9c9 +.LC324: + .ascii "\0013vendor storage %x,%x,%x\012\000" diff --git a/drivers/rk_nand/rk_zftl_arm64.S b/drivers/rk_nand/rk_zftl_arm64.S -new file mode 100755 +new file mode 100644 index 000000000000..943e37110677 --- /dev/null +++ b/drivers/rk_nand/rk_zftl_arm64.S @@ -1530202,7 +1530225,7 @@ index 000000000000..943e37110677 +.LC324: + .string "\0013vendor storage %x,%x,%x\n" diff --git a/drivers/rkflash/Kconfig b/drivers/rkflash/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..4c791915e7bc --- /dev/null +++ b/drivers/rkflash/Kconfig @@ -1530288,7 +1530311,7 @@ index 000000000000..4c791915e7bc + +endif # ARCH_ROCKCHIP diff --git a/drivers/rkflash/Makefile b/drivers/rkflash/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..283a217eb6ca --- /dev/null +++ b/drivers/rkflash/Makefile @@ -1530308,7 +1530331,7 @@ index 000000000000..283a217eb6ca +rksftl-$(CONFIG_ARM) += rk_sftl_arm_v7.o +endif diff --git a/drivers/rkflash/flash.c b/drivers/rkflash/flash.c -new file mode 100755 +new file mode 100644 index 000000000000..52be15969cda --- /dev/null +++ b/drivers/rkflash/flash.c @@ -1530819,7 +1530842,7 @@ index 000000000000..52be15969cda + return 0; +} diff --git a/drivers/rkflash/flash.h b/drivers/rkflash/flash.h -new file mode 100755 +new file mode 100644 index 000000000000..8f1284c9026a --- /dev/null +++ b/drivers/rkflash/flash.h @@ -1530957,7 +1530980,7 @@ index 000000000000..8f1284c9026a + +#endif diff --git a/drivers/rkflash/flash_com.h b/drivers/rkflash/flash_com.h -new file mode 100755 +new file mode 100644 index 000000000000..da6eb29968a1 --- /dev/null +++ b/drivers/rkflash/flash_com.h @@ -1531040,7 +1531063,7 @@ index 000000000000..da6eb29968a1 + +#endif diff --git a/drivers/rkflash/nand_boot.c b/drivers/rkflash/nand_boot.c -new file mode 100755 +new file mode 100644 index 000000000000..7db6ff9e7f48 --- /dev/null +++ b/drivers/rkflash/nand_boot.c @@ -1531129,7 +1531152,7 @@ index 000000000000..7db6ff9e7f48 +}; + diff --git a/drivers/rkflash/nandc.c b/drivers/rkflash/nandc.c -new file mode 100755 +new file mode 100644 index 000000000000..69e3b0ed5598 --- /dev/null +++ b/drivers/rkflash/nandc.c @@ -1531602,7 +1531625,7 @@ index 000000000000..69e3b0ed5598 +{ +} diff --git a/drivers/rkflash/nandc.h b/drivers/rkflash/nandc.h -new file mode 100755 +new file mode 100644 index 000000000000..e650493dbe4d --- /dev/null +++ b/drivers/rkflash/nandc.h @@ -1531954,7 +1531977,7 @@ index 000000000000..e650493dbe4d + +#endif diff --git a/drivers/rkflash/rk_sftl.h b/drivers/rkflash/rk_sftl.h -new file mode 100755 +new file mode 100644 index 000000000000..378f83714b5d --- /dev/null +++ b/drivers/rkflash/rk_sftl.h @@ -1532008,7 +1532031,7 @@ index 000000000000..378f83714b5d +void __printf(1, 2) sftl_printk(char *fmt, ...); +#endif diff --git a/drivers/rkflash/rk_sftl_arm_v7.S b/drivers/rkflash/rk_sftl_arm_v7.S -new file mode 100755 +new file mode 100644 index 000000000000..a8119e884d35 --- /dev/null +++ b/drivers/rkflash/rk_sftl_arm_v7.S @@ -1547801,7 +1547824,7 @@ index 000000000000..a8119e884d35 +.LC134: + .ascii "vendor_storage\000" diff --git a/drivers/rkflash/rk_sftl_arm_v7_thumb.S b/drivers/rkflash/rk_sftl_arm_v7_thumb.S -new file mode 100755 +new file mode 100644 index 000000000000..d4429f7f1db4 --- /dev/null +++ b/drivers/rkflash/rk_sftl_arm_v7_thumb.S @@ -1563393,7 +1563416,7 @@ index 000000000000..d4429f7f1db4 +.LC134: + .ascii "vendor_storage\000" diff --git a/drivers/rkflash/rk_sftl_arm_v8.S b/drivers/rkflash/rk_sftl_arm_v8.S -new file mode 100755 +new file mode 100644 index 000000000000..7e2944e55a76 --- /dev/null +++ b/drivers/rkflash/rk_sftl_arm_v8.S @@ -1579167,7 +1579190,7 @@ index 000000000000..7e2944e55a76 + .word 3 + .align 3 diff --git a/drivers/rkflash/rkflash_api.h b/drivers/rkflash/rkflash_api.h -new file mode 100755 +new file mode 100644 index 000000000000..402109b60521 --- /dev/null +++ b/drivers/rkflash/rkflash_api.h @@ -1579231,7 +1579254,7 @@ index 000000000000..402109b60521 + +#endif diff --git a/drivers/rkflash/rkflash_blk.c b/drivers/rkflash/rkflash_blk.c -new file mode 100755 +new file mode 100644 index 000000000000..17ffe73865fe --- /dev/null +++ b/drivers/rkflash/rkflash_blk.c @@ -1580026,7 +1580049,7 @@ index 000000000000..17ffe73865fe + pr_info("rkflash_shutdown:OK\n"); +} diff --git a/drivers/rkflash/rkflash_blk.h b/drivers/rkflash/rkflash_blk.h -new file mode 100755 +new file mode 100644 index 000000000000..3d95436c55e7 --- /dev/null +++ b/drivers/rkflash/rkflash_blk.h @@ -1580153,7 +1580176,7 @@ index 000000000000..3d95436c55e7 + +#endif diff --git a/drivers/rkflash/rkflash_debug.c b/drivers/rkflash/rkflash_debug.c -new file mode 100755 +new file mode 100644 index 000000000000..ce742b0382ef --- /dev/null +++ b/drivers/rkflash/rkflash_debug.c @@ -1580275,7 +1580298,7 @@ index 000000000000..ce742b0382ef +module_param_cb(rkflash_debug, &rkflash_debug_param_ops, &rkflash_debug, 0644); +MODULE_PARM_DESC(rkflash_debug, "config rkflash_debug module"); diff --git a/drivers/rkflash/rkflash_debug.h b/drivers/rkflash/rkflash_debug.h -new file mode 100755 +new file mode 100644 index 000000000000..3fe4068322e7 --- /dev/null +++ b/drivers/rkflash/rkflash_debug.h @@ -1580323,7 +1580346,7 @@ index 000000000000..3fe4068322e7 +#endif + diff --git a/drivers/rkflash/rknandc_base.c b/drivers/rkflash/rknandc_base.c -new file mode 100755 +new file mode 100644 index 000000000000..d2e97883dec4 --- /dev/null +++ b/drivers/rkflash/rknandc_base.c @@ -1580521,7 +1580544,7 @@ index 000000000000..d2e97883dec4 +module_exit(rknandc_driver_exit); +MODULE_ALIAS("rknandc"); diff --git a/drivers/rkflash/rksfc_base.c b/drivers/rkflash/rksfc_base.c -new file mode 100755 +new file mode 100644 index 000000000000..6cf74e103972 --- /dev/null +++ b/drivers/rkflash/rksfc_base.c @@ -1580794,7 +1580817,7 @@ index 000000000000..6cf74e103972 +module_exit(rksfc_driver_exit); +MODULE_ALIAS("rksfc"); diff --git a/drivers/rkflash/sfc.c b/drivers/rkflash/sfc.c -new file mode 100755 +new file mode 100644 index 000000000000..9ee5d6a97f13 --- /dev/null +++ b/drivers/rkflash/sfc.c @@ -1581055,7 +1581078,7 @@ index 000000000000..9ee5d6a97f13 + return ret; +} diff --git a/drivers/rkflash/sfc.h b/drivers/rkflash/sfc.h -new file mode 100755 +new file mode 100644 index 000000000000..355cd26170c6 --- /dev/null +++ b/drivers/rkflash/sfc.h @@ -1581285,7 +1581308,7 @@ index 000000000000..355cd26170c6 +void rksfc_wait_for_irq_completed(void); +#endif diff --git a/drivers/rkflash/sfc_nand.c b/drivers/rkflash/sfc_nand.c -new file mode 100755 +new file mode 100644 index 000000000000..cf3d3e887198 --- /dev/null +++ b/drivers/rkflash/sfc_nand.c @@ -1582342,7 +1582365,7 @@ index 000000000000..cf3d3e887198 + return p_nand_info; +} diff --git a/drivers/rkflash/sfc_nand.h b/drivers/rkflash/sfc_nand.h -new file mode 100755 +new file mode 100644 index 000000000000..43f4adf4508b --- /dev/null +++ b/drivers/rkflash/sfc_nand.h @@ -1582481,7 +1582504,7 @@ index 000000000000..43f4adf4508b + +#endif diff --git a/drivers/rkflash/sfc_nand_boot.c b/drivers/rkflash/sfc_nand_boot.c -new file mode 100755 +new file mode 100644 index 000000000000..8db7f8df968f --- /dev/null +++ b/drivers/rkflash/sfc_nand_boot.c @@ -1582576,7 +1582599,7 @@ index 000000000000..8db7f8df968f + snand_discard, +}; diff --git a/drivers/rkflash/sfc_nand_mtd.c b/drivers/rkflash/sfc_nand_mtd.c -new file mode 100755 +new file mode 100644 index 000000000000..1b4d306050cf --- /dev/null +++ b/drivers/rkflash/sfc_nand_mtd.c @@ -1583005,7 +1583028,7 @@ index 000000000000..1b4d306050cf + +#endif diff --git a/drivers/rkflash/sfc_nand_mtd.h b/drivers/rkflash/sfc_nand_mtd.h -new file mode 100755 +new file mode 100644 index 000000000000..0d49c74654ab --- /dev/null +++ b/drivers/rkflash/sfc_nand_mtd.h @@ -1583093,7 +1583116,7 @@ index 000000000000..0d49c74654ab + +#endif diff --git a/drivers/rkflash/sfc_nand_mtd_bbt.c b/drivers/rkflash/sfc_nand_mtd_bbt.c -new file mode 100755 +new file mode 100644 index 000000000000..eb641f89306c --- /dev/null +++ b/drivers/rkflash/sfc_nand_mtd_bbt.c @@ -1583540,7 +1583563,7 @@ index 000000000000..eb641f89306c +} +EXPORT_SYMBOL_GPL(snanddev_bbt_set_block_status); diff --git a/drivers/rkflash/sfc_nor.c b/drivers/rkflash/sfc_nor.c -new file mode 100755 +new file mode 100644 index 000000000000..f7abe75a5b09 --- /dev/null +++ b/drivers/rkflash/sfc_nor.c @@ -1584329,7 +1584352,7 @@ index 000000000000..f7abe75a5b09 +} + diff --git a/drivers/rkflash/sfc_nor.h b/drivers/rkflash/sfc_nor.h -new file mode 100755 +new file mode 100644 index 000000000000..950af6a5e686 --- /dev/null +++ b/drivers/rkflash/sfc_nor.h @@ -1584511,7 +1584534,7 @@ index 000000000000..950af6a5e686 + struct snor_info_packet *packet); +#endif diff --git a/drivers/rkflash/sfc_nor_boot.c b/drivers/rkflash/sfc_nor_boot.c -new file mode 100755 +new file mode 100644 index 000000000000..791c1291b475 --- /dev/null +++ b/drivers/rkflash/sfc_nor_boot.c @@ -1584697,7 +1584720,7 @@ index 000000000000..791c1291b475 + NULL, +}; diff --git a/drivers/rkflash/sfc_nor_mtd.c b/drivers/rkflash/sfc_nor_mtd.c -new file mode 100755 +new file mode 100644 index 000000000000..8c9d69a581f2 --- /dev/null +++ b/drivers/rkflash/sfc_nor_mtd.c @@ -1584969,7 +1584992,7 @@ index 000000000000..8c9d69a581f2 + return ret; +} diff --git a/drivers/rkflash/typedef.h b/drivers/rkflash/typedef.h -new file mode 100755 +new file mode 100644 index 000000000000..5808ec281fa2 --- /dev/null +++ b/drivers/rkflash/typedef.h @@ -1585308,7 +1585331,7 @@ index 25eb2c1e31bb..a9d09b3e902e 100644 + endif diff --git a/drivers/soc/rockchip/Kconfig.cpu b/drivers/soc/rockchip/Kconfig.cpu -new file mode 100755 +new file mode 100644 index 000000000000..1ffc763434bf --- /dev/null +++ b/drivers/soc/rockchip/Kconfig.cpu @@ -1589235,7 +1589258,7 @@ index 000000000000..f5ec8d143b22 + +#endif diff --git a/drivers/soc/rockchip/flash_vendor_storage.c b/drivers/soc/rockchip/flash_vendor_storage.c -new file mode 100755 +new file mode 100644 index 000000000000..7c8cd338d286 --- /dev/null +++ b/drivers/soc/rockchip/flash_vendor_storage.c @@ -1589583,7 +1589606,7 @@ index 000000000000..7c8cd338d286 +module_exit(vendor_storage_deinit); +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/flash_vendor_storage.h b/drivers/soc/rockchip/flash_vendor_storage.h -new file mode 100755 +new file mode 100644 index 000000000000..55ca52486de7 --- /dev/null +++ b/drivers/soc/rockchip/flash_vendor_storage.h @@ -1594377,7 +1594400,7 @@ index 000000000000..c8fa137be25e + ret +SYM_FUNC_END_PI(rk_md_flush_dcache_area) diff --git a/drivers/soc/rockchip/mtd_vendor_storage.c b/drivers/soc/rockchip/mtd_vendor_storage.c -new file mode 100755 +new file mode 100644 index 000000000000..1f32930d906c --- /dev/null +++ b/drivers/soc/rockchip/mtd_vendor_storage.c @@ -1596904,7 +1596927,7 @@ index 000000000000..eb9768d88d3d +module_platform_driver(vendor_storage_driver); +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rk_camera_sensor_info.h b/drivers/soc/rockchip/rk_camera_sensor_info.h -new file mode 100755 +new file mode 100644 index 000000000000..55823b3839b2 --- /dev/null +++ b/drivers/soc/rockchip/rk_camera_sensor_info.h @@ -1597697,7 +1597720,7 @@ index 000000000000..f888c9c18738 +} +late_initcall_sync(rk_memblock_procfs_init); diff --git a/drivers/soc/rockchip/rk_vendor_storage.c b/drivers/soc/rockchip/rk_vendor_storage.c -new file mode 100755 +new file mode 100644 index 000000000000..a8a316e47ff9 --- /dev/null +++ b/drivers/soc/rockchip/rk_vendor_storage.c @@ -1597753,7 +1597776,7 @@ index 000000000000..a8a316e47ff9 + +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip-cpuinfo.c b/drivers/soc/rockchip/rockchip-cpuinfo.c -new file mode 100755 +new file mode 100644 index 000000000000..02befb165d98 --- /dev/null +++ b/drivers/soc/rockchip/rockchip-cpuinfo.c @@ -1599117,7 +1599140,7 @@ index 000000000000..04a6a5b39715 +MODULE_AUTHOR("Finley Xiao "); +MODULE_DESCRIPTION("Rockchip clock subunit driver"); diff --git a/drivers/soc/rockchip/rockchip_debug.c b/drivers/soc/rockchip/rockchip_debug.c -new file mode 100755 +new file mode 100644 index 000000000000..2f9eac20bc4b --- /dev/null +++ b/drivers/soc/rockchip/rockchip_debug.c @@ -1599802,7 +1599825,7 @@ index 000000000000..2f9eac20bc4b +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:rockchip-debugger"); diff --git a/drivers/soc/rockchip/rockchip_debug.h b/drivers/soc/rockchip/rockchip_debug.h -new file mode 100755 +new file mode 100644 index 000000000000..82036d8ebf72 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_debug.h @@ -1599822,7 +1599845,7 @@ index 000000000000..82036d8ebf72 + +#endif diff --git a/drivers/soc/rockchip/rockchip_decompress.c b/drivers/soc/rockchip/rockchip_decompress.c -new file mode 100755 +new file mode 100644 index 000000000000..275a605cfccb --- /dev/null +++ b/drivers/soc/rockchip/rockchip_decompress.c @@ -1600539,7 +1600562,7 @@ index 000000000000..5f9a9b3b9338 +MODULE_LICENSE("GPL"); +#endif diff --git a/drivers/soc/rockchip/rockchip_ipa.c b/drivers/soc/rockchip/rockchip_ipa.c -new file mode 100755 +new file mode 100644 index 000000000000..e8982b7defee --- /dev/null +++ b/drivers/soc/rockchip/rockchip_ipa.c @@ -1600884,7 +1600907,7 @@ index 000000000000..1c92541ce2ae +MODULE_DESCRIPTION("Rockchip NPOR Powergood"); +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_opp_select.c b/drivers/soc/rockchip/rockchip_opp_select.c -new file mode 100755 +new file mode 100644 index 000000000000..6c496ad051f6 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_opp_select.c @@ -1603187,7 +1603210,7 @@ index 000000000000..13d077548167 +} +#endif /* CONFIG_SMP */ diff --git a/drivers/soc/rockchip/rockchip_pm_config.c b/drivers/soc/rockchip/rockchip_pm_config.c -new file mode 100755 +new file mode 100644 index 000000000000..c319b790ee24 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_pm_config.c @@ -1603799,7 +1603822,7 @@ index 000000000000..c319b790ee24 +MODULE_DESCRIPTION("Rockchip suspend mode config"); +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_pvtm.c b/drivers/soc/rockchip/rockchip_pvtm.c -new file mode 100755 +new file mode 100644 index 000000000000..75006737f421 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_pvtm.c @@ -1604851,7 +1604874,7 @@ index 000000000000..75006737f421 +MODULE_AUTHOR("Finley Xiao "); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/soc/rockchip/rockchip_ramdisk.c b/drivers/soc/rockchip/rockchip_ramdisk.c -new file mode 100755 +new file mode 100644 index 000000000000..e2118ac52d2a --- /dev/null +++ b/drivers/soc/rockchip/rockchip_ramdisk.c @@ -1605222,7 +1605245,7 @@ index 000000000000..e2118ac52d2a + +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_system_monitor.c b/drivers/soc/rockchip/rockchip_system_monitor.c -new file mode 100755 +new file mode 100644 index 000000000000..51844a9c8025 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_system_monitor.c @@ -1607174,7 +1607197,7 @@ index 000000000000..51844a9c8025 +MODULE_AUTHOR("Finley Xiao "); +MODULE_DESCRIPTION("rockchip system monitor driver"); diff --git a/drivers/soc/rockchip/rockchip_thunderboot_crypto.c b/drivers/soc/rockchip/rockchip_thunderboot_crypto.c -new file mode 100755 +new file mode 100644 index 000000000000..7a3c93a0304e --- /dev/null +++ b/drivers/soc/rockchip/rockchip_thunderboot_crypto.c @@ -1607620,7 +1607643,7 @@ index 000000000000..7a3c93a0304e + +pure_initcall(rk_tb_crypto_init); diff --git a/drivers/soc/rockchip/rockchip_thunderboot_mmc.c b/drivers/soc/rockchip/rockchip_thunderboot_mmc.c -new file mode 100755 +new file mode 100644 index 000000000000..10618811f0e9 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_thunderboot_mmc.c @@ -1607989,7 +1608012,7 @@ index 000000000000..6002d64c8b05 + +arch_initcall(rk_tb_serv_init); diff --git a/drivers/soc/rockchip/rockchip_thunderboot_sfc.c b/drivers/soc/rockchip/rockchip_thunderboot_sfc.c -new file mode 100755 +new file mode 100644 index 000000000000..d81ca755aa12 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_thunderboot_sfc.c @@ -1608136,7 +1608159,7 @@ index 000000000000..d81ca755aa12 + +pure_initcall(rk_tb_sfc_init); diff --git a/drivers/soc/rockchip/sdmmc_vendor_storage.c b/drivers/soc/rockchip/sdmmc_vendor_storage.c -new file mode 100755 +new file mode 100644 index 000000000000..ea1d9410b8eb --- /dev/null +++ b/drivers/soc/rockchip/sdmmc_vendor_storage.c @@ -1609175,7 +1609198,7 @@ index 5f4487b1a224..7f8fd0f537b4 100644 +CFLAGS_ion_buffer.o = -I$(src) +obj-y += heaps/ diff --git a/drivers/staging/android/ion/heaps/Kconfig b/drivers/staging/android/ion/heaps/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..5034c45a397d --- /dev/null +++ b/drivers/staging/android/ion/heaps/Kconfig @@ -1609196,7 +1609219,7 @@ index 000000000000..5034c45a397d + by the Contiguous Memory Allocator (CMA). If your system has these + regions, you should say Y here. diff --git a/drivers/staging/android/ion/heaps/Makefile b/drivers/staging/android/ion/heaps/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..82e36e89e978 --- /dev/null +++ b/drivers/staging/android/ion/heaps/Makefile @@ -1609206,199 +1609229,8 @@ index 000000000000..82e36e89e978 +ion_sys_heap-y := ion_system_heap.o ion_page_pool.o + +obj-$(CONFIG_ION_CMA_HEAP) += ion_cma_heap.o -diff --git a/drivers/staging/android/ion/ion_cma_heap.c b/drivers/staging/android/ion/heaps/ion_cma_heap.c -old mode 100644 -new mode 100755 -similarity index 72% -rename from drivers/staging/android/ion/ion_cma_heap.c -rename to drivers/staging/android/ion/heaps/ion_cma_heap.c -index bf65e67ef9d8..6ba7fd84c9ee ---- a/drivers/staging/android/ion/ion_cma_heap.c -+++ b/drivers/staging/android/ion/heaps/ion_cma_heap.c -@@ -7,6 +7,7 @@ - */ - - #include -+#include - #include - #include - #include -@@ -14,12 +15,10 @@ - #include - #include - --#include "ion.h" -- - struct ion_cma_heap { - struct ion_heap heap; - struct cma *cma; --}; -+} cma_heaps[MAX_CMA_AREAS]; - - #define to_cma_heap(x) container_of(x, struct ion_cma_heap, heap) - -@@ -71,6 +70,9 @@ static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer, - - buffer->priv_virt = pages; - buffer->sg_table = table; -+ -+ ion_buffer_prep_noncached(buffer); -+ - return 0; - - free_mem: -@@ -96,43 +98,54 @@ static void ion_cma_free(struct ion_buffer *buffer) - static struct ion_heap_ops ion_cma_ops = { - .allocate = ion_cma_allocate, - .free = ion_cma_free, -- .map_user = ion_heap_map_user, -- .map_kernel = ion_heap_map_kernel, -- .unmap_kernel = ion_heap_unmap_kernel, - }; - --static struct ion_heap *__ion_cma_heap_create(struct cma *cma) -+static int __ion_add_cma_heap(struct cma *cma, void *data) - { -+ int *cma_nr = data; - struct ion_cma_heap *cma_heap; -+ int ret; - -- cma_heap = kzalloc(sizeof(*cma_heap), GFP_KERNEL); -- -- if (!cma_heap) -- return ERR_PTR(-ENOMEM); -+ if (*cma_nr >= MAX_CMA_AREAS) -+ return -EINVAL; - -+ cma_heap = &cma_heaps[*cma_nr]; - cma_heap->heap.ops = &ion_cma_ops; -- cma_heap->cma = cma; - cma_heap->heap.type = ION_HEAP_TYPE_DMA; -- return &cma_heap->heap; -+ cma_heap->heap.name = cma_get_name(cma); -+ -+ ret = ion_device_add_heap(&cma_heap->heap); -+ if (ret) -+ goto out; -+ -+ cma_heap->cma = cma; -+ *cma_nr += 1; -+out: -+ return 0; - } - --static int __ion_add_cma_heaps(struct cma *cma, void *data) -+static int __init ion_cma_heap_init(void) - { -- struct ion_heap *heap; -- -- heap = __ion_cma_heap_create(cma); -- if (IS_ERR(heap)) -- return PTR_ERR(heap); -+ int ret; -+ int nr = 0; - -- heap->name = cma_get_name(cma); -+ ret = cma_for_each_area(__ion_add_cma_heap, &nr); -+ if (ret) { -+ for (nr = 0; nr < MAX_CMA_AREAS && cma_heaps[nr].cma; nr++) -+ ion_device_remove_heap(&cma_heaps[nr].heap); -+ } - -- ion_device_add_heap(heap); -- return 0; -+ return ret; - } - --static int ion_add_cma_heaps(void) -+static void __exit ion_cma_heap_exit(void) - { -- cma_for_each_area(__ion_add_cma_heaps, NULL); -- return 0; -+ int nr; -+ -+ for (nr = 0; nr < MAX_CMA_AREAS && cma_heaps[nr].cma; nr++) -+ ion_device_remove_heap(&cma_heaps[nr].heap); - } --device_initcall(ion_add_cma_heaps); -+ -+module_init(ion_cma_heap_init); -+module_exit(ion_cma_heap_exit); -+MODULE_LICENSE("GPL v2"); -diff --git a/drivers/staging/android/ion/ion_page_pool.c b/drivers/staging/android/ion/heaps/ion_page_pool.c -old mode 100644 -new mode 100755 -similarity index 87% -rename from drivers/staging/android/ion/ion_page_pool.c -rename to drivers/staging/android/ion/heaps/ion_page_pool.c -index 0198b886d906..efd6ce4cc0ad ---- a/drivers/staging/android/ion/ion_page_pool.c -+++ b/drivers/staging/android/ion/heaps/ion_page_pool.c -@@ -10,7 +10,7 @@ - #include - #include - --#include "ion.h" -+#include "ion_page_pool.h" - - static inline struct page *ion_page_pool_alloc_pages(struct ion_page_pool *pool) - { -@@ -79,6 +79,7 @@ struct page *ion_page_pool_alloc(struct ion_page_pool *pool) - - return page; - } -+EXPORT_SYMBOL_GPL(ion_page_pool_alloc); - - void ion_page_pool_free(struct ion_page_pool *pool, struct page *page) - { -@@ -86,6 +87,7 @@ void ion_page_pool_free(struct ion_page_pool *pool, struct page *page) - - ion_page_pool_add(pool, page); - } -+EXPORT_SYMBOL_GPL(ion_page_pool_free); - - static int ion_page_pool_total(struct ion_page_pool *pool, bool high) - { -@@ -97,6 +99,18 @@ static int ion_page_pool_total(struct ion_page_pool *pool, bool high) - return count << pool->order; - } - -+int ion_page_pool_nr_pages(struct ion_page_pool *pool) -+{ -+ int nr_total_pages; -+ -+ mutex_lock(&pool->mutex); -+ nr_total_pages = ion_page_pool_total(pool, true); -+ mutex_unlock(&pool->mutex); -+ -+ return nr_total_pages; -+} -+EXPORT_SYMBOL_GPL(ion_page_pool_nr_pages); -+ - int ion_page_pool_shrink(struct ion_page_pool *pool, gfp_t gfp_mask, - int nr_to_scan) - { -@@ -130,6 +144,7 @@ int ion_page_pool_shrink(struct ion_page_pool *pool, gfp_t gfp_mask, - - return freed; - } -+EXPORT_SYMBOL_GPL(ion_page_pool_shrink); - - struct ion_page_pool *ion_page_pool_create(gfp_t gfp_mask, unsigned int order) - { -@@ -148,8 +163,10 @@ struct ion_page_pool *ion_page_pool_create(gfp_t gfp_mask, unsigned int order) - - return pool; - } -+EXPORT_SYMBOL_GPL(ion_page_pool_create); - - void ion_page_pool_destroy(struct ion_page_pool *pool) - { - kfree(pool); - } -+EXPORT_SYMBOL_GPL(ion_page_pool_destroy); diff --git a/drivers/staging/android/ion/heaps/ion_page_pool.h b/drivers/staging/android/ion/heaps/ion_page_pool.h -new file mode 100755 +new file mode 100644 index 000000000000..10c79090c7a0 --- /dev/null +++ b/drivers/staging/android/ion/heaps/ion_page_pool.h @@ -1609470,327 +1609302,6 @@ index 000000000000..10c79090c7a0 +int ion_page_pool_shrink(struct ion_page_pool *pool, gfp_t gfp_mask, + int nr_to_scan); +#endif /* _ION_PAGE_POOL_H */ -diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/heaps/ion_system_heap.c -old mode 100644 -new mode 100755 -similarity index 65% -rename from drivers/staging/android/ion/ion_system_heap.c -rename to drivers/staging/android/ion/heaps/ion_system_heap.c -index eac0632ab4e8..45d23bea3822 ---- a/drivers/staging/android/ion/ion_system_heap.c -+++ b/drivers/staging/android/ion/heaps/ion_system_heap.c -@@ -9,12 +9,14 @@ - #include - #include - #include -+#include - #include -+#include - #include - #include - #include - --#include "ion.h" -+#include "ion_page_pool.h" - - #define NUM_ORDERS ARRAY_SIZE(orders) - -@@ -109,21 +111,48 @@ static int ion_system_heap_allocate(struct ion_heap *heap, - int i = 0; - unsigned long size_remaining = PAGE_ALIGN(size); - unsigned int max_order = orders[0]; -+ struct list_head lists[8]; -+ unsigned int block_index[8] = {0}; -+ unsigned int block_1M = 0; -+ unsigned int block_64K = 0; -+ unsigned int maximum; -+ int j; - - if (size / PAGE_SIZE > totalram_pages() / 2) - return -ENOMEM; - - INIT_LIST_HEAD(&pages); -+ for (i = 0; i < 8; i++) -+ INIT_LIST_HEAD(&lists[i]); -+ -+ i = 0; - while (size_remaining > 0) { - page = alloc_largest_available(sys_heap, buffer, size_remaining, - max_order); - if (!page) - goto free_pages; -- list_add_tail(&page->lru, &pages); -+ - size_remaining -= page_size(page); - max_order = compound_order(page); -+ if (max_order) { -+ if (max_order == 8) -+ block_1M++; -+ if (max_order == 4) -+ block_64K++; -+ list_add_tail(&page->lru, &pages); -+ } else { -+ dma_addr_t phys = page_to_phys(page); -+ unsigned int bit12_14 = (phys >> 12) & 0x7; -+ -+ list_add_tail(&page->lru, &lists[bit12_14]); -+ block_index[bit12_14]++; -+ } -+ - i++; - } -+ -+ pr_debug("%s, %d, i = %d, size = %ld\n", __func__, __LINE__, i, size); -+ - table = kmalloc(sizeof(*table), GFP_KERNEL); - if (!table) - goto free_pages; -@@ -131,6 +160,16 @@ static int ion_system_heap_allocate(struct ion_heap *heap, - if (sg_alloc_table(table, i, GFP_KERNEL)) - goto free_table; - -+ maximum = block_index[0]; -+ for (i = 1; i < 8; i++) -+ maximum = max(maximum, block_index[i]); -+ -+ pr_debug("%s, %d, maximum = %d, block_1M = %d, block_64K = %d\n", -+ __func__, __LINE__, maximum, block_1M, block_64K); -+ -+ for (i = 0; i < 8; i++) -+ pr_debug("block_index[%d] = %d\n", i, block_index[i]); -+ - sg = table->sgl; - list_for_each_entry_safe(page, tmp_page, &pages, lru) { - sg_set_page(sg, page, page_size(page), 0); -@@ -138,7 +177,22 @@ static int ion_system_heap_allocate(struct ion_heap *heap, - list_del(&page->lru); - } - -+ for (i = 0; i < maximum; i++) { -+ for (j = 0; j < 8; j++) { -+ if (!list_empty(&lists[j])) { -+ page = list_first_entry(&lists[j], struct page, -+ lru); -+ sg_set_page(sg, page, PAGE_SIZE, 0); -+ sg = sg_next(sg); -+ list_del(&page->lru); -+ } -+ } -+ } -+ - buffer->sg_table = table; -+ -+ ion_buffer_prep_noncached(buffer); -+ - return 0; - - free_table: -@@ -146,6 +200,11 @@ static int ion_system_heap_allocate(struct ion_heap *heap, - free_pages: - list_for_each_entry_safe(page, tmp_page, &pages, lru) - free_buffer_page(sys_heap, buffer, page); -+ -+ for (i = 0; i < 8; i++) { -+ list_for_each_entry_safe(page, tmp_page, &lists[i], lru) -+ free_buffer_page(sys_heap, buffer, page); -+ } - return -ENOMEM; - } - -@@ -160,7 +219,7 @@ static void ion_system_heap_free(struct ion_buffer *buffer) - - /* zero the buffer before goto page pool */ - if (!(buffer->private_flags & ION_PRIV_FLAG_SHRINKER_FREE)) -- ion_heap_buffer_zero(buffer); -+ ion_buffer_zero(buffer); - - for_each_sgtable_sg(table, sg, i) - free_buffer_page(sys_heap, buffer, sg_page(sg)); -@@ -203,14 +262,18 @@ static int ion_system_heap_shrink(struct ion_heap *heap, gfp_t gfp_mask, - return nr_total; - } - --static struct ion_heap_ops system_heap_ops = { -- .allocate = ion_system_heap_allocate, -- .free = ion_system_heap_free, -- .map_kernel = ion_heap_map_kernel, -- .unmap_kernel = ion_heap_unmap_kernel, -- .map_user = ion_heap_map_user, -- .shrink = ion_system_heap_shrink, --}; -+static long ion_system_get_pool_size(struct ion_heap *heap) -+{ -+ struct ion_system_heap *sys_heap; -+ long total_pages = 0; -+ int i; -+ -+ sys_heap = container_of(heap, struct ion_system_heap, heap); -+ for (i = 0; i < NUM_ORDERS; i++) -+ total_pages += ion_page_pool_nr_pages(sys_heap->pools[i]); -+ -+ return total_pages; -+} - - static void ion_system_heap_destroy_pools(struct ion_page_pool **pools) - { -@@ -245,133 +308,37 @@ static int ion_system_heap_create_pools(struct ion_page_pool **pools) - return -ENOMEM; - } - --static struct ion_heap *__ion_system_heap_create(void) --{ -- struct ion_system_heap *heap; -- -- heap = kzalloc(sizeof(*heap), GFP_KERNEL); -- if (!heap) -- return ERR_PTR(-ENOMEM); -- heap->heap.ops = &system_heap_ops; -- heap->heap.type = ION_HEAP_TYPE_SYSTEM; -- heap->heap.flags = ION_HEAP_FLAG_DEFER_FREE; -- -- if (ion_system_heap_create_pools(heap->pools)) -- goto free_heap; -- -- return &heap->heap; -- --free_heap: -- kfree(heap); -- return ERR_PTR(-ENOMEM); --} -- --static int ion_system_heap_create(void) --{ -- struct ion_heap *heap; -- -- heap = __ion_system_heap_create(); -- if (IS_ERR(heap)) -- return PTR_ERR(heap); -- heap->name = "ion_system_heap"; -- -- ion_device_add_heap(heap); -- -- return 0; --} --device_initcall(ion_system_heap_create); -- --static int ion_system_contig_heap_allocate(struct ion_heap *heap, -- struct ion_buffer *buffer, -- unsigned long len, -- unsigned long flags) --{ -- int order = get_order(len); -- struct page *page; -- struct sg_table *table; -- unsigned long i; -- int ret; -- -- page = alloc_pages(low_order_gfp_flags | __GFP_NOWARN, order); -- if (!page) -- return -ENOMEM; -- -- split_page(page, order); -- -- len = PAGE_ALIGN(len); -- for (i = len >> PAGE_SHIFT; i < (1 << order); i++) -- __free_page(page + i); -+static struct ion_heap_ops system_heap_ops = { -+ .allocate = ion_system_heap_allocate, -+ .free = ion_system_heap_free, -+ .shrink = ion_system_heap_shrink, -+ .get_pool_size = ion_system_get_pool_size, -+}; - -- table = kmalloc(sizeof(*table), GFP_KERNEL); -- if (!table) { -- ret = -ENOMEM; -- goto free_pages; -+static struct ion_system_heap system_heap = { -+ .heap = { -+ .ops = &system_heap_ops, -+ .type = ION_HEAP_TYPE_SYSTEM, -+ .flags = ION_HEAP_FLAG_DEFER_FREE, -+ .name = "ion_system_heap", - } -- -- ret = sg_alloc_table(table, 1, GFP_KERNEL); -- if (ret) -- goto free_table; -- -- sg_set_page(table->sgl, page, len, 0); -- -- buffer->sg_table = table; -- -- return 0; -- --free_table: -- kfree(table); --free_pages: -- for (i = 0; i < len >> PAGE_SHIFT; i++) -- __free_page(page + i); -- -- return ret; --} -- --static void ion_system_contig_heap_free(struct ion_buffer *buffer) --{ -- struct sg_table *table = buffer->sg_table; -- struct page *page = sg_page(table->sgl); -- unsigned long pages = PAGE_ALIGN(buffer->size) >> PAGE_SHIFT; -- unsigned long i; -- -- for (i = 0; i < pages; i++) -- __free_page(page + i); -- sg_free_table(table); -- kfree(table); --} -- --static struct ion_heap_ops kmalloc_ops = { -- .allocate = ion_system_contig_heap_allocate, -- .free = ion_system_contig_heap_free, -- .map_kernel = ion_heap_map_kernel, -- .unmap_kernel = ion_heap_unmap_kernel, -- .map_user = ion_heap_map_user, - }; - --static struct ion_heap *__ion_system_contig_heap_create(void) -+static int __init ion_system_heap_init(void) - { -- struct ion_heap *heap; -- -- heap = kzalloc(sizeof(*heap), GFP_KERNEL); -- if (!heap) -- return ERR_PTR(-ENOMEM); -- heap->ops = &kmalloc_ops; -- heap->type = ION_HEAP_TYPE_SYSTEM_CONTIG; -- heap->name = "ion_system_contig_heap"; -+ int ret = ion_system_heap_create_pools(system_heap.pools); -+ if (ret) -+ return ret; - -- return heap; -+ return ion_device_add_heap(&system_heap.heap); - } - --static int ion_system_contig_heap_create(void) -+static void __exit ion_system_heap_exit(void) - { -- struct ion_heap *heap; -- -- heap = __ion_system_contig_heap_create(); -- if (IS_ERR(heap)) -- return PTR_ERR(heap); -- -- ion_device_add_heap(heap); -- -- return 0; -+ ion_device_remove_heap(&system_heap.heap); -+ ion_system_heap_destroy_pools(system_heap.pools); - } --device_initcall(ion_system_contig_heap_create); -+ -+module_init(ion_system_heap_init); -+module_exit(ion_system_heap_exit); -+MODULE_LICENSE("GPL v2"); diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index e6d4a3ee6cda..3d9ec5f1045c 100644 --- a/drivers/staging/android/ion/ion.c @@ -1610512,10 +1610023,9 @@ index e6d4a3ee6cda..3d9ec5f1045c 100644 } subsys_initcall(ion_device_create); diff --git a/drivers/staging/android/ion/ion.h b/drivers/staging/android/ion/ion.h -deleted file mode 100644 -index c199e88afc6c..000000000000 +index c199e88afc6c..e69de29bb2d1 100644 --- a/drivers/staging/android/ion/ion.h -+++ /dev/null ++++ b/drivers/staging/android/ion/ion.h @@ -1,302 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* @@ -1610820,7 +1610330,7 @@ index c199e88afc6c..000000000000 - -#endif /* _ION_H */ diff --git a/drivers/staging/android/ion/ion_buffer.c b/drivers/staging/android/ion/ion_buffer.c -new file mode 100755 +new file mode 100644 index 000000000000..9baca1a472b6 --- /dev/null +++ b/drivers/staging/android/ion/ion_buffer.c @@ -1611103,8 +1610613,122 @@ index 000000000000..9baca1a472b6 +{ + return atomic_long_read(&total_heap_bytes); +} +diff --git a/drivers/staging/android/ion/ion_cma_heap.c b/drivers/staging/android/ion/ion_cma_heap.c +index bf65e67ef9d8..6ba7fd84c9ee 100644 +--- a/drivers/staging/android/ion/ion_cma_heap.c ++++ b/drivers/staging/android/ion/ion_cma_heap.c +@@ -7,6 +7,7 @@ + */ + + #include ++#include + #include + #include + #include +@@ -14,12 +15,10 @@ + #include + #include + +-#include "ion.h" +- + struct ion_cma_heap { + struct ion_heap heap; + struct cma *cma; +-}; ++} cma_heaps[MAX_CMA_AREAS]; + + #define to_cma_heap(x) container_of(x, struct ion_cma_heap, heap) + +@@ -71,6 +70,9 @@ static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer, + + buffer->priv_virt = pages; + buffer->sg_table = table; ++ ++ ion_buffer_prep_noncached(buffer); ++ + return 0; + + free_mem: +@@ -96,43 +98,54 @@ static void ion_cma_free(struct ion_buffer *buffer) + static struct ion_heap_ops ion_cma_ops = { + .allocate = ion_cma_allocate, + .free = ion_cma_free, +- .map_user = ion_heap_map_user, +- .map_kernel = ion_heap_map_kernel, +- .unmap_kernel = ion_heap_unmap_kernel, + }; + +-static struct ion_heap *__ion_cma_heap_create(struct cma *cma) ++static int __ion_add_cma_heap(struct cma *cma, void *data) + { ++ int *cma_nr = data; + struct ion_cma_heap *cma_heap; ++ int ret; + +- cma_heap = kzalloc(sizeof(*cma_heap), GFP_KERNEL); +- +- if (!cma_heap) +- return ERR_PTR(-ENOMEM); ++ if (*cma_nr >= MAX_CMA_AREAS) ++ return -EINVAL; + ++ cma_heap = &cma_heaps[*cma_nr]; + cma_heap->heap.ops = &ion_cma_ops; +- cma_heap->cma = cma; + cma_heap->heap.type = ION_HEAP_TYPE_DMA; +- return &cma_heap->heap; ++ cma_heap->heap.name = cma_get_name(cma); ++ ++ ret = ion_device_add_heap(&cma_heap->heap); ++ if (ret) ++ goto out; ++ ++ cma_heap->cma = cma; ++ *cma_nr += 1; ++out: ++ return 0; + } + +-static int __ion_add_cma_heaps(struct cma *cma, void *data) ++static int __init ion_cma_heap_init(void) + { +- struct ion_heap *heap; +- +- heap = __ion_cma_heap_create(cma); +- if (IS_ERR(heap)) +- return PTR_ERR(heap); ++ int ret; ++ int nr = 0; + +- heap->name = cma_get_name(cma); ++ ret = cma_for_each_area(__ion_add_cma_heap, &nr); ++ if (ret) { ++ for (nr = 0; nr < MAX_CMA_AREAS && cma_heaps[nr].cma; nr++) ++ ion_device_remove_heap(&cma_heaps[nr].heap); ++ } + +- ion_device_add_heap(heap); +- return 0; ++ return ret; + } + +-static int ion_add_cma_heaps(void) ++static void __exit ion_cma_heap_exit(void) + { +- cma_for_each_area(__ion_add_cma_heaps, NULL); +- return 0; ++ int nr; ++ ++ for (nr = 0; nr < MAX_CMA_AREAS && cma_heaps[nr].cma; nr++) ++ ion_device_remove_heap(&cma_heaps[nr].heap); + } +-device_initcall(ion_add_cma_heaps); ++ ++module_init(ion_cma_heap_init); ++module_exit(ion_cma_heap_exit); ++MODULE_LICENSE("GPL v2"); diff --git a/drivers/staging/android/ion/ion_dma_buf.c b/drivers/staging/android/ion/ion_dma_buf.c -new file mode 100755 +new file mode 100644 index 000000000000..47ae54af5ccf --- /dev/null +++ b/drivers/staging/android/ion/ion_dma_buf.c @@ -1611873,8 +1611497,75 @@ index ea7e0a244ffc..aa29a4ee48a3 100644 - return register_shrinker(&heap->shrinker); + return 0; } +diff --git a/drivers/staging/android/ion/ion_page_pool.c b/drivers/staging/android/ion/ion_page_pool.c +index 0198b886d906..efd6ce4cc0ad 100644 +--- a/drivers/staging/android/ion/ion_page_pool.c ++++ b/drivers/staging/android/ion/ion_page_pool.c +@@ -10,7 +10,7 @@ + #include + #include + +-#include "ion.h" ++#include "ion_page_pool.h" + + static inline struct page *ion_page_pool_alloc_pages(struct ion_page_pool *pool) + { +@@ -79,6 +79,7 @@ struct page *ion_page_pool_alloc(struct ion_page_pool *pool) + + return page; + } ++EXPORT_SYMBOL_GPL(ion_page_pool_alloc); + + void ion_page_pool_free(struct ion_page_pool *pool, struct page *page) + { +@@ -86,6 +87,7 @@ void ion_page_pool_free(struct ion_page_pool *pool, struct page *page) + + ion_page_pool_add(pool, page); + } ++EXPORT_SYMBOL_GPL(ion_page_pool_free); + + static int ion_page_pool_total(struct ion_page_pool *pool, bool high) + { +@@ -97,6 +99,18 @@ static int ion_page_pool_total(struct ion_page_pool *pool, bool high) + return count << pool->order; + } + ++int ion_page_pool_nr_pages(struct ion_page_pool *pool) ++{ ++ int nr_total_pages; ++ ++ mutex_lock(&pool->mutex); ++ nr_total_pages = ion_page_pool_total(pool, true); ++ mutex_unlock(&pool->mutex); ++ ++ return nr_total_pages; ++} ++EXPORT_SYMBOL_GPL(ion_page_pool_nr_pages); ++ + int ion_page_pool_shrink(struct ion_page_pool *pool, gfp_t gfp_mask, + int nr_to_scan) + { +@@ -130,6 +144,7 @@ int ion_page_pool_shrink(struct ion_page_pool *pool, gfp_t gfp_mask, + + return freed; + } ++EXPORT_SYMBOL_GPL(ion_page_pool_shrink); + + struct ion_page_pool *ion_page_pool_create(gfp_t gfp_mask, unsigned int order) + { +@@ -148,8 +163,10 @@ struct ion_page_pool *ion_page_pool_create(gfp_t gfp_mask, unsigned int order) + + return pool; + } ++EXPORT_SYMBOL_GPL(ion_page_pool_create); + + void ion_page_pool_destroy(struct ion_page_pool *pool) + { + kfree(pool); + } ++EXPORT_SYMBOL_GPL(ion_page_pool_destroy); diff --git a/drivers/staging/android/ion/ion_private.h b/drivers/staging/android/ion/ion_private.h -new file mode 100755 +new file mode 100644 index 000000000000..db4e90683f4c --- /dev/null +++ b/drivers/staging/android/ion/ion_private.h @@ -1611938,7 +1611629,7 @@ index 000000000000..db4e90683f4c + +#endif /* _ION_PRIVATE_H */ diff --git a/drivers/staging/android/ion/ion_protected_heap.c b/drivers/staging/android/ion/ion_protected_heap.c -new file mode 100755 +new file mode 100644 index 000000000000..c7f25373a744 --- /dev/null +++ b/drivers/staging/android/ion/ion_protected_heap.c @@ -1612469,8 +1612160,324 @@ index 000000000000..c7f25373a744 +#ifndef CONFIG_ION_MODULE +device_initcall(ion_protected_heap_create); +#endif +diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c +index eac0632ab4e8..45d23bea3822 100644 +--- a/drivers/staging/android/ion/ion_system_heap.c ++++ b/drivers/staging/android/ion/ion_system_heap.c +@@ -9,12 +9,14 @@ + #include + #include + #include ++#include + #include ++#include + #include + #include + #include + +-#include "ion.h" ++#include "ion_page_pool.h" + + #define NUM_ORDERS ARRAY_SIZE(orders) + +@@ -109,21 +111,48 @@ static int ion_system_heap_allocate(struct ion_heap *heap, + int i = 0; + unsigned long size_remaining = PAGE_ALIGN(size); + unsigned int max_order = orders[0]; ++ struct list_head lists[8]; ++ unsigned int block_index[8] = {0}; ++ unsigned int block_1M = 0; ++ unsigned int block_64K = 0; ++ unsigned int maximum; ++ int j; + + if (size / PAGE_SIZE > totalram_pages() / 2) + return -ENOMEM; + + INIT_LIST_HEAD(&pages); ++ for (i = 0; i < 8; i++) ++ INIT_LIST_HEAD(&lists[i]); ++ ++ i = 0; + while (size_remaining > 0) { + page = alloc_largest_available(sys_heap, buffer, size_remaining, + max_order); + if (!page) + goto free_pages; +- list_add_tail(&page->lru, &pages); ++ + size_remaining -= page_size(page); + max_order = compound_order(page); ++ if (max_order) { ++ if (max_order == 8) ++ block_1M++; ++ if (max_order == 4) ++ block_64K++; ++ list_add_tail(&page->lru, &pages); ++ } else { ++ dma_addr_t phys = page_to_phys(page); ++ unsigned int bit12_14 = (phys >> 12) & 0x7; ++ ++ list_add_tail(&page->lru, &lists[bit12_14]); ++ block_index[bit12_14]++; ++ } ++ + i++; + } ++ ++ pr_debug("%s, %d, i = %d, size = %ld\n", __func__, __LINE__, i, size); ++ + table = kmalloc(sizeof(*table), GFP_KERNEL); + if (!table) + goto free_pages; +@@ -131,6 +160,16 @@ static int ion_system_heap_allocate(struct ion_heap *heap, + if (sg_alloc_table(table, i, GFP_KERNEL)) + goto free_table; + ++ maximum = block_index[0]; ++ for (i = 1; i < 8; i++) ++ maximum = max(maximum, block_index[i]); ++ ++ pr_debug("%s, %d, maximum = %d, block_1M = %d, block_64K = %d\n", ++ __func__, __LINE__, maximum, block_1M, block_64K); ++ ++ for (i = 0; i < 8; i++) ++ pr_debug("block_index[%d] = %d\n", i, block_index[i]); ++ + sg = table->sgl; + list_for_each_entry_safe(page, tmp_page, &pages, lru) { + sg_set_page(sg, page, page_size(page), 0); +@@ -138,7 +177,22 @@ static int ion_system_heap_allocate(struct ion_heap *heap, + list_del(&page->lru); + } + ++ for (i = 0; i < maximum; i++) { ++ for (j = 0; j < 8; j++) { ++ if (!list_empty(&lists[j])) { ++ page = list_first_entry(&lists[j], struct page, ++ lru); ++ sg_set_page(sg, page, PAGE_SIZE, 0); ++ sg = sg_next(sg); ++ list_del(&page->lru); ++ } ++ } ++ } ++ + buffer->sg_table = table; ++ ++ ion_buffer_prep_noncached(buffer); ++ + return 0; + + free_table: +@@ -146,6 +200,11 @@ static int ion_system_heap_allocate(struct ion_heap *heap, + free_pages: + list_for_each_entry_safe(page, tmp_page, &pages, lru) + free_buffer_page(sys_heap, buffer, page); ++ ++ for (i = 0; i < 8; i++) { ++ list_for_each_entry_safe(page, tmp_page, &lists[i], lru) ++ free_buffer_page(sys_heap, buffer, page); ++ } + return -ENOMEM; + } + +@@ -160,7 +219,7 @@ static void ion_system_heap_free(struct ion_buffer *buffer) + + /* zero the buffer before goto page pool */ + if (!(buffer->private_flags & ION_PRIV_FLAG_SHRINKER_FREE)) +- ion_heap_buffer_zero(buffer); ++ ion_buffer_zero(buffer); + + for_each_sgtable_sg(table, sg, i) + free_buffer_page(sys_heap, buffer, sg_page(sg)); +@@ -203,14 +262,18 @@ static int ion_system_heap_shrink(struct ion_heap *heap, gfp_t gfp_mask, + return nr_total; + } + +-static struct ion_heap_ops system_heap_ops = { +- .allocate = ion_system_heap_allocate, +- .free = ion_system_heap_free, +- .map_kernel = ion_heap_map_kernel, +- .unmap_kernel = ion_heap_unmap_kernel, +- .map_user = ion_heap_map_user, +- .shrink = ion_system_heap_shrink, +-}; ++static long ion_system_get_pool_size(struct ion_heap *heap) ++{ ++ struct ion_system_heap *sys_heap; ++ long total_pages = 0; ++ int i; ++ ++ sys_heap = container_of(heap, struct ion_system_heap, heap); ++ for (i = 0; i < NUM_ORDERS; i++) ++ total_pages += ion_page_pool_nr_pages(sys_heap->pools[i]); ++ ++ return total_pages; ++} + + static void ion_system_heap_destroy_pools(struct ion_page_pool **pools) + { +@@ -245,133 +308,37 @@ static int ion_system_heap_create_pools(struct ion_page_pool **pools) + return -ENOMEM; + } + +-static struct ion_heap *__ion_system_heap_create(void) +-{ +- struct ion_system_heap *heap; +- +- heap = kzalloc(sizeof(*heap), GFP_KERNEL); +- if (!heap) +- return ERR_PTR(-ENOMEM); +- heap->heap.ops = &system_heap_ops; +- heap->heap.type = ION_HEAP_TYPE_SYSTEM; +- heap->heap.flags = ION_HEAP_FLAG_DEFER_FREE; +- +- if (ion_system_heap_create_pools(heap->pools)) +- goto free_heap; +- +- return &heap->heap; +- +-free_heap: +- kfree(heap); +- return ERR_PTR(-ENOMEM); +-} +- +-static int ion_system_heap_create(void) +-{ +- struct ion_heap *heap; +- +- heap = __ion_system_heap_create(); +- if (IS_ERR(heap)) +- return PTR_ERR(heap); +- heap->name = "ion_system_heap"; +- +- ion_device_add_heap(heap); +- +- return 0; +-} +-device_initcall(ion_system_heap_create); +- +-static int ion_system_contig_heap_allocate(struct ion_heap *heap, +- struct ion_buffer *buffer, +- unsigned long len, +- unsigned long flags) +-{ +- int order = get_order(len); +- struct page *page; +- struct sg_table *table; +- unsigned long i; +- int ret; +- +- page = alloc_pages(low_order_gfp_flags | __GFP_NOWARN, order); +- if (!page) +- return -ENOMEM; +- +- split_page(page, order); +- +- len = PAGE_ALIGN(len); +- for (i = len >> PAGE_SHIFT; i < (1 << order); i++) +- __free_page(page + i); ++static struct ion_heap_ops system_heap_ops = { ++ .allocate = ion_system_heap_allocate, ++ .free = ion_system_heap_free, ++ .shrink = ion_system_heap_shrink, ++ .get_pool_size = ion_system_get_pool_size, ++}; + +- table = kmalloc(sizeof(*table), GFP_KERNEL); +- if (!table) { +- ret = -ENOMEM; +- goto free_pages; ++static struct ion_system_heap system_heap = { ++ .heap = { ++ .ops = &system_heap_ops, ++ .type = ION_HEAP_TYPE_SYSTEM, ++ .flags = ION_HEAP_FLAG_DEFER_FREE, ++ .name = "ion_system_heap", + } +- +- ret = sg_alloc_table(table, 1, GFP_KERNEL); +- if (ret) +- goto free_table; +- +- sg_set_page(table->sgl, page, len, 0); +- +- buffer->sg_table = table; +- +- return 0; +- +-free_table: +- kfree(table); +-free_pages: +- for (i = 0; i < len >> PAGE_SHIFT; i++) +- __free_page(page + i); +- +- return ret; +-} +- +-static void ion_system_contig_heap_free(struct ion_buffer *buffer) +-{ +- struct sg_table *table = buffer->sg_table; +- struct page *page = sg_page(table->sgl); +- unsigned long pages = PAGE_ALIGN(buffer->size) >> PAGE_SHIFT; +- unsigned long i; +- +- for (i = 0; i < pages; i++) +- __free_page(page + i); +- sg_free_table(table); +- kfree(table); +-} +- +-static struct ion_heap_ops kmalloc_ops = { +- .allocate = ion_system_contig_heap_allocate, +- .free = ion_system_contig_heap_free, +- .map_kernel = ion_heap_map_kernel, +- .unmap_kernel = ion_heap_unmap_kernel, +- .map_user = ion_heap_map_user, + }; + +-static struct ion_heap *__ion_system_contig_heap_create(void) ++static int __init ion_system_heap_init(void) + { +- struct ion_heap *heap; +- +- heap = kzalloc(sizeof(*heap), GFP_KERNEL); +- if (!heap) +- return ERR_PTR(-ENOMEM); +- heap->ops = &kmalloc_ops; +- heap->type = ION_HEAP_TYPE_SYSTEM_CONTIG; +- heap->name = "ion_system_contig_heap"; ++ int ret = ion_system_heap_create_pools(system_heap.pools); ++ if (ret) ++ return ret; + +- return heap; ++ return ion_device_add_heap(&system_heap.heap); + } + +-static int ion_system_contig_heap_create(void) ++static void __exit ion_system_heap_exit(void) + { +- struct ion_heap *heap; +- +- heap = __ion_system_contig_heap_create(); +- if (IS_ERR(heap)) +- return PTR_ERR(heap); +- +- ion_device_add_heap(heap); +- +- return 0; ++ ion_device_remove_heap(&system_heap.heap); ++ ion_system_heap_destroy_pools(system_heap.pools); + } +-device_initcall(ion_system_contig_heap_create); ++ ++module_init(ion_system_heap_init); ++module_exit(ion_system_heap_exit); ++MODULE_LICENSE("GPL v2"); diff --git a/drivers/staging/android/ion/ion_trace.h b/drivers/staging/android/ion/ion_trace.h -new file mode 100755 +new file mode 100644 index 000000000000..eacb47d4f135 --- /dev/null +++ b/drivers/staging/android/ion/ion_trace.h @@ -1612531,7 +1612538,7 @@ index 000000000000..eacb47d4f135 +#define TRACE_INCLUDE_FILE ion_trace +#include diff --git a/drivers/staging/android/ion/rockchip/Makefile b/drivers/staging/android/ion/rockchip/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..89265fcbbe6f --- /dev/null +++ b/drivers/staging/android/ion/rockchip/Makefile @@ -1612540,7 +1612547,7 @@ index 000000000000..89265fcbbe6f +obj-y += rockchip_ion.o +obj-$(CONFIG_ION_ROCKCHIP_SNAPSHOT) += rockchip_ion_snapshot.o diff --git a/drivers/staging/android/ion/rockchip/rockchip_ion.c b/drivers/staging/android/ion/rockchip/rockchip_ion.c -new file mode 100755 +new file mode 100644 index 000000000000..d3c3d06856ad --- /dev/null +++ b/drivers/staging/android/ion/rockchip/rockchip_ion.c @@ -1612770,7 +1612777,7 @@ index 000000000000..d3c3d06856ad +MODULE_LICENSE("GPL v2"); +MODULE_DEVICE_TABLE(of, rk_ion_match); diff --git a/drivers/staging/android/ion/rockchip/rockchip_ion_snapshot.c b/drivers/staging/android/ion/rockchip/rockchip_ion_snapshot.c -new file mode 100755 +new file mode 100644 index 000000000000..ab27d05319ae --- /dev/null +++ b/drivers/staging/android/ion/rockchip/rockchip_ion_snapshot.c @@ -1614573,7 +1614580,7 @@ index aa9e0e31ef98..e1c667e8fe2a 100644 module_platform_driver(rockchip_thermal_driver); diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c -index dd449945e1e5..560b1b83d057 100644 +index 1cf49912dc96..f7b4f0c9491b 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -542,6 +542,7 @@ int thermal_zone_device_is_enabled(struct thermal_zone_device *tz) @@ -1614596,7 +1614603,7 @@ index 681209db42a8..5e80cb3264d9 100644 - #endif /* __THERMAL_CORE_H__ */ diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h -index 0771cd226581..fcbd557f3866 100644 +index 61b11490ae5b..437f50c20825 100644 --- a/drivers/tty/serial/8250/8250.h +++ b/drivers/tty/serial/8250/8250.h @@ -48,6 +48,9 @@ struct uart_8250_dma { @@ -1614609,7 +1614616,7 @@ index 0771cd226581..fcbd557f3866 100644 }; struct old_serial_port { -@@ -158,6 +161,9 @@ static inline bool serial8250_set_THRI(struct uart_8250_port *up) +@@ -157,6 +160,9 @@ static inline bool serial8250_set_THRI(struct uart_8250_port *up) if (up->ier & UART_IER_THRI) return false; up->ier |= UART_IER_THRI; @@ -1614619,7 +1614626,7 @@ index 0771cd226581..fcbd557f3866 100644 serial_out(up, UART_IER, up->ier); return true; } -@@ -327,6 +333,9 @@ static inline int is_omap1510_8250(struct uart_8250_port *pt) +@@ -326,6 +332,9 @@ static inline int is_omap1510_8250(struct uart_8250_port *pt) #ifdef CONFIG_SERIAL_8250_DMA extern int serial8250_tx_dma(struct uart_8250_port *); extern int serial8250_rx_dma(struct uart_8250_port *); @@ -1614629,7 +1614636,7 @@ index 0771cd226581..fcbd557f3866 100644 extern void serial8250_rx_dma_flush(struct uart_8250_port *); extern int serial8250_request_dma(struct uart_8250_port *); extern void serial8250_release_dma(struct uart_8250_port *); -@@ -346,6 +355,12 @@ static inline int serial8250_rx_dma(struct uart_8250_port *p) +@@ -345,6 +354,12 @@ static inline int serial8250_rx_dma(struct uart_8250_port *p) { return -1; } @@ -1615167,10 +1615174,10 @@ index ace221afeb03..c5bba750fcbc 100644 return 0; } diff --git a/drivers/tty/serial/8250/8250_dwlib.c b/drivers/tty/serial/8250/8250_dwlib.c -index 6d6a78eead3e..fee4f2933919 100644 +index 1cf229cca592..da65f0658bbf 100644 --- a/drivers/tty/serial/8250/8250_dwlib.c +++ b/drivers/tty/serial/8250/8250_dwlib.c -@@ -106,6 +106,15 @@ void dw8250_setup_port(struct uart_port *p) +@@ -108,6 +108,15 @@ void dw8250_setup_port(struct uart_port *p) } reg = dw8250_readl_ext(p, DW_UART_CPR); @@ -1615186,7 +1615193,7 @@ index 6d6a78eead3e..fee4f2933919 100644 if (!reg) return; -@@ -114,6 +123,9 @@ void dw8250_setup_port(struct uart_port *p) +@@ -116,6 +125,9 @@ void dw8250_setup_port(struct uart_port *p) p->type = PORT_16550A; p->flags |= UPF_FIXED_TYPE; p->fifosize = DW_UART_CPR_FIFO_SIZE(reg); @@ -1615197,7 +1615204,7 @@ index 6d6a78eead3e..fee4f2933919 100644 } diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c -index b19908779e3b..aa4f2f1eccda 100644 +index 8b49ac4856d2..25ce3e58c824 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -1538,8 +1538,13 @@ static inline void __start_tx(struct uart_port *port) @@ -1615263,7 +1615270,7 @@ index b19908779e3b..aa4f2f1eccda 100644 /* * If port is stopped and there are no error conditions in the * FIFO, then don't drain the FIFO, as this may lead to TTY buffer -@@ -1919,11 +1944,34 @@ int serial8250_handle_irq(struct uart_port *port, unsigned int iir) +@@ -1922,11 +1947,34 @@ int serial8250_handle_irq(struct uart_port *port, unsigned int iir) if (!up->dma || handle_rx_dma(up, iir)) status = serial8250_rx_chars(up, status); } @@ -1615300,7 +1615307,7 @@ index b19908779e3b..aa4f2f1eccda 100644 uart_unlock_and_check_sysrq(port, flags); return 1; } -@@ -2403,7 +2451,11 @@ int serial8250_do_startup(struct uart_port *port) +@@ -2406,7 +2454,11 @@ int serial8250_do_startup(struct uart_port *port) if (uart_console(port)) msg = "forbid DMA for kernel console"; else if (serial8250_request_dma(up)) @@ -1615341,7 +1615348,7 @@ index b19908779e3b..aa4f2f1eccda 100644 } EXPORT_SYMBOL_GPL(serial8250_do_set_divisor); -@@ -2795,6 +2862,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2794,6 +2861,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, if ((termios->c_cflag & CREAD) == 0) port->ignore_status_mask |= UART_LSR_DR; @@ -1615349,7 +1615356,7 @@ index b19908779e3b..aa4f2f1eccda 100644 /* * CTS flow control flag and modem status interrupts */ -@@ -2808,6 +2876,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2807,6 +2875,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, up->ier |= UART_IER_RTOIE; serial_port_out(port, UART_IER, up->ier); @@ -1615357,7 +1615364,7 @@ index b19908779e3b..aa4f2f1eccda 100644 if (up->capabilities & UART_CAP_EFR) { unsigned char efr = 0; -@@ -2826,16 +2895,25 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2825,16 +2894,25 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, serial_port_out(port, UART_EFR, efr); } @@ -1615385,7 +1615392,7 @@ index b19908779e3b..aa4f2f1eccda 100644 if (port->type != PORT_16750) { /* emulated UARTs (Lucent Venus 167x) need two steps */ if (up->fcr & UART_FCR_ENABLE_FIFO) -@@ -2843,6 +2921,23 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2842,6 +2920,23 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, serial_port_out(port, UART_FCR, up->fcr); /* set fcr */ } serial8250_set_mctrl(port, port->mctrl); @@ -1615422,12 +1615429,10 @@ index aa0026a9839c..379fe28f0f63 100644 return; diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -old mode 100644 -new mode 100755 -index 580604596499..bc1d3385e790 +index 6d334bb5bb33..0b68175e0a62 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -1832,7 +1832,8 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) +@@ -1852,7 +1852,8 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) * bus_resume methods. */ if (hdev->parent) { /* normal device */ @@ -1615437,7 +1615442,7 @@ index 580604596499..bc1d3385e790 } else { /* root hub */ const struct hc_driver *drv = bus_to_hcd(hdev->bus)->driver; -@@ -5396,7 +5397,8 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus, +@@ -5506,7 +5507,8 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus, done: hub_port_disable(hub, port1, 1); if (hcd->driver->relinquish_port && !hub->hdev->parent) { @@ -1615448,7 +1615453,7 @@ index 580604596499..bc1d3385e790 } } diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c -index 4ac1c22f13be..16befba71a79 100644 +index 856947620f14..701e6ce38f4c 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -322,6 +322,10 @@ static const struct usb_device_id usb_quirk_list[] = { @@ -1615474,9 +1615479,7 @@ index 4ac1c22f13be..16befba71a79 100644 { USB_DEVICE(0x0c45, 0x7056), .driver_info = USB_QUIRK_IGNORE_REMOTE_WAKEUP }, diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h -old mode 100644 -new mode 100755 -index 03d16a08261d..9bb4b8994f5c +index 03d16a08261d..9bb4b8994f5c 100644 --- a/drivers/usb/dwc2/core.h +++ b/drivers/usb/dwc2/core.h @@ -1061,6 +1061,7 @@ struct dwc2_hsotg { @@ -1615498,9 +1615501,7 @@ index 03d16a08261d..9bb4b8994f5c int dwc2_hsotg_wait_bit_set(struct dwc2_hsotg *hs_otg, u32 reg, u32 bit, u32 timeout); diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c -old mode 100644 -new mode 100755 -index da0df69cc234..1b3dbb880008 +index da0df69cc234..1b3dbb880008 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -4529,6 +4529,14 @@ static int dwc2_hsotg_udc_start(struct usb_gadget *gadget, @@ -1615531,9 +1615532,7 @@ index da0df69cc234..1b3dbb880008 } diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c -old mode 100644 -new mode 100755 -index 9279d3d3698c..76ef2f024478 +index 14925fedb01a..b058764cb099 100644 --- a/drivers/usb/dwc2/hcd.c +++ b/drivers/usb/dwc2/hcd.c @@ -812,11 +812,13 @@ void dwc2_hc_halt(struct dwc2_hsotg *hsotg, struct dwc2_host_chan *chan, @@ -1615657,9 +1615656,7 @@ index 9279d3d3698c..76ef2f024478 * Finish generic HCD initialization and start the HCD. This function * allocates the DMA buffer pool, registers the USB bus, requests the diff --git a/drivers/usb/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c -old mode 100644 -new mode 100755 -index d5f4ec1b73b1..4989ec761667 +index 08e2792cb732..785ca412a0c8 100644 --- a/drivers/usb/dwc2/hcd_intr.c +++ b/drivers/usb/dwc2/hcd_intr.c @@ -1180,7 +1180,10 @@ static void dwc2_update_urb_state_abn(struct dwc2_hsotg *hsotg, @@ -1615675,9 +1615672,7 @@ index d5f4ec1b73b1..4989ec761667 urb->actual_length += xfer_length; diff --git a/drivers/usb/dwc2/hcd_queue.c b/drivers/usb/dwc2/hcd_queue.c -old mode 100644 -new mode 100755 -index 94af71e9856f..b2e0721a3eb8 +index 94af71e9856f..b2e0721a3eb8 100644 --- a/drivers/usb/dwc2/hcd_queue.c +++ b/drivers/usb/dwc2/hcd_queue.c @@ -730,8 +730,14 @@ static int dwc2_uframe_schedule_split(struct dwc2_hsotg *hsotg, @@ -1615697,9 +1615692,7 @@ index 94af71e9856f..b2e0721a3eb8 while (ls_search_slice < DWC2_LS_SCHEDULE_SLICES) { int start_s_uframe; diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c -old mode 100644 -new mode 100755 -index 267543c3dc38..195cca1fe3c6 +index 267543c3dc38..195cca1fe3c6 100644 --- a/drivers/usb/dwc2/params.c +++ b/drivers/usb/dwc2/params.c @@ -90,6 +90,8 @@ static void dwc2_set_rk_params(struct dwc2_hsotg *hsotg) @@ -1615736,9 +1615729,7 @@ index 267543c3dc38..195cca1fe3c6 const struct of_device_id dwc2_of_match_table[] = { diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c -old mode 100644 -new mode 100755 -index 9d0dd09a2015..74c2ff080f3e +index 9d0dd09a2015..74c2ff080f3e 100644 --- a/drivers/usb/dwc2/platform.c +++ b/drivers/usb/dwc2/platform.c @@ -121,6 +121,74 @@ static int dwc2_get_dr_mode(struct dwc2_hsotg *hsotg) @@ -1615926,9 +1615917,7 @@ index 9d0dd09a2015..74c2ff080f3e ret = dwc2_hsotg_resume(dwc2); diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig -old mode 100644 -new mode 100755 -index 7a2304565a73..2133acf8ee69 +index 7a2304565a73..2133acf8ee69 100644 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -139,4 +139,14 @@ config USB_DWC3_QCOM @@ -1615947,9 +1615936,7 @@ index 7a2304565a73..2133acf8ee69 + endif diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile -old mode 100644 -new mode 100755 -index ae86da0dc5bd..2259f8876fb2 +index ae86da0dc5bd..2259f8876fb2 100644 --- a/drivers/usb/dwc3/Makefile +++ b/drivers/usb/dwc3/Makefile @@ -51,3 +51,4 @@ obj-$(CONFIG_USB_DWC3_MESON_G12A) += dwc3-meson-g12a.o @@ -1615958,9 +1615945,7 @@ index ae86da0dc5bd..2259f8876fb2 obj-$(CONFIG_USB_DWC3_QCOM) += dwc3-qcom.o +obj-$(CONFIG_USB_DWC3_IMX8MP) += dwc3-imx8mp.o diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c -old mode 100644 -new mode 100755 -index 5709b959b1d9..922247b818b4 +index 214a8ff2d69c..12129a197e9b 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -119,6 +119,7 @@ static void __dwc3_set_mode(struct work_struct *work) @@ -1616038,7 +1616023,7 @@ index 5709b959b1d9..922247b818b4 /* * We're resetting only the device side because, if we're in host mode, -@@ -305,6 +350,9 @@ int dwc3_core_soft_reset(struct dwc3 *dwc) +@@ -342,6 +387,9 @@ int dwc3_core_soft_reset(struct dwc3 *dwc) udelay(1); } while (--retries); @@ -1616048,7 +1616033,7 @@ index 5709b959b1d9..922247b818b4 return -ETIMEDOUT; done: -@@ -562,6 +610,9 @@ static void dwc3_cache_hwparams(struct dwc3 *dwc) +@@ -599,6 +647,9 @@ static void dwc3_cache_hwparams(struct dwc3 *dwc) parms->hwparams6 = dwc3_readl(dwc->regs, DWC3_GHWPARAMS6); parms->hwparams7 = dwc3_readl(dwc->regs, DWC3_GHWPARAMS7); parms->hwparams8 = dwc3_readl(dwc->regs, DWC3_GHWPARAMS8); @@ -1616058,7 +1616043,7 @@ index 5709b959b1d9..922247b818b4 } static int dwc3_core_ulpi_init(struct dwc3 *dwc) -@@ -977,21 +1028,9 @@ static int dwc3_core_init(struct dwc3 *dwc) +@@ -1014,21 +1065,9 @@ static int dwc3_core_init(struct dwc3 *dwc) dwc->phys_ready = true; } @@ -1616081,7 +1616066,7 @@ index 5709b959b1d9..922247b818b4 if (hw_mode == DWC3_GHWPARAMS0_MODE_DRD && !DWC3_VER_IS_WITHIN(DWC3, ANY, 194A)) { -@@ -1057,12 +1096,25 @@ static int dwc3_core_init(struct dwc3 *dwc) +@@ -1094,12 +1133,25 @@ static int dwc3_core_init(struct dwc3 *dwc) if (!DWC3_VER_IS_PRIOR(DWC3, 290A)) reg |= DWC3_GUCTL1_DEV_L1_EXIT_BY_HW; @@ -1616107,7 +1616092,7 @@ index 5709b959b1d9..922247b818b4 dwc3_writel(dwc->regs, DWC3_GUCTL1, reg); } -@@ -1162,11 +1214,8 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) +@@ -1183,11 +1235,8 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) ret = PTR_ERR(dwc->usb2_phy); if (ret == -ENXIO || ret == -ENODEV) { dwc->usb2_phy = NULL; @@ -1616120,7 +1616105,7 @@ index 5709b959b1d9..922247b818b4 } } -@@ -1174,11 +1223,8 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) +@@ -1195,11 +1244,8 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) ret = PTR_ERR(dwc->usb3_phy); if (ret == -ENXIO || ret == -ENODEV) { dwc->usb3_phy = NULL; @@ -1616133,7 +1616118,7 @@ index 5709b959b1d9..922247b818b4 } } -@@ -1187,11 +1233,8 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) +@@ -1208,11 +1254,8 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) ret = PTR_ERR(dwc->usb2_generic_phy); if (ret == -ENOSYS || ret == -ENODEV) { dwc->usb2_generic_phy = NULL; @@ -1616146,7 +1616131,7 @@ index 5709b959b1d9..922247b818b4 } } -@@ -1200,11 +1243,8 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) +@@ -1221,11 +1264,8 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) ret = PTR_ERR(dwc->usb3_generic_phy); if (ret == -ENOSYS || ret == -ENODEV) { dwc->usb3_generic_phy = NULL; @@ -1616159,7 +1616144,7 @@ index 5709b959b1d9..922247b818b4 } } -@@ -1226,11 +1266,8 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) +@@ -1247,11 +1287,8 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) phy_set_mode(dwc->usb3_generic_phy, PHY_MODE_USB_DEVICE); ret = dwc3_gadget_init(dwc); @@ -1616173,7 +1616158,7 @@ index 5709b959b1d9..922247b818b4 break; case USB_DR_MODE_HOST: dwc3_set_prtcap(dwc, DWC3_GCTL_PRTCAP_HOST); -@@ -1241,20 +1278,14 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) +@@ -1262,20 +1299,14 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) phy_set_mode(dwc->usb3_generic_phy, PHY_MODE_USB_HOST); ret = dwc3_host_init(dwc); @@ -1616198,7 +1616183,7 @@ index 5709b959b1d9..922247b818b4 break; default: dev_err(dev, "Unsupported mode of operation %d\n", dwc->dr_mode); -@@ -1295,6 +1326,9 @@ static void dwc3_get_properties(struct dwc3 *dwc) +@@ -1316,6 +1347,9 @@ static void dwc3_get_properties(struct dwc3 *dwc) u8 rx_max_burst_prd = 0; u8 tx_thr_num_pkt_prd = 0; u8 tx_max_burst_prd = 0; @@ -1616208,7 +1616193,7 @@ index 5709b959b1d9..922247b818b4 /* default to highest possible threshold */ lpm_nyet_threshold = 0xf; -@@ -1308,7 +1342,15 @@ static void dwc3_get_properties(struct dwc3 *dwc) +@@ -1329,7 +1363,15 @@ static void dwc3_get_properties(struct dwc3 *dwc) */ hird_threshold = 12; @@ -1616224,7 +1616209,7 @@ index 5709b959b1d9..922247b818b4 dwc->dr_mode = usb_get_dr_mode(dev); dwc->hsphy_mode = of_usb_get_phy_mode(dev->of_node); -@@ -1319,6 +1361,13 @@ static void dwc3_get_properties(struct dwc3 *dwc) +@@ -1340,6 +1382,13 @@ static void dwc3_get_properties(struct dwc3 *dwc) else dwc->sysdev = dwc->dev; @@ -1616238,7 +1616223,7 @@ index 5709b959b1d9..922247b818b4 dwc->has_lpm_erratum = device_property_read_bool(dev, "snps,has-lpm-erratum"); device_property_read_u8(dev, "snps,lpm-nyet-threshold", -@@ -1343,6 +1392,11 @@ static void dwc3_get_properties(struct dwc3 *dwc) +@@ -1364,6 +1413,11 @@ static void dwc3_get_properties(struct dwc3 *dwc) &tx_thr_num_pkt_prd); device_property_read_u8(dev, "snps,tx-max-burst-prd", &tx_max_burst_prd); @@ -1616250,7 +1616235,7 @@ index 5709b959b1d9..922247b818b4 dwc->disable_scramble_quirk = device_property_read_bool(dev, "snps,disable_scramble_quirk"); -@@ -1408,6 +1462,8 @@ static void dwc3_get_properties(struct dwc3 *dwc) +@@ -1429,6 +1483,8 @@ static void dwc3_get_properties(struct dwc3 *dwc) dwc->tx_max_burst_prd = tx_max_burst_prd; dwc->imod_interval = 0; @@ -1616259,7 +1616244,7 @@ index 5709b959b1d9..922247b818b4 } /* check whether the core supports IMOD */ -@@ -1482,21 +1538,59 @@ static void dwc3_check_params(struct dwc3 *dwc) +@@ -1503,21 +1559,59 @@ static void dwc3_check_params(struct dwc3 *dwc) } break; } @@ -1616321,7 +1616306,7 @@ index 5709b959b1d9..922247b818b4 dwc->dev = dev; -@@ -1528,7 +1622,7 @@ static int dwc3_probe(struct platform_device *pdev) +@@ -1549,7 +1643,7 @@ static int dwc3_probe(struct platform_device *pdev) dwc3_get_properties(dwc); @@ -1616330,7 +1616315,7 @@ index 5709b959b1d9..922247b818b4 if (IS_ERR(dwc->reset)) return PTR_ERR(dwc->reset); -@@ -1592,8 +1686,7 @@ static int dwc3_probe(struct platform_device *pdev) +@@ -1613,8 +1707,7 @@ static int dwc3_probe(struct platform_device *pdev) ret = dwc3_core_init(dwc); if (ret) { @@ -1616340,7 +1616325,7 @@ index 5709b959b1d9..922247b818b4 goto err4; } -@@ -1604,7 +1697,17 @@ static int dwc3_probe(struct platform_device *pdev) +@@ -1625,7 +1718,17 @@ static int dwc3_probe(struct platform_device *pdev) if (ret) goto err5; @@ -1616357,9 +1616342,9 @@ index 5709b959b1d9..922247b818b4 + pm_runtime_put(dev); + } - return 0; + dma_set_max_seg_size(dev, UINT_MAX); -@@ -1640,6 +1743,9 @@ static int dwc3_probe(struct platform_device *pdev) +@@ -1663,6 +1766,9 @@ static int dwc3_probe(struct platform_device *pdev) assert_reset: reset_control_assert(dwc->reset); @@ -1616369,7 +1616354,7 @@ index 5709b959b1d9..922247b818b4 return ret; } -@@ -1663,6 +1769,9 @@ static int dwc3_remove(struct platform_device *pdev) +@@ -1686,6 +1792,9 @@ static int dwc3_remove(struct platform_device *pdev) dwc3_free_event_buffers(dwc); dwc3_free_scratch_buffers(dwc); @@ -1616379,7 +1616364,7 @@ index 5709b959b1d9..922247b818b4 return 0; } -@@ -1847,7 +1956,7 @@ static int dwc3_runtime_suspend(struct device *dev) +@@ -1870,7 +1979,7 @@ static int dwc3_runtime_suspend(struct device *dev) if (ret) return ret; @@ -1616388,7 +1616373,7 @@ index 5709b959b1d9..922247b818b4 return 0; } -@@ -1857,7 +1966,7 @@ static int dwc3_runtime_resume(struct device *dev) +@@ -1880,7 +1989,7 @@ static int dwc3_runtime_resume(struct device *dev) struct dwc3 *dwc = dev_get_drvdata(dev); int ret; @@ -1616397,7 +1616382,7 @@ index 5709b959b1d9..922247b818b4 ret = dwc3_resume_common(dwc, PMSG_AUTO_RESUME); if (ret) -@@ -1906,6 +2015,9 @@ static int dwc3_suspend(struct device *dev) +@@ -1929,6 +2038,9 @@ static int dwc3_suspend(struct device *dev) struct dwc3 *dwc = dev_get_drvdata(dev); int ret; @@ -1616407,7 +1616392,7 @@ index 5709b959b1d9..922247b818b4 ret = dwc3_suspend_common(dwc, PMSG_SUSPEND); if (ret) return ret; -@@ -1920,6 +2032,9 @@ static int dwc3_resume(struct device *dev) +@@ -1943,6 +2055,9 @@ static int dwc3_resume(struct device *dev) struct dwc3 *dwc = dev_get_drvdata(dev); int ret; @@ -1616418,9 +1616403,7 @@ index 5709b959b1d9..922247b818b4 ret = dwc3_resume_common(dwc, PMSG_RESUME); diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h -old mode 100644 -new mode 100755 -index cbebe541f7e8..6de6e689265c +index 291893d27429..a1174bd0f6d8 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -31,6 +31,8 @@ @@ -1616449,8 +1616432,8 @@ index cbebe541f7e8..6de6e689265c /* Device Registers */ #define DWC3_DCFG 0xc700 -@@ -253,9 +256,11 @@ - #define DWC3_GUCTL_HSTINAUTORETRY BIT(14) +@@ -250,9 +253,11 @@ + #define DWC3_GCTL_DSBLCLKGTNG BIT(0) /* Global User Control 1 Register */ -#define DWC3_GUCTL1_PARKMODE_DISABLE_SS BIT(17) @@ -1616463,7 +1616446,7 @@ index cbebe541f7e8..6de6e689265c /* Global Status Register */ #define DWC3_GSTS_OTG_IP BIT(10) -@@ -376,6 +381,9 @@ +@@ -373,6 +378,9 @@ #define DWC3_GHWPARAMS7_RAM1_DEPTH(n) ((n) & 0xffff) #define DWC3_GHWPARAMS7_RAM2_DEPTH(n) (((n) >> 16) & 0xffff) @@ -1616473,7 +1616456,7 @@ index cbebe541f7e8..6de6e689265c /* Global Frame Length Adjustment Register */ #define DWC3_GFLADJ_30MHZ_SDBND_SEL BIT(7) #define DWC3_GFLADJ_30MHZ_MASK 0x3f -@@ -387,6 +395,8 @@ +@@ -384,6 +392,8 @@ #define DWC3_GUCTL3_SPLITDISABLE BIT(14) /* Device Configuration Register */ @@ -1616482,7 +1616465,7 @@ index cbebe541f7e8..6de6e689265c #define DWC3_DCFG_DEVADDR(addr) ((addr) << 3) #define DWC3_DCFG_DEVADDR_MASK DWC3_DCFG_DEVADDR(0x7f) -@@ -401,6 +411,7 @@ +@@ -398,6 +408,7 @@ #define DWC3_DCFG_NUMP(n) (((n) >> DWC3_DCFG_NUMP_SHIFT) & 0x1f) #define DWC3_DCFG_NUMP_MASK (0x1f << DWC3_DCFG_NUMP_SHIFT) #define DWC3_DCFG_LPM_CAP BIT(22) @@ -1616490,7 +1616473,7 @@ index cbebe541f7e8..6de6e689265c /* Device Control Register */ #define DWC3_DCTL_RUN_STOP BIT(31) -@@ -452,7 +463,7 @@ +@@ -449,7 +460,7 @@ #define DWC3_DEVTEN_CMDCMPLTEN BIT(10) #define DWC3_DEVTEN_ERRTICERREN BIT(9) #define DWC3_DEVTEN_SOFEN BIT(7) @@ -1616499,7 +1616482,7 @@ index cbebe541f7e8..6de6e689265c #define DWC3_DEVTEN_HIBERNATIONREQEVTEN BIT(5) #define DWC3_DEVTEN_WKUPEVTEN BIT(4) #define DWC3_DEVTEN_ULSTCNGEN BIT(3) -@@ -460,6 +471,8 @@ +@@ -457,6 +468,8 @@ #define DWC3_DEVTEN_USBRSTEN BIT(1) #define DWC3_DEVTEN_DISCONNEVTEN BIT(0) @@ -1616508,7 +1616491,7 @@ index cbebe541f7e8..6de6e689265c /* Device Status Register */ #define DWC3_DSTS_DCNRD BIT(29) -@@ -713,6 +726,7 @@ struct dwc3_ep { +@@ -710,6 +723,7 @@ struct dwc3_ep { #define DWC3_EP_FORCE_RESTART_STREAM BIT(9) #define DWC3_EP_FIRST_STREAM_PRIMED BIT(10) #define DWC3_EP_PENDING_CLEAR_STALL BIT(11) @@ -1616516,7 +1616499,7 @@ index cbebe541f7e8..6de6e689265c /* This last one is specific to EP0 */ #define DWC3_EP0_DIR_IN BIT(31) -@@ -852,13 +866,12 @@ struct dwc3_hwparams { +@@ -849,13 +863,12 @@ struct dwc3_hwparams { u32 hwparams6; u32 hwparams7; u32 hwparams8; @@ -1616531,7 +1616514,7 @@ index cbebe541f7e8..6de6e689265c /* HWPARAMS1 */ #define DWC3_NUM_INT(n) (((n) & (0x3f << 15)) >> 15) -@@ -905,11 +918,13 @@ struct dwc3_request { +@@ -902,11 +915,13 @@ struct dwc3_request { unsigned int remaining; unsigned int status; @@ -1616550,7 +1616533,7 @@ index cbebe541f7e8..6de6e689265c u8 epnum; struct dwc3_trb *trb; -@@ -1123,6 +1138,12 @@ struct dwc3 { +@@ -1120,6 +1135,12 @@ struct dwc3 { enum usb_phy_interface hsphy_mode; struct usb_role_switch *role_sw; enum usb_dr_mode role_switch_default_mode; @@ -1616563,7 +1616546,7 @@ index cbebe541f7e8..6de6e689265c u32 fladj; u32 irq_gadget; -@@ -1133,6 +1154,9 @@ struct dwc3 { +@@ -1130,6 +1151,9 @@ struct dwc3 { u32 nr_scratch; u32 u1u2; u32 maximum_speed; @@ -1616573,7 +1616556,7 @@ index cbebe541f7e8..6de6e689265c u32 ip; -@@ -1215,6 +1239,7 @@ struct dwc3 { +@@ -1212,6 +1236,7 @@ struct dwc3 { u8 rx_max_burst_prd; u8 tx_thr_num_pkt_prd; u8 tx_max_burst_prd; @@ -1616581,7 +1616564,7 @@ index cbebe541f7e8..6de6e689265c const char *hsphy_interface; -@@ -1229,6 +1254,7 @@ struct dwc3 { +@@ -1226,6 +1251,7 @@ struct dwc3 { unsigned is_utmi_l1_suspend:1; unsigned is_fpga:1; unsigned pending_events:1; @@ -1616589,7 +1616572,7 @@ index cbebe541f7e8..6de6e689265c unsigned pullups_connected:1; unsigned setup_packet_pending:1; unsigned three_stage_setup:1; -@@ -1262,8 +1288,24 @@ struct dwc3 { +@@ -1259,8 +1285,24 @@ struct dwc3 { unsigned dis_metastability_quirk:1; unsigned dis_split_quirk:1; @@ -1616614,7 +1616597,7 @@ index cbebe541f7e8..6de6e689265c }; #define INCRX_BURST_MODE 0 -@@ -1453,6 +1495,23 @@ u32 dwc3_core_fifo_space(struct dwc3_ep *dep, u8 type); +@@ -1450,6 +1492,23 @@ u32 dwc3_core_fifo_space(struct dwc3_ep *dep, u8 type); (!(_ip##_VERSIONTYPE_##_to) || \ dwc->version_type <= _ip##_VERSIONTYPE_##_to)) @@ -1616638,7 +1616621,7 @@ index cbebe541f7e8..6de6e689265c bool dwc3_has_imod(struct dwc3 *dwc); int dwc3_event_buffers_setup(struct dwc3 *dwc); -@@ -1480,6 +1539,8 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned int cmd, +@@ -1477,6 +1536,8 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned int cmd, struct dwc3_gadget_ep_cmd_params *params); int dwc3_send_gadget_generic_command(struct dwc3 *dwc, unsigned int cmd, u32 param); @@ -1616647,7 +1616630,7 @@ index cbebe541f7e8..6de6e689265c #else static inline int dwc3_gadget_init(struct dwc3 *dwc) { return 0; } -@@ -1499,6 +1560,11 @@ static inline int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned int cmd, +@@ -1496,6 +1557,11 @@ static inline int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned int cmd, static inline int dwc3_send_gadget_generic_command(struct dwc3 *dwc, int cmd, u32 param) { return 0; } @@ -1616660,9 +1616643,7 @@ index cbebe541f7e8..6de6e689265c #if IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE) diff --git a/drivers/usb/dwc3/debug.h b/drivers/usb/dwc3/debug.h -old mode 100644 -new mode 100755 -index 74d9c2c38193..b2aa7272f5de +index 74d9c2c38193..b2aa7272f5de 100644 --- a/drivers/usb/dwc3/debug.h +++ b/drivers/usb/dwc3/debug.h @@ -221,8 +221,8 @@ static inline const char *dwc3_gadget_event_string(char *str, size_t size, @@ -1616688,9 +1616669,7 @@ index 74d9c2c38193..b2aa7272f5de return "Start of Frame"; case DWC3_DEVICE_EVENT_ERRATIC_ERROR: diff --git a/drivers/usb/dwc3/debugfs.c b/drivers/usb/dwc3/debugfs.c -old mode 100644 -new mode 100755 -index da8b62db49fb..f0f04d7b10ea +index da8b62db49fb..f0f04d7b10ea 100644 --- a/drivers/usb/dwc3/debugfs.c +++ b/drivers/usb/dwc3/debugfs.c @@ -454,6 +454,10 @@ static ssize_t dwc3_mode_write(struct file *file, @@ -1616745,9 +1616724,7 @@ index da8b62db49fb..f0f04d7b10ea val *= mdwidth; val >>= 3; diff --git a/drivers/usb/dwc3/drd.c b/drivers/usb/dwc3/drd.c -old mode 100644 -new mode 100755 -index 0a96f44ccca7..347795a8b3c1 +index 8bcfbb29ce70..9d549730edb1 100644 --- a/drivers/usb/dwc3/drd.c +++ b/drivers/usb/dwc3/drd.c @@ -420,6 +420,12 @@ static void dwc3_drd_update(struct dwc3 *dwc) @@ -1616832,7 +1616809,7 @@ index 0a96f44ccca7..347795a8b3c1 case USB_ROLE_HOST: mode = DWC3_GCTL_PRTCAP_HOST; diff --git a/drivers/usb/dwc3/dwc3-imx8mp.c b/drivers/usb/dwc3/dwc3-imx8mp.c -new file mode 100755 +new file mode 100644 index 000000000000..84c1a4ac2444 --- /dev/null +++ b/drivers/usb/dwc3/dwc3-imx8mp.c @@ -1617202,9 +1617179,7 @@ index 000000000000..84c1a4ac2444 +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("DesignWare USB3 imx8mp Glue Layer"); diff --git a/drivers/usb/dwc3/dwc3-keystone.c b/drivers/usb/dwc3/dwc3-keystone.c -old mode 100644 -new mode 100755 -index 9a99253d5ba3..057056c0975e +index 9a99253d5ba3..057056c0975e 100644 --- a/drivers/usb/dwc3/dwc3-keystone.c +++ b/drivers/usb/dwc3/dwc3-keystone.c @@ -99,13 +99,8 @@ static int kdwc3_probe(struct platform_device *pdev) @@ -1617224,9 +1617199,7 @@ index 9a99253d5ba3..057056c0975e phy_pm_runtime_get_sync(kdwc->usb3_phy); diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c -old mode 100644 -new mode 100755 -index a5a8c5712bce..73c20a93208e +index 9f420cc8d7c7..a431747bb26f 100644 --- a/drivers/usb/dwc3/dwc3-pci.c +++ b/drivers/usb/dwc3/dwc3-pci.c @@ -40,7 +40,9 @@ @@ -1617258,7 +1617231,7 @@ index a5a8c5712bce..73c20a93208e static int dwc3_pci_quirks(struct dwc3_pci *dwc) { struct pci_dev *pdev = dwc->pci; -@@ -225,7 +239,6 @@ static void dwc3_pci_resume_work(struct work_struct *work) +@@ -227,7 +241,6 @@ static void dwc3_pci_resume_work(struct work_struct *work) static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) { @@ -1617266,7 +1617239,7 @@ index a5a8c5712bce..73c20a93208e struct dwc3_pci *dwc; struct resource res[2]; int ret; -@@ -268,7 +281,7 @@ static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) +@@ -270,7 +283,7 @@ static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) dwc->dwc3->dev.parent = dev; ACPI_COMPANION_SET(&dwc->dwc3->dev, ACPI_COMPANION(dev)); @@ -1617275,7 +1617248,7 @@ index a5a8c5712bce..73c20a93208e if (ret < 0) goto err; -@@ -291,6 +304,7 @@ static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) +@@ -293,6 +306,7 @@ static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) return 0; err: @@ -1617283,7 +1617256,7 @@ index a5a8c5712bce..73c20a93208e platform_device_put(dwc->dwc3); return ret; } -@@ -307,75 +321,82 @@ static void dwc3_pci_remove(struct pci_dev *pci) +@@ -309,75 +323,82 @@ static void dwc3_pci_remove(struct pci_dev *pci) #endif device_init_wakeup(&pci->dev, false); pm_runtime_get(&pci->dev); @@ -1617389,12 +1617362,10 @@ index a5a8c5712bce..73c20a93208e }; MODULE_DEVICE_TABLE(pci, dwc3_pci_id_table); diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c -old mode 100644 -new mode 100755 -index 416c94c612f5..ec51e2859d6e +index 568973582b75..d93dde9b1e85 100644 --- a/drivers/usb/dwc3/dwc3-qcom.c +++ b/drivers/usb/dwc3/dwc3-qcom.c -@@ -678,6 +678,20 @@ static int dwc3_qcom_of_register_core(struct platform_device *pdev) +@@ -687,6 +687,20 @@ static int dwc3_qcom_of_register_core(struct platform_device *pdev) return -ENODEV; } @@ -1617416,9 +1617387,7 @@ index 416c94c612f5..ec51e2859d6e if (ret) { dev_err(dev, "failed to register dwc3 core - %d\n", ret); diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c -old mode 100644 -new mode 100755 -index 3cd294264372..658739410992 +index 3cd294264372..658739410992 100644 --- a/drivers/usb/dwc3/ep0.c +++ b/drivers/usb/dwc3/ep0.c @@ -597,11 +597,13 @@ static int dwc3_ep0_set_address(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl) @@ -1617449,9 +1617418,7 @@ index 3cd294264372..658739410992 /* if the cfg matches and the cfg is non zero */ if (cfg && (!ret || (ret == USB_GADGET_DELAYED_STATUS))) { diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c -old mode 100644 -new mode 100755 -index 076032128c34..18f7712010da +index c403966f09c5..4aa6f907661f 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -418,6 +418,7 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned int cmd, @@ -1618302,7 +1618269,7 @@ index 076032128c34..18f7712010da /* It changed to be suspend event for version 2.30a and above */ if (!DWC3_VER_IS_PRIOR(DWC3, 230A)) { /* -@@ -3980,6 +4369,7 @@ int dwc3_gadget_init(struct dwc3 *dwc) +@@ -3986,6 +4375,7 @@ int dwc3_gadget_init(struct dwc3 *dwc) dev->platform_data = dwc; dwc->gadget->ops = &dwc3_gadget_ops; dwc->gadget->speed = USB_SPEED_UNKNOWN; @@ -1618310,7 +1618277,7 @@ index 076032128c34..18f7712010da dwc->gadget->sg_supported = true; dwc->gadget->name = "dwc3-gadget"; dwc->gadget->lpm_capable = !dwc->usb2_gadget_lpm_disable; -@@ -4006,6 +4396,7 @@ int dwc3_gadget_init(struct dwc3 *dwc) +@@ -4012,6 +4402,7 @@ int dwc3_gadget_init(struct dwc3 *dwc) dwc->revision); dwc->gadget->max_speed = dwc->maximum_speed; @@ -1618318,7 +1618285,7 @@ index 076032128c34..18f7712010da /* * REVISIT: Here we should clear all pending IRQs to be -@@ -4022,7 +4413,10 @@ int dwc3_gadget_init(struct dwc3 *dwc) +@@ -4028,7 +4419,10 @@ int dwc3_gadget_init(struct dwc3 *dwc) goto err5; } @@ -1618330,7 +1618297,7 @@ index 076032128c34..18f7712010da return 0; -@@ -4077,9 +4471,10 @@ int dwc3_gadget_suspend(struct dwc3 *dwc) +@@ -4083,9 +4477,10 @@ int dwc3_gadget_suspend(struct dwc3 *dwc) int dwc3_gadget_resume(struct dwc3 *dwc) { @@ -1618343,9 +1618310,7 @@ index 076032128c34..18f7712010da ret = __dwc3_gadget_start(dwc); diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h -old mode 100644 -new mode 100755 -index 0cd281949970..77df4b6d6c13 +index 0cd281949970..77df4b6d6c13 100644 --- a/drivers/usb/dwc3/gadget.h +++ b/drivers/usb/dwc3/gadget.h @@ -90,15 +90,17 @@ static inline void dwc3_gadget_move_started_request(struct dwc3_request *req) @@ -1618369,9 +1618334,7 @@ index 0cd281949970..77df4b6d6c13 } diff --git a/drivers/usb/dwc3/trace.c b/drivers/usb/dwc3/trace.c -old mode 100644 -new mode 100755 -index 1b45a9723eeb..8a4fe12bb2e3 +index 1b45a9723eeb..8a4fe12bb2e3 100644 --- a/drivers/usb/dwc3/trace.c +++ b/drivers/usb/dwc3/trace.c @@ -9,3 +9,10 @@ @@ -1618615,9 +1618578,7 @@ index a980799900e7..553382ce3837 100644 .suspend = composite_suspend, diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c -old mode 100644 -new mode 100755 -index d51ea1c052f2..f2a2f11936b3 +index d51ea1c052f2..f2a2f11936b3 100644 --- a/drivers/usb/gadget/configfs.c +++ b/drivers/usb/gadget/configfs.c @@ -10,6 +10,32 @@ @@ -1619076,9 +1619037,7 @@ index 1eb4fa2e623f..177645f3250a 100644 } EXPORT_SYMBOL_GPL(usb_ep_autoconfig_ss); diff --git a/drivers/usb/gadget/function/Makefile b/drivers/usb/gadget/function/Makefile -old mode 100644 -new mode 100755 -index 5d3a6cf02218..14e5c906a6e0 +index 5d3a6cf02218..14e5c906a6e0 100644 --- a/drivers/usb/gadget/function/Makefile +++ b/drivers/usb/gadget/function/Makefile @@ -50,3 +50,9 @@ usb_f_printer-y := f_printer.o @@ -1619093,7 +1619052,7 @@ index 5d3a6cf02218..14e5c906a6e0 +obj-$(CONFIG_DRIVERS_HDF_USB_F_GENERIC) += usb_f_generic.o \ No newline at end of file diff --git a/drivers/usb/gadget/function/f_accessory.c b/drivers/usb/gadget/function/f_accessory.c -new file mode 100755 +new file mode 100644 index 000000000000..73185410d3a0 --- /dev/null +++ b/drivers/usb/gadget/function/f_accessory.c @@ -1620655,7 +1620614,7 @@ index 000000000000..73185410d3a0 +DECLARE_USB_FUNCTION_INIT(accessory, acc_alloc_inst, acc_alloc); +MODULE_LICENSE("GPL"); diff --git a/drivers/usb/gadget/function/f_audio_source.c b/drivers/usb/gadget/function/f_audio_source.c -new file mode 100755 +new file mode 100644 index 000000000000..c768a526b315 --- /dev/null +++ b/drivers/usb/gadget/function/f_audio_source.c @@ -1621732,9 +1621691,7 @@ index 000000000000..c768a526b315 + audio_source_alloc); +MODULE_LICENSE("GPL"); diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c -old mode 100644 -new mode 100755 -index b17acab77fe2..7c30858fc156 +index eb9d01d4245a..386632eb360f 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -71,7 +71,7 @@ struct ffs_function { @@ -1621755,7 +1621712,7 @@ index b17acab77fe2..7c30858fc156 } static long ffs_ep0_ioctl(struct file *file, unsigned code, unsigned long value) -@@ -1277,7 +1277,7 @@ ffs_epfile_release(struct inode *inode, struct file *file) +@@ -1281,7 +1281,7 @@ ffs_epfile_release(struct inode *inode, struct file *file) __ffs_epfile_read_buffer_free(epfile); ffs_data_closed(epfile->ffs); @@ -1621764,7 +1621721,7 @@ index b17acab77fe2..7c30858fc156 } static long ffs_epfile_ioctl(struct file *file, unsigned code, -@@ -2836,7 +2836,7 @@ static int __ffs_func_bind_do_descs(enum ffs_entity_type type, u8 *valuep, +@@ -2840,7 +2840,7 @@ static int __ffs_func_bind_do_descs(enum ffs_entity_type type, u8 *valuep, struct ffs_function *func = priv; struct ffs_ep *ffs_ep; unsigned ep_desc_id; @@ -1621773,7 +1621730,7 @@ index b17acab77fe2..7c30858fc156 static const char *speed_names[] = { "full", "high", "super" }; if (type != FFS_DESCRIPTOR) -@@ -2909,8 +2909,9 @@ static int __ffs_func_bind_do_descs(enum ffs_entity_type type, u8 *valuep, +@@ -2913,8 +2913,9 @@ static int __ffs_func_bind_do_descs(enum ffs_entity_type type, u8 *valuep, ffs_ep->ep = ep; ffs_ep->req = req; @@ -1621785,7 +1621742,7 @@ index b17acab77fe2..7c30858fc156 /* * If we use virtual address mapping, we restore * original bEndpointAddress value. -@@ -3445,7 +3446,10 @@ static void ffs_func_resume(struct usb_function *f) +@@ -3449,7 +3450,10 @@ static void ffs_func_resume(struct usb_function *f) static int ffs_func_revmap_ep(struct ffs_function *func, u8 num) { @@ -1621798,9 +1621755,7 @@ index b17acab77fe2..7c30858fc156 } diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c -old mode 100644 -new mode 100755 -index 950c9435beec..73a28f8a38a7 +index 553547f12fd2..bc55ed1b8374 100644 --- a/drivers/usb/gadget/function/f_mass_storage.c +++ b/drivers/usb/gadget/function/f_mass_storage.c @@ -2301,6 +2301,16 @@ static void fsg_disable(struct usb_function *f) @@ -1621821,9 +1621776,7 @@ index 950c9435beec..73a28f8a38a7 } diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c -old mode 100644 -new mode 100755 -index 8fff995b8dd5..566531bf6cab +index 8fff995b8dd5..566531bf6cab 100644 --- a/drivers/usb/gadget/function/f_midi.c +++ b/drivers/usb/gadget/function/f_midi.c @@ -1222,6 +1222,65 @@ static void f_midi_free_inst(struct usb_function_instance *f) @@ -1621921,9 +1621874,7 @@ index 8fff995b8dd5..566531bf6cab midi_free: diff --git a/drivers/usb/gadget/function/f_printer.c b/drivers/usb/gadget/function/f_printer.c -old mode 100644 -new mode 100755 -index c13bb29a160e..939f174a956c +index c13bb29a160e..939f174a956c 100644 --- a/drivers/usb/gadget/function/f_printer.c +++ b/drivers/usb/gadget/function/f_printer.c @@ -51,6 +51,8 @@ @@ -1621996,9 +1621947,6 @@ index ee95e8f5f9d4..b550fcb234ff 100644 default: invalid: VDBG(cdev, "invalid control req%02x.%02x v%04x i%04x l%d\n", -diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c -old mode 100644 -new mode 100755 diff --git a/drivers/usb/gadget/function/f_uac1_legacy.c b/drivers/usb/gadget/function/f_uac1_legacy.c index e2d7f69128a0..1519ac654803 100644 --- a/drivers/usb/gadget/function/f_uac1_legacy.c @@ -1622024,9 +1621972,7 @@ index e2d7f69128a0..1519ac654803 100644 mutex_lock(&opts->lock); --opts->refcnt; diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c -old mode 100644 -new mode 100755 -index 11cc6056b590..f1ba000ac3f7 +index 11cc6056b590..f1ba000ac3f7 100644 --- a/drivers/usb/gadget/function/f_uac2.c +++ b/drivers/usb/gadget/function/f_uac2.c @@ -44,6 +44,7 @@ @@ -1623305,9 +1623251,7 @@ index 5d39aff263f0..ea8e0a34a6e0 100644 return &uvc->func; diff --git a/drivers/usb/gadget/function/u_audio.c b/drivers/usb/gadget/function/u_audio.c -old mode 100644 -new mode 100755 -index 6c8b8f5b7e0f..3482a26a61a5 +index 6c8b8f5b7e0f..3482a26a61a5 100644 --- a/drivers/usb/gadget/function/u_audio.c +++ b/drivers/usb/gadget/function/u_audio.c @@ -16,6 +16,7 @@ @@ -1623918,9 +1623862,7 @@ index 6c8b8f5b7e0f..3482a26a61a5 kfree(uac->c_prm.rbuf); kfree(uac); diff --git a/drivers/usb/gadget/function/u_audio.h b/drivers/usb/gadget/function/u_audio.h -old mode 100644 -new mode 100755 -index 5ea6b86f1fda..a218cdf771fe +index 5ea6b86f1fda..a218cdf771fe 100644 --- a/drivers/usb/gadget/function/u_audio.h +++ b/drivers/usb/gadget/function/u_audio.h @@ -11,6 +11,14 @@ @@ -1623958,9 +1623900,7 @@ index 5ea6b86f1fda..a218cdf771fe /* Max packet size for all in_ep possible speeds */ unsigned int in_ep_maxpsize; diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c -old mode 100644 -new mode 100755 -index 5e5f699a434f..b47f498a7daf +index 5e5f699a434f..b47f498a7daf 100644 --- a/drivers/usb/gadget/function/u_ether.c +++ b/drivers/usb/gadget/function/u_ether.c @@ -81,6 +81,7 @@ struct eth_dev { @@ -1624019,9 +1623959,7 @@ index 5e5f699a434f..b47f498a7daf * gether_cleanup - remove Ethernet-over-USB device * Context: may sleep diff --git a/drivers/usb/gadget/function/u_ether.h b/drivers/usb/gadget/function/u_ether.h -old mode 100644 -new mode 100755 -index 10dd640684e2..40144546d1b0 +index 10dd640684e2..40144546d1b0 100644 --- a/drivers/usb/gadget/function/u_ether.h +++ b/drivers/usb/gadget/function/u_ether.h @@ -244,6 +244,18 @@ unsigned gether_get_qmult(struct net_device *net); @@ -1624044,9 +1623982,7 @@ index 10dd640684e2..40144546d1b0 /* connect/disconnect is handled by individual functions */ diff --git a/drivers/usb/gadget/function/u_ether_configfs.h b/drivers/usb/gadget/function/u_ether_configfs.h -old mode 100644 -new mode 100755 -index f982e18a5a78..f558c3139ebe +index f982e18a5a78..f558c3139ebe 100644 --- a/drivers/usb/gadget/function/u_ether_configfs.h +++ b/drivers/usb/gadget/function/u_ether_configfs.h @@ -148,7 +148,20 @@ out: \ @@ -1624072,9 +1624008,7 @@ index f982e18a5a78..f558c3139ebe #define USB_ETHER_CONFIGFS_ITEM_ATTR_U8_RW(_f_, _n_) \ static ssize_t _f_##_opts_##_n_##_show(struct config_item *item,\ diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c -old mode 100644 -new mode 100755 -index 7b54e814aefb..948eabf3cebd +index 4fd21772a7aa..946dfa9779ee 100644 --- a/drivers/usb/gadget/function/u_serial.c +++ b/drivers/usb/gadget/function/u_serial.c @@ -261,9 +261,7 @@ __acquires(&port->port_lock) @@ -1624097,7 +1624031,7 @@ index 7b54e814aefb..948eabf3cebd * layer until it refuses to take any more data (or is throttled back). * Then it issues reads for any further data. * -@@ -712,7 +710,7 @@ static void gs_close(struct tty_struct *tty, struct file *file) +@@ -715,7 +713,7 @@ static void gs_close(struct tty_struct *tty, struct file *file) /* Iff we're disconnected, there can be no I/O in flight so it's * ok to free the circular buffer; else just scrub it. And don't @@ -1624107,7 +1624041,7 @@ index 7b54e814aefb..948eabf3cebd if (gser == NULL) kfifo_free(&port->port_write_buf); diff --git a/drivers/usb/gadget/function/u_uac.h b/drivers/usb/gadget/function/u_uac.h -new file mode 100755 +new file mode 100644 index 000000000000..224ddc397c70 --- /dev/null +++ b/drivers/usb/gadget/function/u_uac.h @@ -1624306,9 +1624240,6 @@ index 000000000000..224ddc397c70 +} + +#endif /* __U_UAC_H */ -diff --git a/drivers/usb/gadget/function/u_uac1.h b/drivers/usb/gadget/function/u_uac1.h -old mode 100644 -new mode 100755 diff --git a/drivers/usb/gadget/function/u_uac1_legacy.c b/drivers/usb/gadget/function/u_uac1_legacy.c index 60ae8b2d3f6a..2f149853a91b 100644 --- a/drivers/usb/gadget/function/u_uac1_legacy.c @@ -1624325,9 +1624256,7 @@ index 60ae8b2d3f6a..2f149853a91b 100644 snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DROP, NULL); snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_HW_PARAMS, params); diff --git a/drivers/usb/gadget/function/u_uac2.h b/drivers/usb/gadget/function/u_uac2.h -old mode 100644 -new mode 100755 -index b5035711172d..179d3ef6a195 +index b5035711172d..179d3ef6a195 100644 --- a/drivers/usb/gadget/function/u_uac2.h +++ b/drivers/usb/gadget/function/u_uac2.h @@ -21,7 +21,9 @@ @@ -1625154,9 +1625083,6 @@ index 5ce548c2359d..cae5c2b6283d 100644 if ((ret = uvcg_queue_enable(&video->queue, 1)) < 0) return ret; -diff --git a/drivers/usb/gadget/legacy/audio.c b/drivers/usb/gadget/legacy/audio.c -old mode 100644 -new mode 100755 diff --git a/drivers/usb/gadget/legacy/webcam.c b/drivers/usb/gadget/legacy/webcam.c index ff970a943347..059deaed133b 100644 --- a/drivers/usb/gadget/legacy/webcam.c @@ -1625171,9 +1625097,7 @@ index ff970a943347..059deaed133b 100644 /* Allocate string descriptor numbers ... note that string contents * can be overridden by the composite_dev glue. diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c -old mode 100644 -new mode 100755 -index 3a3b5a03dda7..a0c281293530 +index e80aa717c8b5..c6fe4a79cc45 100644 --- a/drivers/usb/gadget/udc/core.c +++ b/drivers/usb/gadget/udc/core.c @@ -29,6 +29,7 @@ @@ -1625210,7 +1625134,7 @@ index 3a3b5a03dda7..a0c281293530 * * returns zero, or a negative error code. */ -@@ -755,7 +757,7 @@ int usb_gadget_deactivate(struct usb_gadget *gadget) +@@ -757,7 +759,7 @@ int usb_gadget_deactivate(struct usb_gadget *gadget) { int ret = 0; @@ -1625219,7 +1625143,7 @@ index 3a3b5a03dda7..a0c281293530 goto out; if (gadget->connected) { -@@ -1104,7 +1106,18 @@ EXPORT_SYMBOL_GPL(usb_gadget_udc_reset); +@@ -1106,7 +1108,18 @@ EXPORT_SYMBOL_GPL(usb_gadget_udc_reset); */ static inline int usb_gadget_udc_start(struct usb_udc *udc) { @@ -1625239,7 +1625163,7 @@ index 3a3b5a03dda7..a0c281293530 } /** -@@ -1120,7 +1133,13 @@ static inline int usb_gadget_udc_start(struct usb_udc *udc) +@@ -1122,7 +1135,13 @@ static inline int usb_gadget_udc_start(struct usb_udc *udc) */ static inline void usb_gadget_udc_stop(struct usb_udc *udc) { @@ -1625253,7 +1625177,7 @@ index 3a3b5a03dda7..a0c281293530 } /** -@@ -1136,12 +1155,65 @@ static inline void usb_gadget_udc_stop(struct usb_udc *udc) +@@ -1138,12 +1157,65 @@ static inline void usb_gadget_udc_stop(struct usb_udc *udc) static inline void usb_gadget_udc_set_speed(struct usb_udc *udc, enum usb_device_speed speed) { @@ -1625324,7 +1625248,7 @@ index 3a3b5a03dda7..a0c281293530 } /** -@@ -1244,6 +1316,8 @@ int usb_add_gadget(struct usb_gadget *gadget) +@@ -1246,6 +1318,8 @@ int usb_add_gadget(struct usb_gadget *gadget) udc->gadget = gadget; gadget->udc = udc; @@ -1625334,14 +1625258,14 @@ index 3a3b5a03dda7..a0c281293530 list_add_tail(&udc->list, &udc_list); @@ -1356,6 +1430,7 @@ static void usb_gadget_remove_driver(struct usb_udc *udc) - kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE); + udc->driver->function); usb_gadget_disconnect(udc->gadget); + usb_gadget_disable_async_callbacks(udc); if (udc->gadget->irq) synchronize_irq(udc->gadget->irq); udc->driver->unbind(udc->gadget); -@@ -1435,6 +1510,7 @@ static int udc_bind_to_driver(struct usb_udc *udc, struct usb_gadget_driver *dri +@@ -1437,6 +1512,7 @@ static int udc_bind_to_driver(struct usb_udc *udc, struct usb_gadget_driver *dri driver->unbind(udc->gadget); goto err1; } @@ -1625350,9 +1625274,7 @@ index 3a3b5a03dda7..a0c281293530 kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE); diff --git a/drivers/usb/gadget/udc/snps_udc_core.c b/drivers/usb/gadget/udc/snps_udc_core.c -old mode 100644 -new mode 100755 -index 6c726d2e1788..d046c09fa566 +index 6c726d2e1788..d046c09fa566 100644 --- a/drivers/usb/gadget/udc/snps_udc_core.c +++ b/drivers/usb/gadget/udc/snps_udc_core.c @@ -36,7 +36,6 @@ @@ -1625431,9 +1625353,7 @@ index 6c726d2e1788..d046c09fa566 /* Reset the UDC core */ diff --git a/drivers/usb/gadget/udc/trace.c b/drivers/usb/gadget/udc/trace.c -old mode 100644 -new mode 100755 -index 7430624c0bd7..e0e617280b12 +index 7430624c0bd7..e0e617280b12 100644 --- a/drivers/usb/gadget/udc/trace.c +++ b/drivers/usb/gadget/udc/trace.c @@ -8,3 +8,6 @@ @@ -1625444,12 +1625364,10 @@ index 7430624c0bd7..e0e617280b12 +EXPORT_TRACEPOINT_SYMBOL_GPL(usb_gadget_connect); +EXPORT_TRACEPOINT_SYMBOL_GPL(usb_gadget_disconnect); diff --git a/drivers/usb/gadget/udc/udc-xilinx.c b/drivers/usb/gadget/udc/udc-xilinx.c -old mode 100644 -new mode 100755 -index 096f56a09e6a..78561630a9d7 +index 47486f0f21e5..59cda488baaf 100644 --- a/drivers/usb/gadget/udc/udc-xilinx.c +++ b/drivers/usb/gadget/udc/udc-xilinx.c -@@ -1960,7 +1960,7 @@ static void xudc_nonctrl_ep_handler(struct xusb_udc *udc, u8 epnum, +@@ -1964,7 +1964,7 @@ static void xudc_nonctrl_ep_handler(struct xusb_udc *udc, u8 epnum, if (intrstatus & (XUSB_STATUS_EP0_BUFF1_COMP_MASK << epnum)) ep->buffer0ready = 0; if (intrstatus & (XUSB_STATUS_EP0_BUFF2_COMP_MASK << epnum)) @@ -1625459,9 +1625377,7 @@ index 096f56a09e6a..78561630a9d7 if (list_empty(&ep->queue)) return; diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile -old mode 100644 -new mode 100755 -index bc731332fed9..2c7155fae179 +index bc731332fed9..2c7155fae179 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -19,9 +19,7 @@ ifneq ($(CONFIG_USB_XHCI_DBGCAP), ) @@ -1625485,9 +1625401,7 @@ index bc731332fed9..2c7155fae179 obj-$(CONFIG_USB_SL811_HCD) += sl811-hcd.o obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c -old mode 100644 -new mode 100755 -index 2dcfc67f2ba8..3e48737f893f +index 2dcfc67f2ba8..3e48737f893f 100644 --- a/drivers/usb/host/ehci-platform.c +++ b/drivers/usb/host/ehci-platform.c @@ -28,6 +28,7 @@ @@ -1625589,9 +1625503,7 @@ index 2dcfc67f2ba8..3e48737f893f dev->dev.platform_data = NULL; diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c -old mode 100644 -new mode 100755 -index 4a8456f12a73..4923536780ee +index 4a8456f12a73..4923536780ee 100644 --- a/drivers/usb/host/ohci-platform.c +++ b/drivers/usb/host/ohci-platform.c @@ -32,7 +32,7 @@ @@ -1625613,9 +1625525,7 @@ index 4a8456f12a73..4923536780ee /* diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c -old mode 100644 -new mode 100755 -index 7bb306741807..ecc65c6b011e +index e92f920256b2..462730b48db2 100644 --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c @@ -449,8 +449,13 @@ static int xhci_stop_device(struct xhci_hcd *xhci, int slot_id, int suspend) @@ -1625649,9 +1625559,7 @@ index 7bb306741807..ecc65c6b011e unsigned long xhci_get_resuming_ports(struct usb_hcd *hcd) { diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c -old mode 100644 -new mode 100755 -index a8a9addb4d25..10c5eae5c8f3 +index 006e1b15fbda..3e230d9ddb13 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -65,7 +65,7 @@ static struct xhci_segment *xhci_segment_alloc(struct xhci_hcd *xhci, @@ -1625986,7 +1625894,7 @@ index a8a9addb4d25..10c5eae5c8f3 static void xhci_set_hc_event_deq(struct xhci_hcd *xhci) { -@@ -2455,15 +2547,21 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) +@@ -2475,15 +2567,21 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) * xHCI section 5.4.6 - doorbell array must be * "physically contiguous and 64-byte (cache line) aligned". */ @@ -1626015,9 +1625923,7 @@ index a8a9addb4d25..10c5eae5c8f3 /* * Initialize the ring segment pool. The ring must be a contiguous diff --git a/drivers/usb/host/xhci-mtk-sch.c b/drivers/usb/host/xhci-mtk-sch.c -old mode 100644 -new mode 100755 -index 86c4bc9df3b8..7f0461750146 +index 86c4bc9df3b8..7f0461750146 100644 --- a/drivers/usb/host/xhci-mtk-sch.c +++ b/drivers/usb/host/xhci-mtk-sch.c @@ -32,6 +32,15 @@ @@ -1626494,9 +1626400,7 @@ index 86c4bc9df3b8..7f0461750146 + return 0; +} diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c -old mode 100644 -new mode 100755 -index 1c331577fca9..09f2ddbfe8b9 +index 122777b21b24..d47bc552f620 100644 --- a/drivers/usb/host/xhci-mtk.c +++ b/drivers/usb/host/xhci-mtk.c @@ -344,15 +344,6 @@ static void usb_wakeup_set(struct xhci_hcd_mtk *mtk, bool enable) @@ -1626533,9 +1626437,7 @@ index 1c331577fca9..09f2ddbfe8b9 { struct device *dev = &pdev->dev; diff --git a/drivers/usb/host/xhci-mtk.h b/drivers/usb/host/xhci-mtk.h -old mode 100644 -new mode 100755 -index 3e2c607b5d64..607dbe474d91 +index 3e2c607b5d64..607dbe474d91 100644 --- a/drivers/usb/host/xhci-mtk.h +++ b/drivers/usb/host/xhci-mtk.h @@ -22,14 +22,10 @@ @@ -1626607,7 +1626509,7 @@ index 3e2c607b5d64..607dbe474d91 - #endif /* _XHCI_MTK_H_ */ diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c -index aff65cefead2..8b6ae499c3a5 100644 +index 53f832787350..f069a96fa172 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -288,10 +288,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) @@ -1626623,9 +1626525,7 @@ index aff65cefead2..8b6ae499c3a5 100644 if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI) { diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c -old mode 100644 -new mode 100755 -index 972a44b2a7f1..045383d38470 +index e56a1fb9715a..0b72b5774b03 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -184,6 +184,41 @@ static const struct of_device_id usb_xhci_of_match[] = { @@ -1626694,9 +1626594,7 @@ index 972a44b2a7f1..045383d38470 clk_disable_unprepare(reg_clk); usb_put_hcd(hcd); diff --git a/drivers/usb/host/xhci-plat.h b/drivers/usb/host/xhci-plat.h -old mode 100644 -new mode 100755 -index 561d0b7bce09..e726a572321d +index 561d0b7bce09..e726a572321d 100644 --- a/drivers/usb/host/xhci-plat.h +++ b/drivers/usb/host/xhci-plat.h @@ -13,6 +13,7 @@ @@ -1626720,9 +1626618,7 @@ index 561d0b7bce09..e726a572321d + #endif /* _XHCI_PLAT_H */ diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c -old mode 100644 -new mode 100755 -index b69b8c7e7966..78345e425264 +index 94518180ba78..c779f686bd6c 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -57,8 +57,10 @@ @@ -1626821,7 +1626717,7 @@ index b69b8c7e7966..78345e425264 static bool xhci_mod_cmd_timer(struct xhci_hcd *xhci, unsigned long delay) { -@@ -421,9 +447,8 @@ void xhci_ring_ep_doorbell(struct xhci_hcd *xhci, +@@ -422,9 +448,8 @@ void xhci_ring_ep_doorbell(struct xhci_hcd *xhci, trace_xhci_ring_ep_doorbell(slot_id, DB_VALUE(ep_index, stream_id)); writel(DB_VALUE(ep_index, stream_id), db_addr); @@ -1626833,7 +1626729,7 @@ index b69b8c7e7966..78345e425264 } /* Ring the doorbell for any rings with pending URBs */ -@@ -479,6 +504,26 @@ static struct xhci_virt_ep *xhci_get_virt_ep(struct xhci_hcd *xhci, +@@ -480,6 +505,26 @@ static struct xhci_virt_ep *xhci_get_virt_ep(struct xhci_hcd *xhci, return &xhci->devs[slot_id]->eps[ep_index]; } @@ -1626860,7 +1626756,7 @@ index b69b8c7e7966..78345e425264 /* Get the right ring for the given slot_id, ep_index and stream_id. * If the endpoint supports streams, boundary check the URB's stream ID. * If the endpoint doesn't support streams, return the singular endpoint ring. -@@ -493,29 +538,7 @@ struct xhci_ring *xhci_triad_to_transfer_ring(struct xhci_hcd *xhci, +@@ -494,29 +539,7 @@ struct xhci_ring *xhci_triad_to_transfer_ring(struct xhci_hcd *xhci, if (!ep) return NULL; @@ -1626891,7 +1626787,7 @@ index b69b8c7e7966..78345e425264 } -@@ -542,97 +565,55 @@ static u64 xhci_get_hw_deq(struct xhci_hcd *xhci, struct xhci_virt_device *vdev, +@@ -543,97 +566,55 @@ static u64 xhci_get_hw_deq(struct xhci_hcd *xhci, struct xhci_virt_device *vdev, return le64_to_cpu(ep_ctx->deq); } @@ -1627011,7 +1626907,7 @@ index b69b8c7e7966..78345e425264 /* * We want to find the pointer, segment and cycle state of the new trb -@@ -647,40 +628,70 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci, +@@ -648,40 +629,70 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci, if (td_last_trb_found) break; } @@ -1627099,7 +1626995,7 @@ index b69b8c7e7966..78345e425264 } /* flip_cycle means flip the cycle bit of all but the first and last TRB. -@@ -839,7 +850,26 @@ static int xhci_reset_halted_ep(struct xhci_hcd *xhci, unsigned int slot_id, +@@ -840,7 +851,26 @@ static int xhci_reset_halted_ep(struct xhci_hcd *xhci, unsigned int slot_id, return ret; } @@ -1627127,7 +1627023,7 @@ index b69b8c7e7966..78345e425264 struct xhci_virt_ep *ep, unsigned int stream_id, struct xhci_td *td, enum xhci_ep_reset_type reset_type) -@@ -852,20 +882,31 @@ static void xhci_handle_halted_endpoint(struct xhci_hcd *xhci, +@@ -853,20 +883,31 @@ static void xhci_handle_halted_endpoint(struct xhci_hcd *xhci, * Device will be reset soon to recover the link so don't do anything */ if (ep->vdev->flags & VDEV_PORT_ERROR) @@ -1627167,7 +1627063,7 @@ index b69b8c7e7966..78345e425264 } /* -@@ -873,16 +914,20 @@ static void xhci_handle_halted_endpoint(struct xhci_hcd *xhci, +@@ -874,16 +915,20 @@ static void xhci_handle_halted_endpoint(struct xhci_hcd *xhci, * We have the xHCI lock, so nothing can modify this list until we drop it. * We're also in the event handler, so we can't get re-interrupted if another * Stop Endpoint command completes. @@ -1627190,7 +1627086,7 @@ index b69b8c7e7966..78345e425264 xhci = ep->xhci; -@@ -899,27 +944,70 @@ static int xhci_invalidate_cancelled_tds(struct xhci_virt_ep *ep, +@@ -900,27 +945,70 @@ static int xhci_invalidate_cancelled_tds(struct xhci_virt_ep *ep, continue; } /* @@ -1627268,7 +1627164,7 @@ index b69b8c7e7966..78345e425264 /* * When we get a command completion for a Stop Endpoint Command, we need to * unlink any cancelled TDs from the ring. There are two ways to do that: -@@ -931,88 +1019,86 @@ static int xhci_invalidate_cancelled_tds(struct xhci_virt_ep *ep, +@@ -932,88 +1020,86 @@ static int xhci_invalidate_cancelled_tds(struct xhci_virt_ep *ep, * bit cleared) so that the HW will skip over them. */ static void xhci_handle_cmd_stop_ep(struct xhci_hcd *xhci, int slot_id, @@ -1627415,7 +1627311,7 @@ index b69b8c7e7966..78345e425264 } static void xhci_kill_ring_urbs(struct xhci_hcd *xhci, struct xhci_ring *ring) -@@ -1229,10 +1315,10 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, +@@ -1230,10 +1316,10 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, unsigned int ep_index; unsigned int stream_id; struct xhci_ring *ep_ring; @@ -1627427,7 +1627323,7 @@ index b69b8c7e7966..78345e425264 ep_index = TRB_TO_EP_INDEX(le32_to_cpu(trb->generic.field[3])); stream_id = TRB_TO_STREAM_ID(le32_to_cpu(trb->generic.field[2])); -@@ -1240,8 +1326,7 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, +@@ -1241,8 +1327,7 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, if (!ep) return; @@ -1627437,7 +1627333,7 @@ index b69b8c7e7966..78345e425264 if (!ep_ring) { xhci_warn(xhci, "WARN Set TR deq ptr command for freed stream ID %u\n", stream_id); -@@ -1249,8 +1334,8 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, +@@ -1250,8 +1335,8 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, goto cleanup; } @@ -1627448,7 +1627344,7 @@ index b69b8c7e7966..78345e425264 trace_xhci_handle_cmd_set_deq(slot_ctx); trace_xhci_handle_cmd_set_deq_ep(ep_ctx); -@@ -1303,7 +1388,7 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, +@@ -1304,7 +1389,7 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, /* Update the ring's dequeue segment and dequeue pointer * to reflect the new position. */ @@ -1627457,7 +1627353,7 @@ index b69b8c7e7966..78345e425264 ep_ring, ep_index); } else { xhci_warn(xhci, "Mismatch between completed Set TR Deq Ptr command & xHCI internal state.\n"); -@@ -1311,7 +1396,24 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, +@@ -1312,7 +1397,24 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, ep->queued_deq_seg, ep->queued_deq_ptr); } } @@ -1627483,7 +1627379,7 @@ index b69b8c7e7966..78345e425264 cleanup: ep->ep_state &= ~SET_DEQ_PENDING; ep->queued_deq_seg = NULL; -@@ -1323,7 +1425,6 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, +@@ -1324,7 +1426,6 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, static void xhci_handle_cmd_reset_ep(struct xhci_hcd *xhci, int slot_id, union xhci_trb *trb, u32 cmd_comp_code) { @@ -1627491,7 +1627387,7 @@ index b69b8c7e7966..78345e425264 struct xhci_virt_ep *ep; struct xhci_ep_ctx *ep_ctx; unsigned int ep_index; -@@ -1333,8 +1434,7 @@ static void xhci_handle_cmd_reset_ep(struct xhci_hcd *xhci, int slot_id, +@@ -1334,8 +1435,7 @@ static void xhci_handle_cmd_reset_ep(struct xhci_hcd *xhci, int slot_id, if (!ep) return; @@ -1627501,7 +1627397,7 @@ index b69b8c7e7966..78345e425264 trace_xhci_handle_cmd_reset_ep(ep_ctx); /* This command will only fail if the endpoint wasn't halted, -@@ -1343,27 +1443,15 @@ static void xhci_handle_cmd_reset_ep(struct xhci_hcd *xhci, int slot_id, +@@ -1344,27 +1444,15 @@ static void xhci_handle_cmd_reset_ep(struct xhci_hcd *xhci, int slot_id, xhci_dbg_trace(xhci, trace_xhci_dbg_reset_ep, "Ignoring reset ep completion code of %u", cmd_comp_code); @@ -1627536,7 +1627432,7 @@ index b69b8c7e7966..78345e425264 /* if this was a soft reset, then restart */ if ((le32_to_cpu(trb->generic.field[3])) & TRB_TSP) -@@ -1397,7 +1485,7 @@ static void xhci_handle_cmd_disable_slot(struct xhci_hcd *xhci, int slot_id) +@@ -1398,7 +1486,7 @@ static void xhci_handle_cmd_disable_slot(struct xhci_hcd *xhci, int slot_id) } static void xhci_handle_cmd_config_ep(struct xhci_hcd *xhci, int slot_id, @@ -1627545,7 +1627441,7 @@ index b69b8c7e7966..78345e425264 { struct xhci_virt_device *virt_dev; struct xhci_input_control_ctx *ctrl_ctx; -@@ -1415,6 +1503,8 @@ static void xhci_handle_cmd_config_ep(struct xhci_hcd *xhci, int slot_id, +@@ -1416,6 +1504,8 @@ static void xhci_handle_cmd_config_ep(struct xhci_hcd *xhci, int slot_id, * is not waiting on the configure endpoint command. */ virt_dev = xhci->devs[slot_id]; @@ -1627554,7 +1627450,7 @@ index b69b8c7e7966..78345e425264 ctrl_ctx = xhci_get_input_control_ctx(virt_dev->in_ctx); if (!ctrl_ctx) { xhci_warn(xhci, "Could not get input context, bad type.\n"); -@@ -1459,24 +1549,27 @@ static void xhci_handle_cmd_addr_dev(struct xhci_hcd *xhci, int slot_id) +@@ -1460,24 +1550,27 @@ static void xhci_handle_cmd_addr_dev(struct xhci_hcd *xhci, int slot_id) struct xhci_slot_ctx *slot_ctx; vdev = xhci->devs[slot_id]; @@ -1627587,7 +1627483,7 @@ index b69b8c7e7966..78345e425264 } static void xhci_handle_cmd_nec_get_fw(struct xhci_hcd *xhci, -@@ -1569,7 +1662,7 @@ void xhci_handle_command_timeout(struct work_struct *work) +@@ -1570,7 +1663,7 @@ void xhci_handle_command_timeout(struct work_struct *work) static void handle_cmd_completion(struct xhci_hcd *xhci, struct xhci_event_cmd *event) { @@ -1627596,7 +1627492,7 @@ index b69b8c7e7966..78345e425264 u64 cmd_dma; dma_addr_t cmd_dequeue_dma; u32 cmd_comp_code; -@@ -1577,6 +1670,11 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, +@@ -1578,6 +1671,11 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, struct xhci_command *cmd; u32 cmd_type; @@ -1627608,7 +1627504,7 @@ index b69b8c7e7966..78345e425264 cmd_dma = le64_to_cpu(event->cmd_trb); cmd_trb = xhci->cmd_ring->dequeue; -@@ -1637,8 +1735,7 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, +@@ -1638,8 +1736,7 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, break; case TRB_CONFIG_EP: if (!cmd->completion) @@ -1627618,7 +1627514,7 @@ index b69b8c7e7966..78345e425264 break; case TRB_EVAL_CONTEXT: break; -@@ -1649,7 +1746,8 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, +@@ -1650,7 +1747,8 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, WARN_ON(slot_id != TRB_TO_SLOT_ID( le32_to_cpu(cmd_trb->generic.field[3]))); if (!cmd->completion) @@ -1627628,7 +1627524,7 @@ index b69b8c7e7966..78345e425264 break; case TRB_SET_DEQ: WARN_ON(slot_id != TRB_TO_SLOT_ID( -@@ -1672,7 +1770,7 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, +@@ -1673,7 +1771,7 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, */ slot_id = TRB_TO_SLOT_ID( le32_to_cpu(cmd_trb->generic.field[3])); @@ -1627637,7 +1627533,7 @@ index b69b8c7e7966..78345e425264 break; case TRB_NEC_GET_FW: xhci_handle_cmd_nec_get_fw(xhci, event); -@@ -1699,11 +1797,8 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, +@@ -1700,11 +1798,8 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, } static void handle_vendor_event(struct xhci_hcd *xhci, @@ -1627650,7 +1627546,7 @@ index b69b8c7e7966..78345e425264 xhci_dbg(xhci, "Vendor specific event TRB type = %u\n", trb_type); if (trb_type == TRB_NEC_CMD_COMP && (xhci->quirks & XHCI_NEC_HOST)) handle_cmd_completion(xhci, &event->event_cmd); -@@ -2067,18 +2162,52 @@ static int finish_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep, +@@ -2068,18 +2163,52 @@ static int finish_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep, ep_ctx = xhci_get_ep_ctx(xhci, ep->vdev->out_ctx, ep->ep_index); @@ -1627712,7 +1627608,7 @@ index b69b8c7e7966..78345e425264 /* * xhci internal endpoint state will go to a "halt" state for * any stall, including default control pipe protocol stall. -@@ -2089,19 +2218,23 @@ static int finish_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep, +@@ -2090,19 +2219,23 @@ static int finish_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep, * stall later. Hub TT buffer should only be cleared for FS/LS * devices behind HS hubs for functional stalls. */ @@ -1627744,7 +1627640,7 @@ index b69b8c7e7966..78345e425264 return xhci_td_cleanup(xhci, td, ep_ring, td->status); } -@@ -2429,7 +2562,6 @@ static int process_bulk_intr_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep, +@@ -2430,7 +2563,6 @@ static int process_bulk_intr_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep, static int handle_tx_event(struct xhci_hcd *xhci, struct xhci_transfer_event *event) { @@ -1627752,7 +1627648,7 @@ index b69b8c7e7966..78345e425264 struct xhci_virt_ep *ep; struct xhci_ring *ep_ring; unsigned int slot_id; -@@ -2456,9 +2588,8 @@ static int handle_tx_event(struct xhci_hcd *xhci, +@@ -2457,9 +2589,8 @@ static int handle_tx_event(struct xhci_hcd *xhci, goto err_out; } @@ -1627763,7 +1627659,7 @@ index b69b8c7e7966..78345e425264 if (GET_EP_CTX_STATE(ep_ctx) == EP_STATE_DISABLED) { xhci_err(xhci, -@@ -2536,7 +2667,6 @@ static int handle_tx_event(struct xhci_hcd *xhci, +@@ -2537,7 +2668,6 @@ static int handle_tx_event(struct xhci_hcd *xhci, case COMP_STALL_ERROR: xhci_dbg(xhci, "Stalled endpoint for slot %u ep %u\n", slot_id, ep_index); @@ -1627771,7 +1627667,7 @@ index b69b8c7e7966..78345e425264 status = -EPIPE; break; case COMP_SPLIT_TRANSACTION_ERROR: -@@ -2845,10 +2975,11 @@ static int handle_tx_event(struct xhci_hcd *xhci, +@@ -2846,10 +2976,11 @@ static int handle_tx_event(struct xhci_hcd *xhci, * Returns >0 for "possibly more events to process" (caller should call again), * otherwise 0 if done. In future, <0 returns should indicate error code. */ @@ -1627784,7 +1627680,7 @@ index b69b8c7e7966..78345e425264 int ret; /* Event ring hasn't been allocated yet. */ -@@ -2870,31 +3001,30 @@ static int xhci_handle_event(struct xhci_hcd *xhci) +@@ -2871,31 +3002,30 @@ static int xhci_handle_event(struct xhci_hcd *xhci) * speculative reads of the event's flags/data below. */ rmb(); @@ -1627826,7 +1627722,7 @@ index b69b8c7e7966..78345e425264 } /* Any of the above functions may drop and re-acquire the lock, so check * to make sure a watchdog timer didn't mark the host as non-responsive. -@@ -2914,13 +3044,14 @@ static int xhci_handle_event(struct xhci_hcd *xhci) +@@ -2915,13 +3045,14 @@ static int xhci_handle_event(struct xhci_hcd *xhci) */ return 1; } @@ -1627842,7 +1627738,7 @@ index b69b8c7e7966..78345e425264 union xhci_trb *event_ring_deq) { u64 temp_64; -@@ -2950,6 +3081,16 @@ static void xhci_update_erst_dequeue(struct xhci_hcd *xhci, +@@ -2951,6 +3082,16 @@ static void xhci_update_erst_dequeue(struct xhci_hcd *xhci, temp_64 |= ERST_EHB; xhci_write_64(xhci, temp_64, &xhci->ir_set->erst_dequeue); } @@ -1627859,7 +1627755,7 @@ index b69b8c7e7966..78345e425264 /* * xHCI spec says we can get an interrupt, and if the HC has an error condition, -@@ -2985,6 +3126,10 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd) +@@ -2986,6 +3127,10 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd) goto out; } @@ -1627870,7 +1627766,7 @@ index b69b8c7e7966..78345e425264 /* * Clear the op reg interrupt status first, * so we can receive interrupts from other MSI-X interrupters. -@@ -3077,6 +3222,7 @@ static int prepare_ring(struct xhci_hcd *xhci, struct xhci_ring *ep_ring, +@@ -3078,6 +3223,7 @@ static int prepare_ring(struct xhci_hcd *xhci, struct xhci_ring *ep_ring, u32 ep_state, unsigned int num_trbs, gfp_t mem_flags) { unsigned int num_trbs_needed; @@ -1627878,7 +1627774,7 @@ index b69b8c7e7966..78345e425264 /* Make sure the endpoint has been added to xHC schedule */ switch (ep_state) { -@@ -3147,7 +3293,19 @@ static int prepare_ring(struct xhci_hcd *xhci, struct xhci_ring *ep_ring, +@@ -3148,7 +3294,19 @@ static int prepare_ring(struct xhci_hcd *xhci, struct xhci_ring *ep_ring, ep_ring->enq_seg = ep_ring->enq_seg->next; ep_ring->enqueue = ep_ring->enq_seg->trbs; @@ -1627898,7 +1627794,7 @@ index b69b8c7e7966..78345e425264 return 0; } -@@ -3166,7 +3324,8 @@ static int prepare_transfer(struct xhci_hcd *xhci, +@@ -3167,7 +3325,8 @@ static int prepare_transfer(struct xhci_hcd *xhci, struct xhci_ring *ep_ring; struct xhci_ep_ctx *ep_ctx = xhci_get_ep_ctx(xhci, xdev->out_ctx, ep_index); @@ -1627908,7 +1627804,7 @@ index b69b8c7e7966..78345e425264 if (!ep_ring) { xhci_dbg(xhci, "Can't prepare ring for bad stream ID %u\n", stream_id); -@@ -3485,6 +3644,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags, +@@ -3486,6 +3645,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags, need_zero_pkt = true; td = &urb_priv->td[0]; @@ -1627916,7 +1627812,7 @@ index b69b8c7e7966..78345e425264 /* * Don't give the first TRB to the hardware (by toggling the cycle bit) -@@ -4283,71 +4443,7 @@ int xhci_queue_stop_endpoint(struct xhci_hcd *xhci, struct xhci_command *cmd, +@@ -4284,71 +4444,7 @@ int xhci_queue_stop_endpoint(struct xhci_hcd *xhci, struct xhci_command *cmd, return queue_command(xhci, cmd, 0, 0, 0, trb_slot_id | trb_ep_index | type | trb_suspend, false); } @@ -1627990,9 +1627886,7 @@ index b69b8c7e7966..78345e425264 int xhci_queue_reset_ep(struct xhci_hcd *xhci, struct xhci_command *cmd, int slot_id, unsigned int ep_index, diff --git a/drivers/usb/host/xhci-trace.c b/drivers/usb/host/xhci-trace.c -old mode 100644 -new mode 100755 -index d0070814d1ea..c4178357bd92 +index d0070814d1ea..c4178357bd92 100644 --- a/drivers/usb/host/xhci-trace.c +++ b/drivers/usb/host/xhci-trace.c @@ -12,3 +12,6 @@ @@ -1628003,9 +1627897,7 @@ index d0070814d1ea..c4178357bd92 +EXPORT_TRACEPOINT_SYMBOL_GPL(xhci_handle_transfer); +EXPORT_TRACEPOINT_SYMBOL_GPL(xhci_urb_giveback); diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c -old mode 100644 -new mode 100755 -index b069fe3f8ab0..3f9596d36366 +index b069fe3f8ab0..3f9596d36366 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -21,7 +21,6 @@ @@ -1628431,9 +1628323,7 @@ index b069fe3f8ab0..3f9596d36366 drv->update_hub_device = over->update_hub_device; } diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -old mode 100644 -new mode 100755 -index c7749f6e3474..06243f940bd4 +index 5a8443f6ed70..4fc2b82d69b9 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1422,7 +1422,7 @@ union xhci_trb { @@ -1628478,7 +1628368,7 @@ index c7749f6e3474..06243f940bd4 enum xhci_ring_type { TYPE_CTRL = 0, TYPE_ISOC, -@@ -1928,6 +1929,7 @@ struct xhci_hcd { +@@ -1927,6 +1928,7 @@ struct xhci_hcd { struct list_head regset_list; void *dbc; @@ -1628486,7 +1628376,7 @@ index c7749f6e3474..06243f940bd4 /* platform-specific data -- must come last */ unsigned long priv[] __aligned(sizeof(s64)); }; -@@ -1937,8 +1939,15 @@ struct xhci_driver_overrides { +@@ -1936,8 +1938,15 @@ struct xhci_driver_overrides { size_t extra_priv_size; int (*reset)(struct usb_hcd *hcd); int (*start)(struct usb_hcd *hcd); @@ -1628502,7 +1628392,7 @@ index c7749f6e3474..06243f940bd4 int (*update_hub_device)(struct usb_hcd *hcd, struct usb_device *hdev, struct usb_tt *tt, gfp_t mem_flags); }; -@@ -2067,10 +2076,6 @@ void xhci_free_device_endpoint_resources(struct xhci_hcd *xhci, +@@ -2066,10 +2075,6 @@ void xhci_free_device_endpoint_resources(struct xhci_hcd *xhci, struct xhci_ring *xhci_dma_to_transfer_ring( struct xhci_virt_ep *ep, u64 address); @@ -1628513,7 +1628403,7 @@ index c7749f6e3474..06243f940bd4 struct xhci_command *xhci_alloc_command(struct xhci_hcd *xhci, bool allocate_completion, gfp_t mem_flags); struct xhci_command *xhci_alloc_command_with_ctx(struct xhci_hcd *xhci, -@@ -2095,8 +2100,13 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks); +@@ -2094,8 +2099,13 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks); void xhci_shutdown(struct usb_hcd *hcd); void xhci_init_driver(struct hc_driver *drv, const struct xhci_driver_overrides *over); @@ -1628527,7 +1628417,7 @@ index c7749f6e3474..06243f940bd4 int xhci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev, struct usb_tt *tt, gfp_t mem_flags); int xhci_disable_slot(struct xhci_hcd *xhci, u32 slot_id); -@@ -2146,13 +2156,6 @@ int xhci_queue_reset_ep(struct xhci_hcd *xhci, struct xhci_command *cmd, +@@ -2145,13 +2155,6 @@ int xhci_queue_reset_ep(struct xhci_hcd *xhci, struct xhci_command *cmd, enum xhci_ep_reset_type reset_type); int xhci_queue_reset_device(struct xhci_hcd *xhci, struct xhci_command *cmd, u32 slot_id); @@ -1628541,7 +1628431,7 @@ index c7749f6e3474..06243f940bd4 void xhci_cleanup_stalled_ring(struct xhci_hcd *xhci, unsigned int slot_id, unsigned int ep_index, unsigned int stream_id, struct xhci_td *td); -@@ -2213,6 +2216,53 @@ static inline struct xhci_ring *xhci_urb_to_transfer_ring(struct xhci_hcd *xhci, +@@ -2212,6 +2215,53 @@ static inline struct xhci_ring *xhci_urb_to_transfer_ring(struct xhci_hcd *xhci, urb->stream_id); } @@ -1628671,9 +1628561,7 @@ index 1f8c9b16a0fb..c22b026481f2 100644 UNUSUAL_DEV(0x2109, 0x0711, 0x0000, 0x9999, "VIA", diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c -old mode 100644 -new mode 100755 -index 0d4b1c0eeefb..5021ea91075e +index def903e9d2ab..3b9e34c6a6fb 100644 --- a/drivers/usb/typec/altmodes/displayport.c +++ b/drivers/usb/typec/altmodes/displayport.c @@ -17,8 +17,8 @@ @@ -1628810,9 +1628698,7 @@ index 0d4b1c0eeefb..5021ea91075e dp->connector_fwnode = fwnode_find_reference(fwnode, "displayport", 0); if (IS_ERR(dp->connector_fwnode)) diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c -old mode 100644 -new mode 100755 -index 9d3a35b2046d..4fd17c662d15 +index 18b35e817361..043102e2491f 100644 --- a/drivers/usb/typec/class.c +++ b/drivers/usb/typec/class.c @@ -11,6 +11,7 @@ @@ -1629017,7 +1628903,7 @@ index 9d3a35b2046d..4fd17c662d15 .is_visible = typec_altmode_attr_is_visible, .attrs = typec_altmode_attrs, }; -@@ -484,6 +610,10 @@ typec_register_altmode(struct device *parent, +@@ -485,6 +611,10 @@ typec_register_altmode(struct device *parent, if (is_typec_partner(parent)) alt->adev.dev.bus = &typec_bus; @@ -1629028,7 +1628914,7 @@ index 9d3a35b2046d..4fd17c662d15 ret = device_register(&alt->adev.dev); if (ret) { dev_err(parent, "failed to register alternate mode (%d)\n", -@@ -534,12 +664,61 @@ static ssize_t supports_usb_power_delivery_show(struct device *dev, +@@ -535,12 +665,61 @@ static ssize_t supports_usb_power_delivery_show(struct device *dev, } static DEVICE_ATTR_RO(supports_usb_power_delivery); @@ -1629091,7 +1628977,7 @@ index 9d3a35b2046d..4fd17c662d15 static void typec_partner_release(struct device *dev) { -@@ -572,6 +751,61 @@ int typec_partner_set_identity(struct typec_partner *partner) +@@ -573,6 +752,61 @@ int typec_partner_set_identity(struct typec_partner *partner) } EXPORT_SYMBOL_GPL(typec_partner_set_identity); @@ -1629153,7 +1629039,7 @@ index 9d3a35b2046d..4fd17c662d15 /** * typec_partner_register_altmode - Register USB Type-C Partner Alternate Mode * @partner: USB Type-C Partner that supports the alternate mode -@@ -592,6 +826,20 @@ typec_partner_register_altmode(struct typec_partner *partner, +@@ -593,6 +827,20 @@ typec_partner_register_altmode(struct typec_partner *partner, } EXPORT_SYMBOL_GPL(typec_partner_register_altmode); @@ -1629174,7 +1629060,7 @@ index 9d3a35b2046d..4fd17c662d15 /** * typec_register_partner - Register a USB Type-C Partner * @port: The USB Type-C Port the partner is connected to -@@ -614,6 +862,9 @@ struct typec_partner *typec_register_partner(struct typec_port *port, +@@ -615,6 +863,9 @@ struct typec_partner *typec_register_partner(struct typec_port *port, ida_init(&partner->mode_ids); partner->usb_pd = desc->usb_pd; partner->accessory = desc->accessory; @@ -1629184,7 +1629070,7 @@ index 9d3a35b2046d..4fd17c662d15 if (desc->identity) { /* -@@ -664,11 +915,70 @@ static void typec_plug_release(struct device *dev) +@@ -665,11 +916,70 @@ static void typec_plug_release(struct device *dev) kfree(plug); } @@ -1629255,7 +1629141,7 @@ index 9d3a35b2046d..4fd17c662d15 /** * typec_plug_register_altmode - Register USB Type-C Cable Plug Alternate Mode * @plug: USB Type-C Cable Plug that supports the alternate mode -@@ -714,6 +1024,7 @@ struct typec_plug *typec_register_plug(struct typec_cable *cable, +@@ -715,6 +1025,7 @@ struct typec_plug *typec_register_plug(struct typec_cable *cable, sprintf(name, "plug%d", desc->index); ida_init(&plug->mode_ids); @@ -1629263,7 +1629149,7 @@ index 9d3a35b2046d..4fd17c662d15 plug->index = desc->index; plug->dev.class = typec_class; plug->dev.parent = &cable->dev; -@@ -746,15 +1057,6 @@ EXPORT_SYMBOL_GPL(typec_unregister_plug); +@@ -747,15 +1058,6 @@ EXPORT_SYMBOL_GPL(typec_unregister_plug); /* Type-C Cables */ @@ -1629279,7 +1629165,7 @@ index 9d3a35b2046d..4fd17c662d15 static const char * const typec_plug_types[] = { [USB_PLUG_NONE] = "unknown", [USB_PLUG_TYPE_A] = "type-a", -@@ -775,6 +1077,7 @@ static DEVICE_ATTR_RO(plug_type); +@@ -776,6 +1078,7 @@ static DEVICE_ATTR_RO(plug_type); static struct attribute *typec_cable_attrs[] = { &dev_attr_type.attr, &dev_attr_plug_type.attr, @@ -1629287,7 +1629173,7 @@ index 9d3a35b2046d..4fd17c662d15 NULL }; ATTRIBUTE_GROUPS(typec_cable); -@@ -877,6 +1180,7 @@ struct typec_cable *typec_register_cable(struct typec_port *port, +@@ -878,6 +1181,7 @@ struct typec_cable *typec_register_cable(struct typec_port *port, cable->type = desc->type; cable->active = desc->active; @@ -1629295,7 +1629181,7 @@ index 9d3a35b2046d..4fd17c662d15 if (desc->identity) { /* -@@ -1246,11 +1550,23 @@ static ssize_t usb_power_delivery_revision_show(struct device *dev, +@@ -1247,11 +1551,23 @@ static ssize_t usb_power_delivery_revision_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -1629322,7 +1629208,7 @@ index 9d3a35b2046d..4fd17c662d15 static ssize_t orientation_show(struct device *dev, struct device_attribute *attr, -@@ -1311,7 +1627,7 @@ static umode_t typec_attr_is_visible(struct kobject *kobj, +@@ -1312,7 +1628,7 @@ static umode_t typec_attr_is_visible(struct kobject *kobj, return attr->mode; } @@ -1629331,7 +1629217,7 @@ index 9d3a35b2046d..4fd17c662d15 .is_visible = typec_attr_is_visible, .attrs = typec_attrs, }; -@@ -1354,6 +1670,11 @@ const struct device_type typec_port_dev_type = { +@@ -1355,6 +1671,11 @@ const struct device_type typec_port_dev_type = { /* --------------------------------------- */ /* Driver callbacks to report role updates */ @@ -1629343,7 +1629229,7 @@ index 9d3a35b2046d..4fd17c662d15 /** * typec_set_data_role - Report data role change * @port: The USB Type-C Port where the role was changed -@@ -1363,12 +1684,23 @@ const struct device_type typec_port_dev_type = { +@@ -1364,12 +1685,23 @@ const struct device_type typec_port_dev_type = { */ void typec_set_data_role(struct typec_port *port, enum typec_data_role role) { @@ -1629367,7 +1629253,7 @@ index 9d3a35b2046d..4fd17c662d15 } EXPORT_SYMBOL_GPL(typec_set_data_role); -@@ -1409,11 +1741,6 @@ void typec_set_vconn_role(struct typec_port *port, enum typec_role role) +@@ -1410,11 +1742,6 @@ void typec_set_vconn_role(struct typec_port *port, enum typec_role role) } EXPORT_SYMBOL_GPL(typec_set_vconn_role); @@ -1629379,7 +1629265,7 @@ index 9d3a35b2046d..4fd17c662d15 /** * typec_set_pwr_opmode - Report changed power operation mode * @port: The USB Type-C Port where the mode was changed -@@ -1584,6 +1911,33 @@ EXPORT_SYMBOL_GPL(typec_set_mode); +@@ -1585,6 +1912,33 @@ EXPORT_SYMBOL_GPL(typec_set_mode); /* --------------------------------------- */ @@ -1629413,7 +1629299,7 @@ index 9d3a35b2046d..4fd17c662d15 /** * typec_get_drvdata - Return private driver data pointer * @port: USB Type-C port -@@ -1625,6 +1979,62 @@ typec_port_register_altmode(struct typec_port *port, +@@ -1626,6 +1980,62 @@ typec_port_register_altmode(struct typec_port *port, } EXPORT_SYMBOL_GPL(typec_port_register_altmode); @@ -1629477,9 +1629363,7 @@ index 9d3a35b2046d..4fd17c662d15 * typec_register_port - Register a USB Type-C Port * @parent: Parent device diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c b/drivers/usb/typec/mux/intel_pmc_mux.c -old mode 100644 -new mode 100755 -index 1276112edeff..271e2740992f +index 1276112edeff..271e2740992f 100644 --- a/drivers/usb/typec/mux/intel_pmc_mux.c +++ b/drivers/usb/typec/mux/intel_pmc_mux.c @@ -176,6 +176,7 @@ static int hsl_orientation(struct pmc_usb_port *port) @@ -1629536,9 +1629420,7 @@ index 1276112edeff..271e2740992f } diff --git a/drivers/usb/typec/tcpm/Kconfig b/drivers/usb/typec/tcpm/Kconfig -old mode 100644 -new mode 100755 -index 073fd2ea5e0b..82a6cd2b2493 +index 073fd2ea5e0b..82a6cd2b2493 100644 --- a/drivers/usb/typec/tcpm/Kconfig +++ b/drivers/usb/typec/tcpm/Kconfig @@ -20,6 +20,13 @@ config TYPEC_TCPCI @@ -1629556,9 +1629438,7 @@ index 073fd2ea5e0b..82a6cd2b2493 tristate "Richtek RT1711H Type-C chip driver" help diff --git a/drivers/usb/typec/tcpm/Makefile b/drivers/usb/typec/tcpm/Makefile -old mode 100644 -new mode 100755 -index 7d499f3569fd..d2ca41aea970 +index 7d499f3569fd..d2ca41aea970 100644 --- a/drivers/usb/typec/tcpm/Makefile +++ b/drivers/usb/typec/tcpm/Makefile @@ -4,6 +4,7 @@ obj-$(CONFIG_TYPEC_FUSB302) += fusb302.o @@ -1629570,9 +1629450,7 @@ index 7d499f3569fd..d2ca41aea970 obj-$(CONFIG_TYPEC_MT6360) += tcpci_mt6360.o obj-$(CONFIG_TYPEC_TCPCI_MAXIM) += tcpci_maxim.o diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c -old mode 100644 -new mode 100755 -index 700e38e92152..3b36e5353a94 +index 700e38e92152..3b36e5353a94 100644 --- a/drivers/usb/typec/tcpm/fusb302.c +++ b/drivers/usb/typec/tcpm/fusb302.c @@ -343,12 +343,11 @@ static int fusb302_sw_reset(struct fusb302_chip *chip) @@ -1629650,9 +1629528,7 @@ index 700e38e92152..3b36e5353a94 spin_lock_irqsave(&chip->irq_lock, flags); if (chip->irq_while_suspended) { diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c -old mode 100644 -new mode 100755 -index 069affa5cb1e..fde55279da6d +index e34e46df8024..5f1079932cfc 100644 --- a/drivers/usb/typec/tcpm/tcpci.c +++ b/drivers/usb/typec/tcpm/tcpci.c @@ -18,7 +18,20 @@ @@ -1629867,7 +1629743,7 @@ index 069affa5cb1e..fde55279da6d ret = regmap_write(tcpci->regmap, TCPC_TRANSMIT, reg); if (ret < 0) return ret; -@@ -506,12 +631,22 @@ static int tcpci_init(struct tcpc_dev *tcpc) +@@ -510,12 +635,22 @@ static int tcpci_init(struct tcpc_dev *tcpc) TCPC_ALERT_RX_HARD_RST | TCPC_ALERT_CC_STATUS; if (tcpci->controls_vbus) reg |= TCPC_ALERT_POWER_STATUS; @@ -1629890,7 +1629766,7 @@ index 069affa5cb1e..fde55279da6d tcpci_read16(tcpci, TCPC_ALERT, &status); -@@ -527,15 +662,12 @@ irqreturn_t tcpci_irq(struct tcpci *tcpci) +@@ -531,15 +666,12 @@ irqreturn_t tcpci_irq(struct tcpci *tcpci) tcpm_cc_change(tcpci->port); if (status & TCPC_ALERT_POWER_STATUS) { @@ -1629908,7 +1629784,7 @@ index 069affa5cb1e..fde55279da6d tcpm_tcpc_reset(tcpci->port); else tcpm_vbus_change(tcpci->port); -@@ -574,6 +706,12 @@ irqreturn_t tcpci_irq(struct tcpci *tcpci) +@@ -578,6 +710,12 @@ irqreturn_t tcpci_irq(struct tcpci *tcpci) tcpm_pd_receive(tcpci->port, &msg); } @@ -1629921,7 +1629797,7 @@ index 069affa5cb1e..fde55279da6d if (status & TCPC_ALERT_RX_HARD_RST) tcpm_pd_hard_reset(tcpci->port); -@@ -633,6 +771,7 @@ struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data) +@@ -637,6 +775,7 @@ struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data) tcpci->tcpc.get_vbus = tcpci_get_vbus; tcpci->tcpc.set_vbus = tcpci_set_vbus; tcpci->tcpc.set_cc = tcpci_set_cc; @@ -1629929,7 +1629805,7 @@ index 069affa5cb1e..fde55279da6d tcpci->tcpc.get_cc = tcpci_get_cc; tcpci->tcpc.set_polarity = tcpci_set_polarity; tcpci->tcpc.set_vconn = tcpci_set_vconn; -@@ -643,6 +782,19 @@ struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data) +@@ -647,6 +786,19 @@ struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data) tcpci->tcpc.pd_transmit = tcpci_pd_transmit; tcpci->tcpc.set_bist_data = tcpci_set_bist_data; tcpci->tcpc.enable_frs = tcpci_enable_frs; @@ -1629950,9 +1629826,7 @@ index 069affa5cb1e..fde55279da6d err = tcpci_parse_config(tcpci); if (err < 0) diff --git a/drivers/usb/typec/tcpm/tcpci.h b/drivers/usb/typec/tcpm/tcpci.h -old mode 100644 -new mode 100755 -index 5ef07a56d67a..2be7a77d400e +index 95ce89139c6e..fa9a07425106 100644 --- a/drivers/usb/typec/tcpm/tcpci.h +++ b/drivers/usb/typec/tcpm/tcpci.h @@ -8,6 +8,8 @@ @@ -1630008,8 +1629882,8 @@ index 5ef07a56d67a..2be7a77d400e +#define TCPC_POWER_STATUS_SINKING_VBUS BIT(0) #define TCPC_FAULT_STATUS 0x1f - -@@ -114,6 +131,10 @@ + #define TCPC_FAULT_STATUS_ALL_REG_RST_TO_DEFAULT BIT(7) +@@ -115,6 +132,10 @@ #define TCPC_RX_DETECT 0x2f #define TCPC_RX_DETECT_HARD_RESET BIT(5) #define TCPC_RX_DETECT_SOP BIT(0) @@ -1630020,7 +1629894,7 @@ index 5ef07a56d67a..2be7a77d400e #define TCPC_RX_BYTE_CNT 0x30 #define TCPC_RX_BUF_FRAME_TYPE 0x31 -@@ -132,7 +153,11 @@ +@@ -133,7 +154,11 @@ #define TCPC_TX_DATA 0x54 /* through 0x6f */ #define TCPC_VBUS_VOLTAGE 0x70 @@ -1630032,7 +1629906,7 @@ index 5ef07a56d67a..2be7a77d400e #define TCPC_VBUS_STOP_DISCHARGE_THRESH 0x74 #define TCPC_VBUS_VOLTAGE_ALARM_HI_CFG 0x76 #define TCPC_VBUS_VOLTAGE_ALARM_LO_CFG 0x78 -@@ -140,20 +165,38 @@ +@@ -141,20 +166,38 @@ /* I2C_WRITE_BYTE_COUNT + 1 when TX_BUF_BYTE_x is only accessible I2C_WRITE_BYTE_COUNT */ #define TCPC_TRANSMIT_BUFFER_MAX_LEN 31 @@ -1630074,7 +1629948,7 @@ index 5ef07a56d67a..2be7a77d400e struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data); diff --git a/drivers/usb/typec/tcpm/tcpci_husb311.c b/drivers/usb/typec/tcpm/tcpci_husb311.c -new file mode 100755 +new file mode 100644 index 000000000000..72a524b5cc98 --- /dev/null +++ b/drivers/usb/typec/tcpm/tcpci_husb311.c @@ -1630378,9 +1630252,7 @@ index 000000000000..72a524b5cc98 +MODULE_DESCRIPTION("Husb311 USB Type-C Port Controller Interface Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/usb/typec/tcpm/tcpci_maxim.c b/drivers/usb/typec/tcpm/tcpci_maxim.c -old mode 100644 -new mode 100755 -index 723d7dd38f75..7b39cbd099c2 +index 723d7dd38f75..7b39cbd099c2 100644 --- a/drivers/usb/typec/tcpm/tcpci_maxim.c +++ b/drivers/usb/typec/tcpm/tcpci_maxim.c @@ -22,6 +22,9 @@ @@ -1630520,9 +1630392,7 @@ index 723d7dd38f75..7b39cbd099c2 }; MODULE_DEVICE_TABLE(of, max_tcpci_of_match); diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c -old mode 100644 -new mode 100755 -index cf0e6a80815a..e28c57d194a3 +index ac3953a0fa29..4eefc1e14c6d 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -76,6 +76,8 @@ @@ -1631452,7 +1631322,7 @@ index cf0e6a80815a..e28c57d194a3 response[0] |= VDO_OPOS(adev->mode); rlen = 1; } -@@ -1411,19 +1883,26 @@ static void tcpm_handle_vdm_request(struct tcpm_port *port, +@@ -1412,19 +1884,26 @@ static void tcpm_handle_vdm_request(struct tcpm_port *port, if (rlen > 0) tcpm_queue_vdm(port, response[0], &response[1], rlen - 1); @@ -1631480,7 +1631350,7 @@ index cf0e6a80815a..e28c57d194a3 tcpm_queue_vdm(port, header, data, count); } -@@ -1456,7 +1935,8 @@ static unsigned int vdm_ready_timeout(u32 vdm_hdr) +@@ -1457,7 +1936,8 @@ static unsigned int vdm_ready_timeout(u32 vdm_hdr) static void vdm_run_state_machine(struct tcpm_port *port) { struct pd_message msg; @@ -1631490,7 +1631360,7 @@ index cf0e6a80815a..e28c57d194a3 switch (port->vdm_state) { case VDM_STATE_READY: -@@ -1470,37 +1950,68 @@ static void vdm_run_state_machine(struct tcpm_port *port) +@@ -1471,37 +1951,68 @@ static void vdm_run_state_machine(struct tcpm_port *port) * if there's traffic or we're not in PDO ready state don't send * a VDM. */ @@ -1631578,7 +1631448,7 @@ index cf0e6a80815a..e28c57d194a3 break; case VDM_STATE_ERR_SEND: /* -@@ -1513,6 +2024,32 @@ static void vdm_run_state_machine(struct tcpm_port *port) +@@ -1514,6 +2025,32 @@ static void vdm_run_state_machine(struct tcpm_port *port) tcpm_log(port, "VDM Tx error, retry"); port->vdm_retries++; port->vdm_state = VDM_STATE_READY; @@ -1631611,7 +1631481,7 @@ index cf0e6a80815a..e28c57d194a3 } break; default: -@@ -1535,7 +2072,11 @@ static void vdm_state_machine_work(struct kthread_work *work) +@@ -1536,7 +2073,11 @@ static void vdm_state_machine_work(struct kthread_work *work) prev_state = port->vdm_state; vdm_run_state_machine(port); } while (port->vdm_state != prev_state && @@ -1631624,7 +1631494,7 @@ index cf0e6a80815a..e28c57d194a3 mutex_unlock(&port->lock); } -@@ -1663,9 +2204,14 @@ static int tcpm_validate_caps(struct tcpm_port *port, const u32 *pdo, +@@ -1664,9 +2205,14 @@ static int tcpm_validate_caps(struct tcpm_port *port, const u32 *pdo, static int tcpm_altmode_enter(struct typec_altmode *altmode, u32 *vdo) { struct tcpm_port *port = typec_altmode_get_drvdata(altmode); @@ -1631640,7 +1631510,7 @@ index cf0e6a80815a..e28c57d194a3 header |= VDO_OPOS(altmode->mode); tcpm_queue_vdm_unlocked(port, header, vdo, vdo ? 1 : 0); -@@ -1675,9 +2221,14 @@ static int tcpm_altmode_enter(struct typec_altmode *altmode, u32 *vdo) +@@ -1676,9 +2222,14 @@ static int tcpm_altmode_enter(struct typec_altmode *altmode, u32 *vdo) static int tcpm_altmode_exit(struct typec_altmode *altmode) { struct tcpm_port *port = typec_altmode_get_drvdata(altmode); @@ -1631656,7 +1631526,7 @@ index cf0e6a80815a..e28c57d194a3 header |= VDO_OPOS(altmode->mode); tcpm_queue_vdm_unlocked(port, header, NULL, 0); -@@ -1722,20 +2273,108 @@ static void tcpm_handle_alert(struct tcpm_port *port, const __le32 *payload, +@@ -1723,20 +2274,108 @@ static void tcpm_handle_alert(struct tcpm_port *port, const __le32 *payload, if (!type) { tcpm_log(port, "Alert message received with no type"); @@ -1631772,7 +1631642,7 @@ index cf0e6a80815a..e28c57d194a3 } } -@@ -1746,15 +2385,18 @@ static void tcpm_pd_data_request(struct tcpm_port *port, +@@ -1747,15 +2386,18 @@ static void tcpm_pd_data_request(struct tcpm_port *port, unsigned int cnt = pd_header_cnt_le(msg->header); unsigned int rev = pd_header_rev_le(msg->header); unsigned int i; @@ -1631795,7 +1631665,7 @@ index cf0e6a80815a..e28c57d194a3 for (i = 0; i < cnt; i++) port->source_caps[i] = le32_to_cpu(msg->payload[i]); -@@ -1770,12 +2412,26 @@ static void tcpm_pd_data_request(struct tcpm_port *port, +@@ -1771,12 +2413,26 @@ static void tcpm_pd_data_request(struct tcpm_port *port, * to comply with 6.2.1.1.5 of the USB PD 3.0 spec. We don't * support Rev 1.0 so just do nothing in that scenario. */ @@ -1631823,7 +1631693,7 @@ index cf0e6a80815a..e28c57d194a3 /* * This message may be received even if VBUS is not * present. This is quite unexpected; see USB PD -@@ -1789,42 +2445,68 @@ static void tcpm_pd_data_request(struct tcpm_port *port, +@@ -1790,42 +2446,68 @@ static void tcpm_pd_data_request(struct tcpm_port *port, * but be prepared to keep waiting for VBUS after it was * handled. */ @@ -1631904,7 +1631774,7 @@ index cf0e6a80815a..e28c57d194a3 if (frs_enable) { ret = port->tcpc->enable_frs(port->tcpc, true); tcpm_log(port, "Enable FRS %s, ret:%d\n", ret ? "fail" : "success", ret); -@@ -1832,27 +2514,45 @@ static void tcpm_pd_data_request(struct tcpm_port *port, +@@ -1833,27 +2515,45 @@ static void tcpm_pd_data_request(struct tcpm_port *port, port->nr_sink_caps = cnt; port->sink_cap_done = true; @@ -1631958,7 +1631828,7 @@ index cf0e6a80815a..e28c57d194a3 break; } } -@@ -1872,31 +2572,25 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, +@@ -1873,31 +2573,25 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, enum pd_ctrl_msg_type type = pd_header_type_le(msg->header); enum tcpm_state next_state; @@ -1632002,7 +1631872,7 @@ index cf0e6a80815a..e28c57d194a3 break; case PD_CTRL_GOTO_MIN: break; -@@ -1908,6 +2602,10 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, +@@ -1909,6 +2603,10 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, port->req_current_limit, port->req_supply_voltage); port->explicit_contract = true; @@ -1632013,7 +1631883,7 @@ index cf0e6a80815a..e28c57d194a3 tcpm_set_state(port, SNK_READY, 0); } else { /* -@@ -1931,6 +2629,11 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, +@@ -1932,6 +2630,11 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, tcpm_set_state(port, FR_SWAP_SNK_SRC_NEW_SINK_READY, 0); break; default: @@ -1632025,7 +1631895,7 @@ index cf0e6a80815a..e28c57d194a3 break; } break; -@@ -1944,6 +2647,11 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, +@@ -1945,6 +2648,11 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, next_state = SNK_READY; else next_state = SNK_WAIT_CAPABILITIES; @@ -1632037,7 +1631907,7 @@ index cf0e6a80815a..e28c57d194a3 tcpm_set_state(port, next_state, 0); break; case SNK_NEGOTIATE_PPS_CAPABILITIES: -@@ -1952,6 +2660,12 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, +@@ -1953,6 +2661,12 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, port->pps_data.req_op_curr = port->current_limit; port->pps_status = (type == PD_CTRL_WAIT ? -EAGAIN : -EOPNOTSUPP); @@ -1632050,7 +1631920,7 @@ index cf0e6a80815a..e28c57d194a3 tcpm_set_state(port, SNK_READY, 0); break; case DR_SWAP_SEND: -@@ -1976,7 +2690,22 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, +@@ -1977,7 +2691,22 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, port->sink_cap_done = true; tcpm_set_state(port, ready_state(port), 0); break; @@ -1632073,7 +1631943,7 @@ index cf0e6a80815a..e28c57d194a3 break; } break; -@@ -1997,13 +2726,14 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, +@@ -1998,13 +2727,14 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, tcpm_set_state(port, SNK_TRANSITION_SINK, 0); break; case SOFT_RESET_SEND: @@ -1632095,7 +1631965,7 @@ index cf0e6a80815a..e28c57d194a3 break; case DR_SWAP_SEND: tcpm_set_state(port, DR_SWAP_CHANGE_DR, 0); -@@ -2018,57 +2748,62 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, +@@ -2019,57 +2749,62 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, tcpm_set_state(port, FR_SWAP_SNK_SRC_TRANSITION_TO_OFF, 0); break; default: @@ -1632187,7 +1632057,7 @@ index cf0e6a80815a..e28c57d194a3 break; case PD_CTRL_GET_SOURCE_CAP_EXT: case PD_CTRL_GET_STATUS: -@@ -2076,10 +2811,19 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, +@@ -2077,10 +2812,19 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, case PD_CTRL_GET_PPS_STATUS: case PD_CTRL_GET_COUNTRY_CODES: /* Currently not supported */ @@ -1632209,7 +1632079,7 @@ index cf0e6a80815a..e28c57d194a3 break; } } -@@ -2090,34 +2834,37 @@ static void tcpm_pd_ext_msg_request(struct tcpm_port *port, +@@ -2091,34 +2835,37 @@ static void tcpm_pd_ext_msg_request(struct tcpm_port *port, enum pd_ext_msg_type type = pd_header_type_le(msg->header); unsigned int data_size = pd_ext_header_data_size_le(msg->ext_msg.header); @@ -1632263,7 +1632133,7 @@ index cf0e6a80815a..e28c57d194a3 break; case PD_EXT_SOURCE_CAP_EXT: case PD_EXT_GET_BATT_CAP: -@@ -2131,10 +2878,11 @@ static void tcpm_pd_ext_msg_request(struct tcpm_port *port, +@@ -2132,10 +2879,11 @@ static void tcpm_pd_ext_msg_request(struct tcpm_port *port, case PD_EXT_FW_UPDATE_RESPONSE: case PD_EXT_COUNTRY_INFO: case PD_EXT_COUNTRY_CODES: @@ -1632277,7 +1632147,7 @@ index cf0e6a80815a..e28c57d194a3 break; } } -@@ -2179,7 +2927,7 @@ static void tcpm_pd_rx_handler(struct kthread_work *work) +@@ -2180,7 +2928,7 @@ static void tcpm_pd_rx_handler(struct kthread_work *work) "Data role mismatch, initiating error recovery"); tcpm_set_state(port, ERROR_RECOVERY, 0); } else { @@ -1632286,7 +1632156,7 @@ index cf0e6a80815a..e28c57d194a3 tcpm_pd_ext_msg_request(port, msg); else if (cnt) tcpm_pd_data_request(port, msg); -@@ -2230,6 +2978,7 @@ static int tcpm_pd_send_control(struct tcpm_port *port, +@@ -2231,6 +2979,7 @@ static int tcpm_pd_send_control(struct tcpm_port *port, static bool tcpm_send_queued_message(struct tcpm_port *port) { enum pd_msg_request queued_message; @@ -1632294,7 +1632164,7 @@ index cf0e6a80815a..e28c57d194a3 do { queued_message = port->queued_message; -@@ -2246,10 +2995,27 @@ static bool tcpm_send_queued_message(struct tcpm_port *port) +@@ -2247,10 +2996,27 @@ static bool tcpm_send_queued_message(struct tcpm_port *port) tcpm_pd_send_control(port, PD_CTRL_NOT_SUPP); break; case PD_MSG_DATA_SINK_CAP: @@ -1632324,7 +1632194,7 @@ index cf0e6a80815a..e28c57d194a3 break; default: break; -@@ -2615,6 +3381,12 @@ static int tcpm_pd_send_request(struct tcpm_port *port) +@@ -2616,6 +3382,12 @@ static int tcpm_pd_send_request(struct tcpm_port *port) if (ret < 0) return ret; @@ -1632337,7 +1632207,7 @@ index cf0e6a80815a..e28c57d194a3 memset(&msg, 0, sizeof(msg)); msg.header = PD_HEADER_LE(PD_DATA_REQUEST, port->pwr_role, -@@ -2712,6 +3484,9 @@ static int tcpm_pd_send_pps_request(struct tcpm_port *port) +@@ -2713,6 +3485,9 @@ static int tcpm_pd_send_pps_request(struct tcpm_port *port) if (ret < 0) return ret; @@ -1632347,7 +1632217,7 @@ index cf0e6a80815a..e28c57d194a3 memset(&msg, 0, sizeof(msg)); msg.header = PD_HEADER_LE(PD_DATA_REQUEST, port->pwr_role, -@@ -2771,13 +3546,6 @@ static bool tcpm_start_toggling(struct tcpm_port *port, enum typec_cc_status cc) +@@ -2772,13 +3547,6 @@ static bool tcpm_start_toggling(struct tcpm_port *port, enum typec_cc_status cc) return ret == 0; } @@ -1632361,7 +1632231,7 @@ index cf0e6a80815a..e28c57d194a3 static int tcpm_init_vbus(struct tcpm_port *port) { int ret; -@@ -2829,8 +3597,9 @@ static int tcpm_src_attach(struct tcpm_port *port) +@@ -2830,8 +3598,9 @@ static int tcpm_src_attach(struct tcpm_port *port) if (ret < 0) return ret; @@ -1632373,7 +1632243,7 @@ index cf0e6a80815a..e28c57d194a3 if (ret < 0) return ret; -@@ -2859,6 +3628,7 @@ static int tcpm_src_attach(struct tcpm_port *port) +@@ -2860,6 +3629,7 @@ static int tcpm_src_attach(struct tcpm_port *port) port->partner = NULL; port->attached = true; @@ -1632381,7 +1632251,7 @@ index cf0e6a80815a..e28c57d194a3 port->send_discover = true; return 0; -@@ -2895,13 +3665,26 @@ static void tcpm_unregister_altmodes(struct tcpm_port *port) +@@ -2896,13 +3666,26 @@ static void tcpm_unregister_altmodes(struct tcpm_port *port) memset(modep, 0, sizeof(*modep)); } @@ -1632408,7 +1632278,7 @@ index cf0e6a80815a..e28c57d194a3 /* * First Rx ID should be 0; set this to a sentinel of -1 so that -@@ -2960,8 +3743,9 @@ static int tcpm_snk_attach(struct tcpm_port *port) +@@ -2961,8 +3744,9 @@ static int tcpm_snk_attach(struct tcpm_port *port) if (ret < 0) return ret; @@ -1632420,7 +1632290,7 @@ index cf0e6a80815a..e28c57d194a3 if (ret < 0) return ret; -@@ -2970,6 +3754,7 @@ static int tcpm_snk_attach(struct tcpm_port *port) +@@ -2971,6 +3755,7 @@ static int tcpm_snk_attach(struct tcpm_port *port) port->partner = NULL; port->attached = true; @@ -1632428,7 +1632298,7 @@ index cf0e6a80815a..e28c57d194a3 port->send_discover = true; return 0; -@@ -2997,6 +3782,7 @@ static int tcpm_acc_attach(struct tcpm_port *port) +@@ -2998,6 +3783,7 @@ static int tcpm_acc_attach(struct tcpm_port *port) tcpm_typec_connect(port); port->attached = true; @@ -1632436,7 +1632306,7 @@ index cf0e6a80815a..e28c57d194a3 return 0; } -@@ -3033,14 +3819,15 @@ static inline enum tcpm_state unattached_state(struct tcpm_port *port) +@@ -3034,14 +3820,15 @@ static inline enum tcpm_state unattached_state(struct tcpm_port *port) return SNK_UNATTACHED; } @@ -1632458,7 +1632328,7 @@ index cf0e6a80815a..e28c57d194a3 static void tcpm_swap_complete(struct tcpm_port *port, int result) { -@@ -3069,7 +3856,11 @@ static void run_state_machine(struct tcpm_port *port) +@@ -3070,7 +3857,11 @@ static void run_state_machine(struct tcpm_port *port) { int ret; enum typec_pwr_opmode opmode; @@ -1632471,7 +1632341,7 @@ index cf0e6a80815a..e28c57d194a3 port->enter_state = port->state; switch (port->state) { -@@ -3080,6 +3871,15 @@ static void run_state_machine(struct tcpm_port *port) +@@ -3081,6 +3872,15 @@ static void run_state_machine(struct tcpm_port *port) if (!port->non_pd_role_swap) tcpm_swap_complete(port, -ENOTCONN); tcpm_src_detach(port); @@ -1632487,7 +1632357,7 @@ index cf0e6a80815a..e28c57d194a3 if (tcpm_start_toggling(port, tcpm_rp_cc(port))) { tcpm_set_state(port, TOGGLING, 0); break; -@@ -3103,6 +3903,7 @@ static void run_state_machine(struct tcpm_port *port) +@@ -3104,6 +3904,7 @@ static void run_state_machine(struct tcpm_port *port) break; case SNK_TRY: @@ -1632495,7 +1632365,7 @@ index cf0e6a80815a..e28c57d194a3 port->try_snk_count++; /* * Requirements: -@@ -3125,15 +3926,13 @@ static void run_state_machine(struct tcpm_port *port) +@@ -3126,15 +3927,13 @@ static void run_state_machine(struct tcpm_port *port) break; case SNK_TRY_WAIT_DEBOUNCE: tcpm_set_state(port, SNK_TRY_WAIT_DEBOUNCE_CHECK_VBUS, @@ -1632514,7 +1632384,7 @@ index cf0e6a80815a..e28c57d194a3 break; case SRC_TRYWAIT: tcpm_set_cc(port, tcpm_rp_cc(port)); -@@ -3172,7 +3971,12 @@ static void run_state_machine(struct tcpm_port *port) +@@ -3173,7 +3972,12 @@ static void run_state_machine(struct tcpm_port *port) port->message_id = 0; port->rx_msgid = -1; port->explicit_contract = false; @@ -1632528,7 +1632398,7 @@ index cf0e6a80815a..e28c57d194a3 break; case SRC_SEND_CAPABILITIES: port->caps_count++; -@@ -3233,6 +4037,8 @@ static void run_state_machine(struct tcpm_port *port) +@@ -3234,6 +4038,8 @@ static void run_state_machine(struct tcpm_port *port) } } else { tcpm_pd_send_control(port, PD_CTRL_ACCEPT); @@ -1632537,7 +1632407,7 @@ index cf0e6a80815a..e28c57d194a3 tcpm_set_state(port, SRC_TRANSITION_SUPPLY, PD_T_SRC_TRANSITION); } -@@ -3254,7 +4060,36 @@ static void run_state_machine(struct tcpm_port *port) +@@ -3255,7 +4061,36 @@ static void run_state_machine(struct tcpm_port *port) tcpm_swap_complete(port, 0); tcpm_typec_connect(port); @@ -1632575,7 +1632445,7 @@ index cf0e6a80815a..e28c57d194a3 /* * 6.3.5 * Sending ping messages is not necessary if -@@ -3279,6 +4114,15 @@ static void run_state_machine(struct tcpm_port *port) +@@ -3280,6 +4115,15 @@ static void run_state_machine(struct tcpm_port *port) tcpm_swap_complete(port, -ENOTCONN); tcpm_pps_complete(port, -ENOTCONN); tcpm_snk_detach(port); @@ -1632591,7 +1632461,7 @@ index cf0e6a80815a..e28c57d194a3 if (tcpm_start_toggling(port, TYPEC_CC_RD)) { tcpm_set_state(port, TOGGLING, 0); break; -@@ -3299,14 +4143,18 @@ static void run_state_machine(struct tcpm_port *port) +@@ -3300,14 +4144,18 @@ static void run_state_machine(struct tcpm_port *port) PD_T_PD_DEBOUNCE); break; case SNK_DEBOUNCED: @@ -1632613,9 +1632483,7 @@ index cf0e6a80815a..e28c57d194a3 case SRC_TRY: port->try_src_count++; diff --git a/drivers/usb/typec/tcpm/wcove.c b/drivers/usb/typec/tcpm/wcove.c -old mode 100644 -new mode 100755 -index 7e9c279bf49d..5d125339687a +index 7e9c279bf49d..5d125339687a 100644 --- a/drivers/usb/typec/tcpm/wcove.c +++ b/drivers/usb/typec/tcpm/wcove.c @@ -356,7 +356,8 @@ static int wcove_set_pd_rx(struct tcpc_dev *tcpc, bool on) @@ -1632629,9 +1632497,7 @@ index 7e9c279bf49d..5d125339687a struct wcove_typec *wcove = tcpc_to_wcove(tcpc); unsigned int info = 0; diff --git a/drivers/usb/typec/ucsi/Kconfig b/drivers/usb/typec/ucsi/Kconfig -old mode 100644 -new mode 100755 -index 2192d7c4fec7..5e9b37b3f25e +index 2192d7c4fec7..5e9b37b3f25e 100644 --- a/drivers/usb/typec/ucsi/Kconfig +++ b/drivers/usb/typec/ucsi/Kconfig @@ -3,6 +3,7 @@ @@ -1632643,9 +1632509,7 @@ index 2192d7c4fec7..5e9b37b3f25e USB Type-C Connector System Software Interface (UCSI) is a specification for an interface that allows the operating system to diff --git a/drivers/usb/typec/ucsi/displayport.c b/drivers/usb/typec/ucsi/displayport.c -old mode 100644 -new mode 100755 -index 261131c9e37c..73cd5bf35047 +index 261131c9e37c..73cd5bf35047 100644 --- a/drivers/usb/typec/ucsi/displayport.c +++ b/drivers/usb/typec/ucsi/displayport.c @@ -49,6 +49,7 @@ static int ucsi_displayport_enter(struct typec_altmode *alt, u32 *vdo) @@ -1632725,9 +1632589,7 @@ index 261131c9e37c..73cd5bf35047 switch (cmd) { diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c -old mode 100644 -new mode 100755 -index cd3689005c31..8ed0f49e6df8 +index cd3689005c31..8ed0f49e6df8 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -613,6 +613,7 @@ static void ucsi_unregister_partner(struct ucsi_connector *con) @@ -1632869,9 +1632731,7 @@ index cd3689005c31..8ed0f49e6df8 ret = ucsi_register_altmodes(con, UCSI_RECIPIENT_SOP); if (ret) { diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h -old mode 100644 -new mode 100755 -index fce23ad16c6d..b3450d87f324 +index fce23ad16c6d..b3450d87f324 100644 --- a/drivers/usb/typec/ucsi/ucsi.h +++ b/drivers/usb/typec/ucsi/ucsi.h @@ -9,6 +9,8 @@ @@ -1632941,7 +1632801,7 @@ index 1cf924f3aecc..cd3676b96fb0 100644 pb->scale)); diff --git a/drivers/video/rockchip/Kconfig b/drivers/video/rockchip/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..6548dd38b534 --- /dev/null +++ b/drivers/video/rockchip/Kconfig @@ -1632958,7 +1632818,7 @@ index 000000000000..6548dd38b534 +source "drivers/video/rockchip/vehicle/Kconfig" +source "drivers/video/rockchip/vtunnel/Kconfig" diff --git a/drivers/video/rockchip/Makefile b/drivers/video/rockchip/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..867ac56fe5b7 --- /dev/null +++ b/drivers/video/rockchip/Makefile @@ -1633988,7 +1633848,7 @@ index 000000000000..9f298b7dd47d + +#endif diff --git a/drivers/video/rockchip/iep/Kconfig b/drivers/video/rockchip/iep/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..cd8ba653f9ea --- /dev/null +++ b/drivers/video/rockchip/iep/Kconfig @@ -1634004,7 +1633864,7 @@ index 000000000000..cd8ba653f9ea + +endmenu diff --git a/drivers/video/rockchip/iep/Makefile b/drivers/video/rockchip/iep/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..f4dba6e9379a --- /dev/null +++ b/drivers/video/rockchip/iep/Makefile @@ -1634014,7 +1633874,7 @@ index 000000000000..f4dba6e9379a +iep-$(CONFIG_DRM) += iep_iommu_drm.o +obj-$(CONFIG_IEP) += iep.o diff --git a/drivers/video/rockchip/iep/hw_iep_config_addr.h b/drivers/video/rockchip/iep/hw_iep_config_addr.h -new file mode 100755 +new file mode 100644 index 000000000000..1f4a0706233f --- /dev/null +++ b/drivers/video/rockchip/iep/hw_iep_config_addr.h @@ -1634119,7 +1633979,7 @@ index 000000000000..1f4a0706233f + +#endif diff --git a/drivers/video/rockchip/iep/hw_iep_reg.c b/drivers/video/rockchip/iep/hw_iep_reg.c -new file mode 100755 +new file mode 100644 index 000000000000..331a50865045 --- /dev/null +++ b/drivers/video/rockchip/iep/hw_iep_reg.c @@ -1635655,7 +1635515,7 @@ index 000000000000..331a50865045 +} + diff --git a/drivers/video/rockchip/iep/hw_iep_reg.h b/drivers/video/rockchip/iep/hw_iep_reg.h -new file mode 100755 +new file mode 100644 index 000000000000..03d9fe92ca23 --- /dev/null +++ b/drivers/video/rockchip/iep/hw_iep_reg.h @@ -1636186,7 +1636046,7 @@ index 000000000000..03d9fe92ca23 +/*#define IEP_PRINT_INFO*/ +#endif diff --git a/drivers/video/rockchip/iep/iep.h b/drivers/video/rockchip/iep/iep.h -new file mode 100755 +new file mode 100644 index 000000000000..94e372e6a471 --- /dev/null +++ b/drivers/video/rockchip/iep/iep.h @@ -1636468,7 +1636328,7 @@ index 000000000000..94e372e6a471 + +#endif diff --git a/drivers/video/rockchip/iep/iep_drv.c b/drivers/video/rockchip/iep/iep_drv.c -new file mode 100755 +new file mode 100644 index 000000000000..f0cfc7164e39 --- /dev/null +++ b/drivers/video/rockchip/iep/iep_drv.c @@ -1637794,7 +1637654,7 @@ index 000000000000..f0cfc7164e39 + +#endif diff --git a/drivers/video/rockchip/iep/iep_drv.h b/drivers/video/rockchip/iep/iep_drv.h -new file mode 100755 +new file mode 100644 index 000000000000..19160c6ffccd --- /dev/null +++ b/drivers/video/rockchip/iep/iep_drv.h @@ -1637959,7 +1637819,7 @@ index 000000000000..19160c6ffccd +#endif + diff --git a/drivers/video/rockchip/iep/iep_iommu_drm.c b/drivers/video/rockchip/iep/iep_iommu_drm.c -new file mode 100755 +new file mode 100644 index 000000000000..411f567a6e4e --- /dev/null +++ b/drivers/video/rockchip/iep/iep_iommu_drm.c @@ -1638430,7 +1638290,7 @@ index 000000000000..411f567a6e4e + iommu_info->ops = &drm_ops; +} diff --git a/drivers/video/rockchip/iep/iep_iommu_ops.c b/drivers/video/rockchip/iep/iep_iommu_ops.c -new file mode 100755 +new file mode 100644 index 000000000000..e84772237b89 --- /dev/null +++ b/drivers/video/rockchip/iep/iep_iommu_ops.c @@ -1638680,7 +1638540,7 @@ index 000000000000..e84772237b89 + return 0; +} diff --git a/drivers/video/rockchip/iep/iep_iommu_ops.h b/drivers/video/rockchip/iep/iep_iommu_ops.h -new file mode 100755 +new file mode 100644 index 000000000000..9b71d53a51eb --- /dev/null +++ b/drivers/video/rockchip/iep/iep_iommu_ops.h @@ -1638807,7 +1638667,7 @@ index 000000000000..9b71d53a51eb + +#endif diff --git a/drivers/video/rockchip/mpp/Kconfig b/drivers/video/rockchip/mpp/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..53342703a6ee --- /dev/null +++ b/drivers/video/rockchip/mpp/Kconfig @@ -1638891,7 +1638751,7 @@ index 000000000000..53342703a6ee + +endif diff --git a/drivers/video/rockchip/mpp/Makefile b/drivers/video/rockchip/mpp/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..42ec696bc9d7 --- /dev/null +++ b/drivers/video/rockchip/mpp/Makefile @@ -1638927,7 +1638787,7 @@ index 000000000000..42ec696bc9d7 + +obj-$(CONFIG_ROCKCHIP_MPP_SERVICE) += rk_vcodec.o diff --git a/drivers/video/rockchip/mpp/hack/mpp_hack_px30.c b/drivers/video/rockchip/mpp/hack/mpp_hack_px30.c -new file mode 100755 +new file mode 100644 index 000000000000..07912bcc3436 --- /dev/null +++ b/drivers/video/rockchip/mpp/hack/mpp_hack_px30.c @@ -1639174,7 +1639034,7 @@ index 000000000000..07912bcc3436 + return ret; +} diff --git a/drivers/video/rockchip/mpp/hack/mpp_hack_px30.h b/drivers/video/rockchip/mpp/hack/mpp_hack_px30.h -new file mode 100755 +new file mode 100644 index 000000000000..c8402e30d810 --- /dev/null +++ b/drivers/video/rockchip/mpp/hack/mpp_hack_px30.h @@ -1639207,7 +1639067,7 @@ index 000000000000..c8402e30d810 + +#endif diff --git a/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_hack_rk3568.c b/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_hack_rk3568.c -new file mode 100755 +new file mode 100644 index 000000000000..c2bb2687fc3d --- /dev/null +++ b/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_hack_rk3568.c @@ -1639945,7 +1639805,7 @@ index 000000000000..c2bb2687fc3d + local_irq_restore(flags); +} diff --git a/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_link_hack_rk3568.c b/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_link_hack_rk3568.c -new file mode 100755 +new file mode 100644 index 000000000000..900b63a57673 --- /dev/null +++ b/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_link_hack_rk3568.c @@ -1641513,7 +1641373,7 @@ index 000000000000..33e118ae6450 + }, +}; diff --git a/drivers/video/rockchip/mpp/mpp_common.c b/drivers/video/rockchip/mpp/mpp_common.c -new file mode 100755 +new file mode 100644 index 000000000000..d43ebf450ed2 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_common.c @@ -1644129,7 +1643989,7 @@ index 000000000000..d43ebf450ed2 +} +#endif diff --git a/drivers/video/rockchip/mpp/mpp_common.h b/drivers/video/rockchip/mpp/mpp_common.h -new file mode 100755 +new file mode 100644 index 000000000000..8daeb0838170 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_common.h @@ -1644988,7 +1644848,7 @@ index 000000000000..8daeb0838170 + +#endif diff --git a/drivers/video/rockchip/mpp/mpp_debug.h b/drivers/video/rockchip/mpp/mpp_debug.h -new file mode 100755 +new file mode 100644 index 000000000000..4108c69da894 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_debug.h @@ -1645132,7 +1644992,7 @@ index 000000000000..4108c69da894 + +#endif diff --git a/drivers/video/rockchip/mpp/mpp_iep2.c b/drivers/video/rockchip/mpp/mpp_iep2.c -new file mode 100755 +new file mode 100644 index 000000000000..8d1926957f69 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_iep2.c @@ -1646176,7 +1646036,7 @@ index 000000000000..8d1926957f69 +EXPORT_SYMBOL(rockchip_iep2_driver); + diff --git a/drivers/video/rockchip/mpp/mpp_iommu.c b/drivers/video/rockchip/mpp/mpp_iommu.c -new file mode 100755 +new file mode 100644 index 000000000000..1abbfb74f4e2 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_iommu.c @@ -1646827,7 +1646687,7 @@ index 000000000000..1abbfb74f4e2 + return 0; +} diff --git a/drivers/video/rockchip/mpp/mpp_iommu.h b/drivers/video/rockchip/mpp/mpp_iommu.h -new file mode 100755 +new file mode 100644 index 000000000000..87d1b5c612d2 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_iommu.h @@ -1648006,7 +1647866,7 @@ index 000000000000..39ff16c21ee9 + }, +}; diff --git a/drivers/video/rockchip/mpp/mpp_jpgdec.c b/drivers/video/rockchip/mpp/mpp_jpgdec.c -new file mode 100755 +new file mode 100644 index 000000000000..753b061f22ea --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_jpgdec.c @@ -1648655,7 +1648515,7 @@ index 000000000000..753b061f22ea +}; +EXPORT_SYMBOL(rockchip_jpgdec_driver); diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec.c b/drivers/video/rockchip/mpp/mpp_rkvdec.c -new file mode 100755 +new file mode 100644 index 000000000000..4310a09a5ce0 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec.c @@ -1650700,7 +1650560,7 @@ index 000000000000..4310a09a5ce0 +}; +EXPORT_SYMBOL(rockchip_rkvdec_driver); diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2.c b/drivers/video/rockchip/mpp/mpp_rkvdec2.c -new file mode 100755 +new file mode 100644 index 000000000000..a463fc2eeccc --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2.c @@ -1652506,7 +1652366,7 @@ index 000000000000..a463fc2eeccc +}; +EXPORT_SYMBOL(rockchip_rkvdec2_driver); diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2.h b/drivers/video/rockchip/mpp/mpp_rkvdec2.h -new file mode 100755 +new file mode 100644 index 000000000000..3eabdace77f4 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2.h @@ -1652754,7 +1652614,7 @@ index 000000000000..3eabdace77f4 + +#endif diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2_link.c b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.c -new file mode 100755 +new file mode 100644 index 000000000000..7c5a58df1865 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.c @@ -1655271,7 +1655131,7 @@ index 000000000000..7c5a58df1865 + mpp_debug_leave(); +} diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2_link.h b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.h -new file mode 100755 +new file mode 100644 index 000000000000..518927e9481e --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.h @@ -1655515,7 +1655375,7 @@ index 000000000000..518927e9481e + +#endif diff --git a/drivers/video/rockchip/mpp/mpp_rkvenc.c b/drivers/video/rockchip/mpp/mpp_rkvenc.c -new file mode 100755 +new file mode 100644 index 000000000000..c71c03fb91eb --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvenc.c @@ -1657027,7 +1656887,7 @@ index 000000000000..c71c03fb91eb + }, +}; diff --git a/drivers/video/rockchip/mpp/mpp_rkvenc2.c b/drivers/video/rockchip/mpp/mpp_rkvenc2.c -new file mode 100755 +new file mode 100644 index 000000000000..111c106ae65c --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvenc2.c @@ -1659726,7 +1659586,7 @@ index 000000000000..111c106ae65c + }, +}; diff --git a/drivers/video/rockchip/mpp/mpp_service.c b/drivers/video/rockchip/mpp/mpp_service.c -new file mode 100755 +new file mode 100644 index 000000000000..c04d6fbf553b --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_service.c @@ -1661021,7 +1660881,7 @@ index 000000000000..c0dc382a1872 +}; +EXPORT_SYMBOL(rockchip_vdpp_driver); diff --git a/drivers/video/rockchip/mpp/mpp_vdpu1.c b/drivers/video/rockchip/mpp/mpp_vdpu1.c -new file mode 100755 +new file mode 100644 index 000000000000..6ddf5dae73f3 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vdpu1.c @@ -1661999,7 +1661859,7 @@ index 000000000000..6ddf5dae73f3 +}; +EXPORT_SYMBOL(rockchip_vdpu1_driver); diff --git a/drivers/video/rockchip/mpp/mpp_vdpu2.c b/drivers/video/rockchip/mpp/mpp_vdpu2.c -new file mode 100755 +new file mode 100644 index 000000000000..d5a6a3017208 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vdpu2.c @@ -1662813,7 +1662673,7 @@ index 000000000000..d5a6a3017208 +}; +EXPORT_SYMBOL(rockchip_vdpu2_driver); diff --git a/drivers/video/rockchip/mpp/mpp_vepu1.c b/drivers/video/rockchip/mpp/mpp_vepu1.c -new file mode 100755 +new file mode 100644 index 000000000000..18f685a2e948 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vepu1.c @@ -1663614,7 +1663474,7 @@ index 000000000000..18f685a2e948 +}; +EXPORT_SYMBOL(rockchip_vepu1_driver); diff --git a/drivers/video/rockchip/mpp/mpp_vepu2.c b/drivers/video/rockchip/mpp/mpp_vepu2.c -new file mode 100755 +new file mode 100644 index 000000000000..fb5f5e5c28e3 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vepu2.c @@ -1664898,7 +1664758,7 @@ index 000000000000..fb5f5e5c28e3 +}; +EXPORT_SYMBOL(rockchip_vepu2_driver); diff --git a/drivers/video/rockchip/mpp/rockchip_iep2_regs.h b/drivers/video/rockchip/mpp/rockchip_iep2_regs.h -new file mode 100755 +new file mode 100644 index 000000000000..d85a30dfb84f --- /dev/null +++ b/drivers/video/rockchip/mpp/rockchip_iep2_regs.h @@ -1665169,7 +1665029,7 @@ index 000000000000..d798dfd0c293 + +#endif diff --git a/drivers/video/rockchip/rga/Kconfig b/drivers/video/rockchip/rga/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..6023b2eb23a7 --- /dev/null +++ b/drivers/video/rockchip/rga/Kconfig @@ -1665185,7 +1665045,7 @@ index 000000000000..6023b2eb23a7 + +endmenu diff --git a/drivers/video/rockchip/rga/Makefile b/drivers/video/rockchip/rga/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..58dd4c6a3e42 --- /dev/null +++ b/drivers/video/rockchip/rga/Makefile @@ -1665195,7 +1665055,7 @@ index 000000000000..58dd4c6a3e42 + +obj-$(CONFIG_ROCKCHIP_RGA) += rga.o diff --git a/drivers/video/rockchip/rga/RGA_API.c b/drivers/video/rockchip/rga/RGA_API.c -new file mode 100755 +new file mode 100644 index 000000000000..947a9b925f60 --- /dev/null +++ b/drivers/video/rockchip/rga/RGA_API.c @@ -1665402,7 +1665262,7 @@ index 000000000000..947a9b925f60 + + diff --git a/drivers/video/rockchip/rga/RGA_API.h b/drivers/video/rockchip/rga/RGA_API.h -new file mode 100755 +new file mode 100644 index 000000000000..ade17d03e85c --- /dev/null +++ b/drivers/video/rockchip/rga/RGA_API.h @@ -1665448,7 +1665308,7 @@ index 000000000000..ade17d03e85c + +#endif diff --git a/drivers/video/rockchip/rga/rga.h b/drivers/video/rockchip/rga/rga.h -new file mode 100755 +new file mode 100644 index 000000000000..e54a6efba39f --- /dev/null +++ b/drivers/video/rockchip/rga/rga.h @@ -1665962,7 +1665822,7 @@ index 000000000000..e54a6efba39f + +#endif /*_RK29_IPP_DRIVER_H_*/ diff --git a/drivers/video/rockchip/rga/rga_drv.c b/drivers/video/rockchip/rga/rga_drv.c -new file mode 100755 +new file mode 100644 index 000000000000..2498023d4a4a --- /dev/null +++ b/drivers/video/rockchip/rga/rga_drv.c @@ -1668517,7 +1668377,7 @@ index 000000000000..2498023d4a4a +MODULE_DESCRIPTION("Driver for rga device"); +MODULE_LICENSE("GPL"); diff --git a/drivers/video/rockchip/rga/rga_mmu_info.c b/drivers/video/rockchip/rga/rga_mmu_info.c -new file mode 100755 +new file mode 100644 index 000000000000..8825183d92fc --- /dev/null +++ b/drivers/video/rockchip/rga/rga_mmu_info.c @@ -1669838,7 +1669698,7 @@ index 000000000000..8825183d92fc +} + diff --git a/drivers/video/rockchip/rga/rga_mmu_info.h b/drivers/video/rockchip/rga/rga_mmu_info.h -new file mode 100755 +new file mode 100644 index 000000000000..3e70894c7ee7 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_mmu_info.h @@ -1669868,7 +1669728,7 @@ index 000000000000..3e70894c7ee7 + + diff --git a/drivers/video/rockchip/rga/rga_reg_info.c b/drivers/video/rockchip/rga/rga_reg_info.c -new file mode 100755 +new file mode 100644 index 000000000000..94a6305b870b --- /dev/null +++ b/drivers/video/rockchip/rga/rga_reg_info.c @@ -1671461,7 +1671321,7 @@ index 000000000000..94a6305b870b + + diff --git a/drivers/video/rockchip/rga/rga_reg_info.h b/drivers/video/rockchip/rga/rga_reg_info.h -new file mode 100755 +new file mode 100644 index 000000000000..565e8f72d7f0 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_reg_info.h @@ -1671934,7 +1671794,7 @@ index 000000000000..565e8f72d7f0 +uint8_t RGA_pixel_width_init(uint32_t format); + diff --git a/drivers/video/rockchip/rga/rga_rop.h b/drivers/video/rockchip/rga/rga_rop.h -new file mode 100755 +new file mode 100644 index 000000000000..ed9758711022 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_rop.h @@ -1671996,7 +1671856,7 @@ index 000000000000..ed9758711022 + +#endif diff --git a/drivers/video/rockchip/rga/rga_type.h b/drivers/video/rockchip/rga/rga_type.h -new file mode 100755 +new file mode 100644 index 000000000000..ce3610ab9b67 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_type.h @@ -1672051,7 +1671911,7 @@ index 000000000000..ce3610ab9b67 +#endif /* __RGA_TYPR_H__ */ + diff --git a/drivers/video/rockchip/rga2/Kconfig b/drivers/video/rockchip/rga2/Kconfig -new file mode 100755 +new file mode 100644 index 000000000000..49a0f62b99a0 --- /dev/null +++ b/drivers/video/rockchip/rga2/Kconfig @@ -1672087,7 +1671947,7 @@ index 000000000000..49a0f62b99a0 + +endif diff --git a/drivers/video/rockchip/rga2/Makefile b/drivers/video/rockchip/rga2/Makefile -new file mode 100755 +new file mode 100644 index 000000000000..60181fffa4c8 --- /dev/null +++ b/drivers/video/rockchip/rga2/Makefile @@ -1672098,7 +1671958,7 @@ index 000000000000..60181fffa4c8 + +obj-$(CONFIG_ROCKCHIP_RGA2) += rga2.o diff --git a/drivers/video/rockchip/rga2/RGA2_API.c b/drivers/video/rockchip/rga2/RGA2_API.c -new file mode 100755 +new file mode 100644 index 000000000000..0be2c1ae64b6 --- /dev/null +++ b/drivers/video/rockchip/rga2/RGA2_API.c @@ -1672127,7 +1671987,7 @@ index 000000000000..0be2c1ae64b6 + + diff --git a/drivers/video/rockchip/rga2/RGA2_API.h b/drivers/video/rockchip/rga2/RGA2_API.h -new file mode 100755 +new file mode 100644 index 000000000000..1fa38ed6cffe --- /dev/null +++ b/drivers/video/rockchip/rga2/RGA2_API.h @@ -1672192,7 +1672052,7 @@ index 000000000000..1fa38ed6cffe + +#endif diff --git a/drivers/video/rockchip/rga2/rga2.h b/drivers/video/rockchip/rga2/rga2.h -new file mode 100755 +new file mode 100644 index 000000000000..335970c44ed6 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2.h @@ -1672990,7 +1672850,7 @@ index 000000000000..335970c44ed6 + +#endif /*_RK29_IPP_DRIVER_H_*/ diff --git a/drivers/video/rockchip/rga2/rga2_debugger.c b/drivers/video/rockchip/rga2/rga2_debugger.c -new file mode 100755 +new file mode 100644 index 000000000000..589241322cf4 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_debugger.c @@ -1673392,7 +1673252,7 @@ index 000000000000..589241322cf4 +} +#endif /* #ifdef CONFIG_ROCKCHIP_RGA2_PROC_FS */ diff --git a/drivers/video/rockchip/rga2/rga2_debugger.h b/drivers/video/rockchip/rga2/rga2_debugger.h -new file mode 100755 +new file mode 100644 index 000000000000..33b2f43e9f8a --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_debugger.h @@ -1673518,7 +1673378,7 @@ index 000000000000..33b2f43e9f8a +#endif /* #ifndef _RGA_DEBUGGER_H_ */ + diff --git a/drivers/video/rockchip/rga2/rga2_drv.c b/drivers/video/rockchip/rga2/rga2_drv.c -new file mode 100755 +new file mode 100644 index 000000000000..ca5218f3e09f --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_drv.c @@ -1675797,7 +1675657,7 @@ index 000000000000..ca5218f3e09f +MODULE_DESCRIPTION("Driver for rga device"); +MODULE_LICENSE("GPL"); diff --git a/drivers/video/rockchip/rga2/rga2_mmu_info.c b/drivers/video/rockchip/rga2/rga2_mmu_info.c -new file mode 100755 +new file mode 100644 index 000000000000..2b05c9356c3a --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_mmu_info.c @@ -1677634,7 +1677494,7 @@ index 000000000000..2b05c9356c3a +} + diff --git a/drivers/video/rockchip/rga2/rga2_mmu_info.h b/drivers/video/rockchip/rga2/rga2_mmu_info.h -new file mode 100755 +new file mode 100644 index 000000000000..a823f2fe7c3a --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_mmu_info.h @@ -1677675,7 +1677535,7 @@ index 000000000000..a823f2fe7c3a +#endif + diff --git a/drivers/video/rockchip/rga2/rga2_reg_info.c b/drivers/video/rockchip/rga2/rga2_reg_info.c -new file mode 100755 +new file mode 100644 index 000000000000..a6c154989dd1 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_reg_info.c @@ -1679370,7 +1679230,7 @@ index 000000000000..a6c154989dd1 + } +} diff --git a/drivers/video/rockchip/rga2/rga2_reg_info.h b/drivers/video/rockchip/rga2/rga2_reg_info.h -new file mode 100755 +new file mode 100644 index 000000000000..7aaac7d3502b --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_reg_info.h @@ -1679707,7 +1679567,7 @@ index 000000000000..7aaac7d3502b +#endif + diff --git a/drivers/video/rockchip/rga2/rga2_rop.h b/drivers/video/rockchip/rga2/rga2_rop.h -new file mode 100755 +new file mode 100644 index 000000000000..dc2a343f4c5c --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_rop.h @@ -1679769,7 +1679629,7 @@ index 000000000000..dc2a343f4c5c + +#endif diff --git a/drivers/video/rockchip/rga2/rga2_type.h b/drivers/video/rockchip/rga2/rga2_type.h -new file mode 100755 +new file mode 100644 index 000000000000..30f5df2f38e5 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_type.h @@ -1719270,7 +1719130,7 @@ index f99d3417f304..6bf8b2b78991 100644 bool drm_is_current_master(struct drm_file *fpriv); diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h -index 928136556174..f8cd5d8e58ee 100644 +index 03d39532c708..70795101e49b 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -175,6 +175,48 @@ struct drm_scdc { @@ -1719570,7 +1719430,7 @@ index 0f69f9fbf12c..a9d0c6b0854e 100644 #endif /* __DRM_PRIME_H__ */ diff --git a/include/drm/drm_sync_helper.h b/include/drm/drm_sync_helper.h -new file mode 100755 +new file mode 100644 index 000000000000..a5586c674fec --- /dev/null +++ b/include/drm/drm_sync_helper.h @@ -1719745,7 +1719605,7 @@ index 5b1416fcde6f..33eac20e9ad4 100644 /* dclk gates */ #define DCLK_VOPB 150 diff --git a/include/dt-bindings/clock/rk1808-cru.h b/include/dt-bindings/clock/rk1808-cru.h -new file mode 100755 +new file mode 100644 index 000000000000..994896d111f1 --- /dev/null +++ b/include/dt-bindings/clock/rk1808-cru.h @@ -1720377,7 +1720237,7 @@ index 44e0a319f077..a06e18ebc4dd 100644 #define SRST_A_RKPERF_B 46 #define SRST_PVTM_CORE_B 47 diff --git a/include/dt-bindings/clock/rk3568-cru.h b/include/dt-bindings/clock/rk3568-cru.h -new file mode 100755 +new file mode 100644 index 000000000000..aecfdd4ce084 --- /dev/null +++ b/include/dt-bindings/clock/rk3568-cru.h @@ -1721315,7 +1721175,7 @@ index 000000000000..aecfdd4ce084 + +#endif diff --git a/include/dt-bindings/clock/rk618-cru.h b/include/dt-bindings/clock/rk618-cru.h -new file mode 100755 +new file mode 100644 index 000000000000..72ae0aef1378 --- /dev/null +++ b/include/dt-bindings/clock/rk618-cru.h @@ -1721359,7 +1721219,7 @@ index 000000000000..72ae0aef1378 + +#endif diff --git a/include/dt-bindings/clock/rk628-cgu.h b/include/dt-bindings/clock/rk628-cgu.h -new file mode 100755 +new file mode 100644 index 000000000000..d1690907d208 --- /dev/null +++ b/include/dt-bindings/clock/rk628-cgu.h @@ -1721415,7 +1721275,7 @@ index 000000000000..d1690907d208 + +#endif diff --git a/include/dt-bindings/clock/rockchip,rk3036.h b/include/dt-bindings/clock/rockchip,rk3036.h -new file mode 100755 +new file mode 100644 index 000000000000..019550c7d0c1 --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk3036.h @@ -1721576,7 +1721436,7 @@ index 000000000000..019550c7d0c1 + +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3036_H */ diff --git a/include/dt-bindings/clock/rockchip,rk312x.h b/include/dt-bindings/clock/rockchip,rk312x.h -new file mode 100755 +new file mode 100644 index 000000000000..0af5abca3470 --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk312x.h @@ -1721749,7 +1721609,7 @@ index 000000000000..0af5abca3470 + +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3128_H */ diff --git a/include/dt-bindings/clock/rockchip,rk3188.h b/include/dt-bindings/clock/rockchip,rk3188.h -new file mode 100755 +new file mode 100644 index 000000000000..b8c57e1cfed8 --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk3188.h @@ -1721768,7 +1721628,7 @@ index 000000000000..b8c57e1cfed8 + +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3188_H */ diff --git a/include/dt-bindings/clock/rockchip,rk3228.h b/include/dt-bindings/clock/rockchip,rk3228.h -new file mode 100755 +new file mode 100644 index 000000000000..b86e44536722 --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk3228.h @@ -1721941,7 +1721801,7 @@ index 000000000000..b86e44536722 + +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3228_H */ diff --git a/include/dt-bindings/clock/rockchip,rk3288.h b/include/dt-bindings/clock/rockchip,rk3288.h -new file mode 100755 +new file mode 100644 index 000000000000..1a2803c4f168 --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk3288.h @@ -1722167,7 +1722027,7 @@ index 000000000000..1a2803c4f168 + +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3288_H */ diff --git a/include/dt-bindings/clock/rockchip,rk3368.h b/include/dt-bindings/clock/rockchip,rk3368.h -new file mode 100755 +new file mode 100644 index 000000000000..76630794b4d9 --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk3368.h @@ -1722436,7 +1722296,7 @@ index 000000000000..76630794b4d9 + +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3368_H */ diff --git a/include/dt-bindings/clock/rockchip-ddr.h b/include/dt-bindings/clock/rockchip-ddr.h -new file mode 100755 +new file mode 100644 index 000000000000..b065432e7793 --- /dev/null +++ b/include/dt-bindings/clock/rockchip-ddr.h @@ -1722505,7 +1722365,7 @@ index 000000000000..b065432e7793 + +#endif diff --git a/include/dt-bindings/clock/rockchip.h b/include/dt-bindings/clock/rockchip.h -new file mode 100755 +new file mode 100644 index 000000000000..b438f7bd4083 --- /dev/null +++ b/include/dt-bindings/clock/rockchip.h @@ -1722612,7 +1722472,7 @@ index 000000000000..b438f7bd4083 + +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_H */ diff --git a/include/dt-bindings/clock/rv1126-cru.h b/include/dt-bindings/clock/rv1126-cru.h -new file mode 100755 +new file mode 100644 index 000000000000..474bcbc546af --- /dev/null +++ b/include/dt-bindings/clock/rv1126-cru.h @@ -1723251,7 +1723111,7 @@ index 000000000000..474bcbc546af + +#endif diff --git a/include/dt-bindings/display/drm_mipi_dsi.h b/include/dt-bindings/display/drm_mipi_dsi.h -new file mode 100755 +new file mode 100644 index 000000000000..bc24ce4ddd08 --- /dev/null +++ b/include/dt-bindings/display/drm_mipi_dsi.h @@ -1723310,7 +1723170,7 @@ index 000000000000..bc24ce4ddd08 + +#endif /* __DRM_MIPI_DSI__ */ diff --git a/include/dt-bindings/display/media-bus-format.h b/include/dt-bindings/display/media-bus-format.h -new file mode 100755 +new file mode 100644 index 000000000000..b8e9a1bb3f95 --- /dev/null +++ b/include/dt-bindings/display/media-bus-format.h @@ -1723468,7 +1723328,7 @@ index 000000000000..b8e9a1bb3f95 + +#endif /* __LINUX_MEDIA_BUS_FORMAT_H */ diff --git a/include/dt-bindings/display/mipi_dsi.h b/include/dt-bindings/display/mipi_dsi.h -new file mode 100755 +new file mode 100644 index 000000000000..38aeee0ed51d --- /dev/null +++ b/include/dt-bindings/display/mipi_dsi.h @@ -1723607,7 +1723467,7 @@ index 000000000000..3e14128e7ab1 + +#endif diff --git a/include/dt-bindings/dram/rockchip,rk322x.h b/include/dt-bindings/dram/rockchip,rk322x.h -new file mode 100755 +new file mode 100644 index 000000000000..1ab3317d700e --- /dev/null +++ b/include/dt-bindings/dram/rockchip,rk322x.h @@ -1723703,7 +1723563,7 @@ index 000000000000..1ab3317d700e + +#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_RK322X_H */ diff --git a/include/dt-bindings/dram/rockchip,rk3368.h b/include/dt-bindings/dram/rockchip,rk3368.h -new file mode 100755 +new file mode 100644 index 000000000000..993f1eed9816 --- /dev/null +++ b/include/dt-bindings/dram/rockchip,rk3368.h @@ -1723789,7 +1723649,7 @@ index 000000000000..993f1eed9816 + +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RK3368_H*/ diff --git a/include/dt-bindings/input/rk-input.h b/include/dt-bindings/input/rk-input.h -new file mode 100755 +new file mode 100644 index 000000000000..00b412927890 --- /dev/null +++ b/include/dt-bindings/input/rk-input.h @@ -1724609,7 +1724469,7 @@ index 000000000000..00b412927890 +#define FF_STATUS_PLAYING 0x01 +#define FF_STATUS_MAX 0x01 diff --git a/include/dt-bindings/memory/px30-dram.h b/include/dt-bindings/memory/px30-dram.h -new file mode 100755 +new file mode 100644 index 000000000000..17d799d802d9 --- /dev/null +++ b/include/dt-bindings/memory/px30-dram.h @@ -1724747,7 +1724607,7 @@ index 000000000000..17d799d802d9 + +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_PX30_H*/ diff --git a/include/dt-bindings/memory/rk1808-dram.h b/include/dt-bindings/memory/rk1808-dram.h -new file mode 100755 +new file mode 100644 index 000000000000..522bd75a4a55 --- /dev/null +++ b/include/dt-bindings/memory/rk1808-dram.h @@ -1724933,7 +1724793,7 @@ index 000000000000..522bd75a4a55 + +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RK1808_H*/ diff --git a/include/dt-bindings/memory/rk3128-dram.h b/include/dt-bindings/memory/rk3128-dram.h -new file mode 100755 +new file mode 100644 index 000000000000..2598ac98e525 --- /dev/null +++ b/include/dt-bindings/memory/rk3128-dram.h @@ -1725034,7 +1724894,7 @@ index 000000000000..2598ac98e525 + +#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_RK3128_H */ diff --git a/include/dt-bindings/memory/rk3288-dram.h b/include/dt-bindings/memory/rk3288-dram.h -new file mode 100755 +new file mode 100644 index 000000000000..1c531dca755c --- /dev/null +++ b/include/dt-bindings/memory/rk3288-dram.h @@ -1725167,7 +1725027,7 @@ index 000000000000..1c531dca755c + +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RK3288_H*/ diff --git a/include/dt-bindings/memory/rk3328-dram.h b/include/dt-bindings/memory/rk3328-dram.h -new file mode 100755 +new file mode 100644 index 000000000000..171f41c256d3 --- /dev/null +++ b/include/dt-bindings/memory/rk3328-dram.h @@ -1725332,7 +1725192,7 @@ index 000000000000..171f41c256d3 + +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RK3328_H*/ diff --git a/include/dt-bindings/memory/rk3368-dram.h b/include/dt-bindings/memory/rk3368-dram.h -new file mode 100755 +new file mode 100644 index 000000000000..c1f23d32d987 --- /dev/null +++ b/include/dt-bindings/memory/rk3368-dram.h @@ -1725447,7 +1725307,7 @@ index 000000000000..c1f23d32d987 + +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RK3368_H*/ diff --git a/include/dt-bindings/memory/rk3399-dram.h b/include/dt-bindings/memory/rk3399-dram.h -new file mode 100755 +new file mode 100644 index 000000000000..44abb0aafb05 --- /dev/null +++ b/include/dt-bindings/memory/rk3399-dram.h @@ -1725560,7 +1725420,7 @@ index 000000000000..44abb0aafb05 + +#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_RK3399_H */ diff --git a/include/dt-bindings/memory/rk3568-dram.h b/include/dt-bindings/memory/rk3568-dram.h -new file mode 100755 +new file mode 100644 index 000000000000..c05eae7fe32e --- /dev/null +++ b/include/dt-bindings/memory/rk3568-dram.h @@ -1725677,7 +1725537,7 @@ index 000000000000..c05eae7fe32e + +#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_RK3568_H */ diff --git a/include/dt-bindings/memory/rockchip-dram.h b/include/dt-bindings/memory/rockchip-dram.h -new file mode 100755 +new file mode 100644 index 000000000000..17e5e34b05c5 --- /dev/null +++ b/include/dt-bindings/memory/rockchip-dram.h @@ -1725777,7 +1725637,7 @@ index 000000000000..17e5e34b05c5 + +#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_H */ diff --git a/include/dt-bindings/memory/rv1126-dram.h b/include/dt-bindings/memory/rv1126-dram.h -new file mode 100755 +new file mode 100644 index 000000000000..208227825044 --- /dev/null +++ b/include/dt-bindings/memory/rv1126-dram.h @@ -1725944,7 +1725804,7 @@ index 000000000000..208227825044 + +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RV1126_H*/ diff --git a/include/dt-bindings/phy/phy-snps-pcie3.h b/include/dt-bindings/phy/phy-snps-pcie3.h -new file mode 100755 +new file mode 100644 index 000000000000..5006947f2285 --- /dev/null +++ b/include/dt-bindings/phy/phy-snps-pcie3.h @@ -1725971,7 +1725831,7 @@ index 000000000000..5006947f2285 + +#endif /* _DT_BINDINGS_PHY_SNPS_PCIE3 */ diff --git a/include/dt-bindings/pinctrl/rockchip-rk3036.h b/include/dt-bindings/pinctrl/rockchip-rk3036.h -new file mode 100755 +new file mode 100644 index 000000000000..553c33579065 --- /dev/null +++ b/include/dt-bindings/pinctrl/rockchip-rk3036.h @@ -1726244,7 +1726104,7 @@ index 000000000000..553c33579065 + +#endif diff --git a/include/dt-bindings/pinctrl/rockchip-rk312x.h b/include/dt-bindings/pinctrl/rockchip-rk312x.h -new file mode 100755 +new file mode 100644 index 000000000000..e0fa5976c18f --- /dev/null +++ b/include/dt-bindings/pinctrl/rockchip-rk312x.h @@ -1726634,7 +1726494,7 @@ index 000000000000..e0fa5976c18f + +#endif diff --git a/include/dt-bindings/pinctrl/rockchip-rk3188.h b/include/dt-bindings/pinctrl/rockchip-rk3188.h -new file mode 100755 +new file mode 100644 index 000000000000..58bba225d1de --- /dev/null +++ b/include/dt-bindings/pinctrl/rockchip-rk3188.h @@ -1727097,7 +1726957,7 @@ index 000000000000..58bba225d1de + +#endif diff --git a/include/dt-bindings/pinctrl/rockchip-rk3288.h b/include/dt-bindings/pinctrl/rockchip-rk3288.h -new file mode 100755 +new file mode 100644 index 000000000000..97aa66e2b329 --- /dev/null +++ b/include/dt-bindings/pinctrl/rockchip-rk3288.h @@ -1727769,7 +1727629,7 @@ index 000000000000..97aa66e2b329 + +#endif diff --git a/include/dt-bindings/power/rk1808-power.h b/include/dt-bindings/power/rk1808-power.h -new file mode 100755 +new file mode 100644 index 000000000000..32342c1e7ded --- /dev/null +++ b/include/dt-bindings/power/rk1808-power.h @@ -1727857,7 +1727717,7 @@ index 000000000000..94b26b5bea5f + +#endif diff --git a/include/dt-bindings/power/rk3568-power.h b/include/dt-bindings/power/rk3568-power.h -new file mode 100755 +new file mode 100644 index 000000000000..6cc1af1a9d26 --- /dev/null +++ b/include/dt-bindings/power/rk3568-power.h @@ -1727895,7 +1727755,7 @@ index 000000000000..6cc1af1a9d26 + +#endif diff --git a/include/dt-bindings/power/rk3588-power.h b/include/dt-bindings/power/rk3588-power.h -new file mode 100755 +new file mode 100644 index 000000000000..69f7e9060250 --- /dev/null +++ b/include/dt-bindings/power/rk3588-power.h @@ -1727970,7 +1727830,7 @@ index 000000000000..69f7e9060250 + +#endif diff --git a/include/dt-bindings/power/rv1126-power.h b/include/dt-bindings/power/rv1126-power.h -new file mode 100755 +new file mode 100644 index 000000000000..3e210103646f --- /dev/null +++ b/include/dt-bindings/power/rv1126-power.h @@ -1728010,7 +1727870,7 @@ index 000000000000..3e210103646f + +#endif diff --git a/include/dt-bindings/reset/rk628-rgu.h b/include/dt-bindings/reset/rk628-rgu.h -new file mode 100755 +new file mode 100644 index 000000000000..e0c714bef00c --- /dev/null +++ b/include/dt-bindings/reset/rk628-rgu.h @@ -1728059,7 +1727919,7 @@ index 000000000000..e0c714bef00c + +#endif diff --git a/include/dt-bindings/sensor-dev.h b/include/dt-bindings/sensor-dev.h -new file mode 100755 +new file mode 100644 index 000000000000..e03f0027d325 --- /dev/null +++ b/include/dt-bindings/sensor-dev.h @@ -1728142,7 +1728002,7 @@ index 000000000000..8b0442533c3f + +#endif diff --git a/include/dt-bindings/soc/rockchip-system-status.h b/include/dt-bindings/soc/rockchip-system-status.h -new file mode 100755 +new file mode 100644 index 000000000000..6a0d198a2e6e --- /dev/null +++ b/include/dt-bindings/soc/rockchip-system-status.h @@ -1728207,7 +1728067,7 @@ index 000000000000..6a0d198a2e6e + +#endif diff --git a/include/dt-bindings/suspend/rockchip-px30.h b/include/dt-bindings/suspend/rockchip-px30.h -new file mode 100755 +new file mode 100644 index 000000000000..4362028f677c --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-px30.h @@ -1728266,7 +1728126,7 @@ index 000000000000..4362028f677c + +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk1808.h b/include/dt-bindings/suspend/rockchip-rk1808.h -new file mode 100755 +new file mode 100644 index 000000000000..3d565faabf4d --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk1808.h @@ -1728318,7 +1728178,7 @@ index 000000000000..3d565faabf4d + +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk322x.h b/include/dt-bindings/suspend/rockchip-rk322x.h -new file mode 100755 +new file mode 100644 index 000000000000..882ae053fa22 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk322x.h @@ -1728381,7 +1728241,7 @@ index 000000000000..882ae053fa22 + +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3288.h b/include/dt-bindings/suspend/rockchip-rk3288.h -new file mode 100755 +new file mode 100644 index 000000000000..d07cced43877 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3288.h @@ -1728446,7 +1728306,7 @@ index 000000000000..d07cced43877 + +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3308.h b/include/dt-bindings/suspend/rockchip-rk3308.h -new file mode 100755 +new file mode 100644 index 000000000000..a3e015e2209a --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3308.h @@ -1728556,7 +1728416,7 @@ index 000000000000..a3e015e2209a + +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3328.h b/include/dt-bindings/suspend/rockchip-rk3328.h -new file mode 100755 +new file mode 100644 index 000000000000..972f8bb5e281 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3328.h @@ -1728581,7 +1728441,7 @@ index 000000000000..972f8bb5e281 + +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3368.h b/include/dt-bindings/suspend/rockchip-rk3368.h -new file mode 100755 +new file mode 100644 index 000000000000..9873f8236a8b --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3368.h @@ -1728643,7 +1728503,7 @@ index 000000000000..9873f8236a8b + +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3399.h b/include/dt-bindings/suspend/rockchip-rk3399.h -new file mode 100755 +new file mode 100644 index 000000000000..176c7cfcd989 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3399.h @@ -1728710,7 +1728570,7 @@ index 000000000000..176c7cfcd989 + +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3568.h b/include/dt-bindings/suspend/rockchip-rk3568.h -new file mode 100755 +new file mode 100644 index 000000000000..91e89f64a067 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3568.h @@ -1728773,7 +1728633,7 @@ index 000000000000..91e89f64a067 + +#endif diff --git a/include/dt-bindings/suspend/rockchip-rv1126.h b/include/dt-bindings/suspend/rockchip-rv1126.h -new file mode 100755 +new file mode 100644 index 000000000000..7c28c2bd7619 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rv1126.h @@ -1728825,7 +1728685,7 @@ index 000000000000..7c28c2bd7619 +#define RKPM_TIME_OUT_WKUP_EN BIT(10) +#endif diff --git a/include/linux/android_kabi.h b/include/linux/android_kabi.h -new file mode 100755 +new file mode 100644 index 000000000000..efa52953fe35 --- /dev/null +++ b/include/linux/android_kabi.h @@ -1728944,7 +1728804,7 @@ index 000000000000..efa52953fe35 + +#endif /* _ANDROID_KABI_H */ diff --git a/include/linux/bpf.h b/include/linux/bpf.h -index a75abe994918..e49f608096dd 100644 +index 4feaf6f92ce9..92c17022a01f 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -173,7 +173,7 @@ struct bpf_map { @@ -1728965,10 +1728825,10 @@ index a75abe994918..e49f608096dd 100644 int generic_map_lookup_batch(struct bpf_map *map, const union bpf_attr *attr, diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h -index 03a5de5f99f4..d9897d0b10a2 100644 +index aa8cbf882914..1172d35943ca 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h -@@ -599,6 +599,7 @@ struct clk_divider { +@@ -613,6 +613,7 @@ struct clk_divider { u8 shift; u8 width; u8 flags; @@ -1728976,7 +1728836,7 @@ index 03a5de5f99f4..d9897d0b10a2 100644 const struct clk_div_table *table; spinlock_t *lock; }; -@@ -936,6 +937,8 @@ void clk_hw_unregister_fixed_factor(struct clk_hw *hw); +@@ -958,6 +959,8 @@ void clk_hw_unregister_fixed_factor(struct clk_hw *hw); * CLK_FRAC_DIVIDER_BIG_ENDIAN - By default little endian register accesses are * used for the divider register. Setting this flag makes the register * accesses big endian. @@ -1728985,7 +1728845,7 @@ index 03a5de5f99f4..d9897d0b10a2 100644 */ struct clk_fractional_divider { struct clk_hw hw; -@@ -947,6 +950,7 @@ struct clk_fractional_divider { +@@ -969,6 +972,7 @@ struct clk_fractional_divider { u8 nwidth; u32 nmask; u8 flags; @@ -1728993,7 +1728853,7 @@ index 03a5de5f99f4..d9897d0b10a2 100644 void (*approximation)(struct clk_hw *hw, unsigned long rate, unsigned long *parent_rate, unsigned long *m, unsigned long *n); -@@ -957,6 +961,7 @@ struct clk_fractional_divider { +@@ -979,6 +983,7 @@ struct clk_fractional_divider { #define CLK_FRAC_DIVIDER_ZERO_BASED BIT(0) #define CLK_FRAC_DIVIDER_BIG_ENDIAN BIT(1) @@ -1729001,7 +1728861,7 @@ index 03a5de5f99f4..d9897d0b10a2 100644 extern const struct clk_ops clk_fractional_divider_ops; struct clk *clk_register_fractional_divider(struct device *dev, -@@ -1017,6 +1022,9 @@ extern const struct clk_ops clk_multiplier_ops; +@@ -1039,6 +1044,9 @@ extern const struct clk_ops clk_multiplier_ops; * @mux_hw: handle between composite and hardware-specific mux clock * @rate_hw: handle between composite and hardware-specific rate clock * @gate_hw: handle between composite and hardware-specific gate clock @@ -1729011,7 +1728871,7 @@ index 03a5de5f99f4..d9897d0b10a2 100644 * @mux_ops: clock ops for mux * @rate_ops: clock ops for rate * @gate_ops: clock ops for gate -@@ -1028,6 +1036,7 @@ struct clk_composite { +@@ -1050,6 +1058,7 @@ struct clk_composite { struct clk_hw *mux_hw; struct clk_hw *rate_hw; struct clk_hw *gate_hw; @@ -1729020,7 +1728880,7 @@ index 03a5de5f99f4..d9897d0b10a2 100644 const struct clk_ops *mux_ops; const struct clk_ops *rate_ops; diff --git a/include/linux/clk/rockchip.h b/include/linux/clk/rockchip.h -new file mode 100755 +new file mode 100644 index 000000000000..07c563a42c60 --- /dev/null +++ b/include/linux/clk/rockchip.h @@ -1729044,7 +1728904,7 @@ index 000000000000..07c563a42c60 + +#endif /* __LINUX_CLK_ROCKCHIP_H_ */ diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h -index 04c20de66afc..047f449d3658 100644 +index b70224370832..730e69bb59f0 100644 --- a/include/linux/cpuset.h +++ b/include/linux/cpuset.h @@ -15,6 +15,7 @@ @@ -1729055,7 +1728915,7 @@ index 04c20de66afc..047f449d3658 100644 #include #ifdef CONFIG_CPUSETS -@@ -162,6 +163,8 @@ static inline void set_mems_allowed(nodemask_t nodemask) +@@ -164,6 +165,8 @@ static inline void set_mems_allowed(nodemask_t nodemask) task_unlock(current); } @@ -1729064,7 +1728924,7 @@ index 04c20de66afc..047f449d3658 100644 #else /* !CONFIG_CPUSETS */ static inline bool cpusets_enabled(void) { return false; } -@@ -184,7 +187,7 @@ static inline void cpuset_read_unlock(void) { } +@@ -188,7 +191,7 @@ static inline void cpuset_unlock(void) { } static inline void cpuset_cpus_allowed(struct task_struct *p, struct cpumask *mask) { @@ -1729073,7 +1728933,7 @@ index 04c20de66afc..047f449d3658 100644 } static inline void cpuset_cpus_allowed_fallback(struct task_struct *p) -@@ -280,6 +283,8 @@ static inline bool read_mems_allowed_retry(unsigned int seq) +@@ -284,6 +287,8 @@ static inline bool read_mems_allowed_retry(unsigned int seq) return false; } @@ -1729083,7 +1728943,7 @@ index 04c20de66afc..047f449d3658 100644 #endif /* _LINUX_CPUSET_H */ diff --git a/include/linux/dma-buf-cache.h b/include/linux/dma-buf-cache.h -new file mode 100755 +new file mode 100644 index 000000000000..d97545560990 --- /dev/null +++ b/include/linux/dma-buf-cache.h @@ -1729449,7 +1729309,7 @@ index 2112f21f73d8..f51561eda33b 100644 #endif /* CONFIG_IOMMU_DMA */ #endif /* __DMA_IOMMU_H */ diff --git a/include/linux/dma-map-ops.h b/include/linux/dma-map-ops.h -index a5f89fc4d6df..84c14dbcdb66 100644 +index 22e3bfebdc34..b9a8549f9a7f 100644 --- a/include/linux/dma-map-ops.h +++ b/include/linux/dma-map-ops.h @@ -8,6 +8,7 @@ @@ -1729472,7 +1729332,7 @@ index a5f89fc4d6df..84c14dbcdb66 100644 }; #ifdef CONFIG_DMA_OPS -@@ -258,6 +264,14 @@ void arch_dma_free(struct device *dev, size_t size, void *cpu_addr, +@@ -261,6 +267,14 @@ void arch_dma_free(struct device *dev, size_t size, void *cpu_addr, #define pgprot_dmacoherent(prot) pgprot_noncached(prot) #endif @@ -1729626,7 +1729486,7 @@ index 27828145ca09..f753c307b8b3 100644 static inline void __thaw_task(struct task_struct *t) {} diff --git a/include/linux/initramfs.h b/include/linux/initramfs.h -new file mode 100755 +new file mode 100644 index 000000000000..26953171620f --- /dev/null +++ b/include/linux/initramfs.h @@ -1729913,7 +1729773,7 @@ index 3baea2ef33fb..2b770134cc97 100644 return memblock.bottom_up; } diff --git a/include/linux/memory_group_manager.h b/include/linux/memory_group_manager.h -new file mode 100755 +new file mode 100644 index 000000000000..786e3b995f29 --- /dev/null +++ b/include/linux/memory_group_manager.h @@ -1730694,10 +1730554,10 @@ index e07f6e61cd38..7cdc5dfa4fce 100644 }; #endif /* __LINUX_REGULATOR_RK808_H */ diff --git a/include/linux/mm.h b/include/linux/mm.h -index 9ed1be47c8cb..9d52a0c60677 100644 +index 181830659484..8cdae5baf606 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -2944,6 +2944,8 @@ extern bool page_poisoning_enabled(void); +@@ -2946,6 +2946,8 @@ extern bool page_poisoning_enabled(void); extern void kernel_poison_pages(struct page *page, int numpages, int enable); #else static inline bool page_poisoning_enabled(void) { return false; } @@ -1730707,7 +1730567,7 @@ index 9ed1be47c8cb..9d52a0c60677 100644 int enable) { } #endif diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h -index 40d7e98fc990..819f6119dff3 100644 +index fb08b86acdbf..96ac20fb5279 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -141,6 +141,7 @@ struct mmc_host_ops { @@ -1730718,7 +1730578,7 @@ index 40d7e98fc990..819f6119dff3 100644 /* The tuning command opcode value is different for SD and eMMC cards */ int (*execute_tuning)(struct mmc_host *host, u32 opcode); -@@ -483,6 +484,9 @@ void mmc_free_host(struct mmc_host *); +@@ -485,6 +486,9 @@ void mmc_free_host(struct mmc_host *); int mmc_of_parse(struct mmc_host *host); int mmc_of_parse_voltage(struct device_node *np, u32 *mask); @@ -1730746,7 +1730606,7 @@ index 03dee12d2b61..bc4ac3c525e6 100644 + #endif diff --git a/include/linux/phy/pcie.h b/include/linux/phy/pcie.h -new file mode 100755 +new file mode 100644 index 000000000000..93c997f520fe --- /dev/null +++ b/include/linux/phy/pcie.h @@ -1730764,7 +1730624,7 @@ index 000000000000..93c997f520fe + +#endif diff --git a/include/linux/phy/phy-rockchip-typec.h b/include/linux/phy/phy-rockchip-typec.h -new file mode 100755 +new file mode 100644 index 000000000000..1d6af83d3b89 --- /dev/null +++ b/include/linux/phy/phy-rockchip-typec.h @@ -1730804,7 +1730664,7 @@ index 000000000000..1d6af83d3b89 + +#endif diff --git a/include/linux/power/bq25700-charge.h b/include/linux/power/bq25700-charge.h -new file mode 100755 +new file mode 100644 index 000000000000..5e7d3e40d2ea --- /dev/null +++ b/include/linux/power/bq25700-charge.h @@ -1730830,7 +1730690,7 @@ index 000000000000..5e7d3e40d2ea + +#endif /* __CHARGER_BQ25700_H_ */ diff --git a/include/linux/power/cw2015_battery.h b/include/linux/power/cw2015_battery.h -new file mode 100755 +new file mode 100644 index 000000000000..8e6b1fc7e344 --- /dev/null +++ b/include/linux/power/cw2015_battery.h @@ -1730955,7 +1730815,7 @@ index 000000000000..8e6b1fc7e344 + +#endif diff --git a/include/linux/power/rk_usbbc.h b/include/linux/power/rk_usbbc.h -new file mode 100755 +new file mode 100644 index 000000000000..45f7128b3a69 --- /dev/null +++ b/include/linux/power/rk_usbbc.h @@ -1731145,7 +1731005,7 @@ index 000000000000..a6b151916b37 + +#endif /* _PRIORITY_CONTROL_MANAGER_H_ */ diff --git a/include/linux/pwm.h b/include/linux/pwm.h -index a13ff383fa1d..6b2a7fb80de8 100644 +index c0cf6613373f..296573c4a387 100644 --- a/include/linux/pwm.h +++ b/include/linux/pwm.h @@ -59,6 +59,9 @@ struct pwm_state { @@ -1731224,7 +1731084,7 @@ index ce8df21863f0..e8703b6fc13d 100644 #endif /* __FAN53555_H__ */ diff --git a/include/linux/rfkill-bt.h b/include/linux/rfkill-bt.h -new file mode 100755 +new file mode 100644 index 000000000000..c4174b156580 --- /dev/null +++ b/include/linux/rfkill-bt.h @@ -1731303,7 +1731163,7 @@ index 000000000000..c4174b156580 +#endif /* __RFKILL_GPIO_H */ + diff --git a/include/linux/rfkill-wlan.h b/include/linux/rfkill-wlan.h -new file mode 100755 +new file mode 100644 index 000000000000..431e71a7a844 --- /dev/null +++ b/include/linux/rfkill-wlan.h @@ -1731371,7 +1731231,7 @@ index 000000000000..431e71a7a844 + +#endif diff --git a/include/linux/rk_keys.h b/include/linux/rk_keys.h -new file mode 100755 +new file mode 100644 index 000000000000..aee656daf2c8 --- /dev/null +++ b/include/linux/rk_keys.h @@ -1731396,7 +1731256,7 @@ index 000000000000..aee656daf2c8 + +#endif diff --git a/include/linux/rockchip-iovmm.h b/include/linux/rockchip-iovmm.h -new file mode 100755 +new file mode 100644 index 000000000000..3005c745e5b8 --- /dev/null +++ b/include/linux/rockchip-iovmm.h @@ -1731493,7 +1731353,7 @@ index 000000000000..3005c745e5b8 + +#endif /*__ASM_PLAT_IOVMM_H*/ diff --git a/include/linux/rockchip/cpu.h b/include/linux/rockchip/cpu.h -new file mode 100755 +new file mode 100644 index 000000000000..beaaf923f9ec --- /dev/null +++ b/include/linux/rockchip/cpu.h @@ -1731771,7 +1731631,7 @@ index 000000000000..beaaf923f9ec + +#endif diff --git a/include/linux/rockchip/grf.h b/include/linux/rockchip/grf.h -new file mode 100755 +new file mode 100644 index 000000000000..fae51232297c --- /dev/null +++ b/include/linux/rockchip/grf.h @@ -1732509,7 +1732369,7 @@ index 000000000000..741887856e33 +#endif +#endif diff --git a/include/linux/rockchip/psci.h b/include/linux/rockchip/psci.h -new file mode 100755 +new file mode 100644 index 000000000000..870da27edf65 --- /dev/null +++ b/include/linux/rockchip/psci.h @@ -1732629,7 +1732489,7 @@ index 000000000000..2c95b04b092d + +#endif /* __ROCKCHIP_PM_CONFIG_H */ diff --git a/include/linux/rockchip/rockchip_sip.h b/include/linux/rockchip/rockchip_sip.h -new file mode 100755 +new file mode 100644 index 000000000000..70b1493ef697 --- /dev/null +++ b/include/linux/rockchip/rockchip_sip.h @@ -1733184,7 +1733044,7 @@ index 000000000000..70b1493ef697 + +#endif diff --git a/include/linux/rockchip_ion.h b/include/linux/rockchip_ion.h -new file mode 100755 +new file mode 100644 index 000000000000..39c497774fb0 --- /dev/null +++ b/include/linux/rockchip_ion.h @@ -1733231,7 +1733091,7 @@ index 000000000000..39c497774fb0 + +#endif diff --git a/include/linux/sched.h b/include/linux/sched.h -index d590141f04d1..b5d9a9ce8d86 100644 +index 05dc5bae4dfd..4627f2e341ed 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1369,7 +1369,7 @@ struct task_struct { @@ -1733244,7 +1733104,7 @@ index d590141f04d1..b5d9a9ce8d86 100644 #endif diff --git a/include/linux/sched/signal.h b/include/linux/sched/signal.h -index ae60f838ebb9..9a0e2a1d626c 100644 +index 2c634010cc7b..ce76124a246f 100644 --- a/include/linux/sched/signal.h +++ b/include/linux/sched/signal.h @@ -12,6 +12,7 @@ @@ -1733283,7 +1733143,7 @@ index c078f0a94cec..9544c9d9d534 100644 #endif /* _LINUX_SCHED_XACCT_H */ diff --git a/include/linux/sensor-dev.h b/include/linux/sensor-dev.h -new file mode 100755 +new file mode 100644 index 000000000000..6ae9c16e67a3 --- /dev/null +++ b/include/linux/sensor-dev.h @@ -1733639,7 +1733499,7 @@ index 000000000000..6ae9c16e67a3 +extern int sensor_read_reg_normal(struct i2c_client *client); + diff --git a/include/linux/soc/rockchip/pvtm.h b/include/linux/soc/rockchip/pvtm.h -new file mode 100755 +new file mode 100644 index 000000000000..3d2495cfd6e5 --- /dev/null +++ b/include/linux/soc/rockchip/pvtm.h @@ -1733681,7 +1733541,7 @@ index 000000000000..14f70f72e383 + +#endif diff --git a/include/linux/soc/rockchip/rk_vendor_storage.h b/include/linux/soc/rockchip/rk_vendor_storage.h -new file mode 100755 +new file mode 100644 index 000000000000..d30b775e6a5f --- /dev/null +++ b/include/linux/soc/rockchip/rk_vendor_storage.h @@ -1733783,7 +1733643,7 @@ index 000000000000..d30b775e6a5f + +#endif diff --git a/include/linux/soc/rockchip/rockchip_decompress.h b/include/linux/soc/rockchip/rockchip_decompress.h -new file mode 100755 +new file mode 100644 index 000000000000..120ae907c2aa --- /dev/null +++ b/include/linux/soc/rockchip/rockchip_decompress.h @@ -1733831,7 +1733691,7 @@ index 000000000000..120ae907c2aa + +#endif diff --git a/include/linux/soc/rockchip/rockchip_thunderboot_crypto.h b/include/linux/soc/rockchip/rockchip_thunderboot_crypto.h -new file mode 100755 +new file mode 100644 index 000000000000..2fe176649409 --- /dev/null +++ b/include/linux/soc/rockchip/rockchip_thunderboot_crypto.h @@ -1733889,10 +1733749,10 @@ index 000000000000..d0a08a07c21d +#endif +#endif diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h -index abf7b8ec1fb6..bf41c178e22e 100644 +index 184d7a814dc9..45c2cbe6045a 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h -@@ -183,6 +183,7 @@ struct plat_stmmacenet_data { +@@ -182,6 +182,7 @@ struct plat_stmmacenet_data { void (*serdes_powerdown)(struct net_device *ndev, void *priv); int (*init)(struct platform_device *pdev, void *priv); void (*exit)(struct platform_device *pdev, void *priv); @@ -1733923,12 +1733783,6 @@ index 7097d4dcfdd0..781e5bfbb9b4 100644 #endif /* CONFIG_THERMAL */ #endif /* __THERMAL_H__ */ -diff --git a/include/linux/usb/audio-v2.h b/include/linux/usb/audio-v2.h -old mode 100644 -new mode 100755 -diff --git a/include/linux/usb/audio.h b/include/linux/usb/audio.h -old mode 100644 -new mode 100755 diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h index a2d229ab63ba..4d352204e819 100644 --- a/include/linux/usb/composite.h @@ -1733951,7 +1733805,7 @@ index a2d229ab63ba..4d352204e819 100644 const char *name); void (*free_func_inst)(struct usb_function_instance *inst); diff --git a/include/linux/usb/f_accessory.h b/include/linux/usb/f_accessory.h -new file mode 100755 +new file mode 100644 index 000000000000..ebe3c4d59309 --- /dev/null +++ b/include/linux/usb/f_accessory.h @@ -1733980,9 +1733834,7 @@ index 000000000000..ebe3c4d59309 + +#endif /* __LINUX_USB_F_ACCESSORY_H */ diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h -old mode 100644 -new mode 100755 -index e7351d64f11f..daf43d1af134 +index 11df3d5b40c6..daf43d1af134 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h @@ -217,6 +217,7 @@ struct usb_ep_caps { @@ -1734655,9 +1734507,7 @@ index 09762d26fa0c..cb69546f87af 100644 #endif /* __LINUX_USB_TCPM_H */ diff --git a/include/linux/usb/typec.h b/include/linux/usb/typec.h -old mode 100644 -new mode 100755 -index 6be558045942..a5e685dd6dad +index 6be558045942..a5e685dd6dad 100644 --- a/include/linux/usb/typec.h +++ b/include/linux/usb/typec.h @@ -17,6 +17,7 @@ struct typec_partner; @@ -1734778,7 +1734628,7 @@ index 6be558045942..a5e685dd6dad +int typec_get_negotiated_svdm_version(struct typec_port *port); #endif /* __LINUX_USB_TYPEC_H */ diff --git a/include/linux/usb/typec_altmode.h b/include/linux/usb/typec_altmode.h -index 5e0a7b7647c3..65933cbe9129 100644 +index 22b8ee8f0311..c33a8bc626d3 100644 --- a/include/linux/usb/typec_altmode.h +++ b/include/linux/usb/typec_altmode.h @@ -132,6 +132,16 @@ typec_altmode_get_orientation(struct typec_altmode *altmode) @@ -1734919,7 +1734769,7 @@ index 000000000000..c9b1f62684d1 + +#endif /* _VERSION_COMPAT_DEFS_H_ */ diff --git a/include/linux/wakelock.h b/include/linux/wakelock.h -new file mode 100755 +new file mode 100644 index 000000000000..7b4825ba9521 --- /dev/null +++ b/include/linux/wakelock.h @@ -1735001,7 +1734851,7 @@ index 000000000000..7b4825ba9521 + +#endif diff --git a/include/linux/wakeup_reason.h b/include/linux/wakeup_reason.h -new file mode 100755 +new file mode 100644 index 000000000000..54f5caaa5cde --- /dev/null +++ b/include/linux/wakeup_reason.h @@ -1735070,7 +1734920,7 @@ index 92cd9f038fed..03b43b0f706e 100644 * v4l2_async_notifier_unregister - unregisters a subdevice * asynchronous notifier diff --git a/include/soc/rockchip/android-version.h b/include/soc/rockchip/android-version.h -new file mode 100755 +new file mode 100644 index 000000000000..e0d865bab335 --- /dev/null +++ b/include/soc/rockchip/android-version.h @@ -1735093,7 +1734943,7 @@ index 000000000000..e0d865bab335 + (((a) << 24) + ((b) << 16) + ((c) << 8) + (r)) +#endif diff --git a/include/soc/rockchip/pm_domains.h b/include/soc/rockchip/pm_domains.h -new file mode 100755 +new file mode 100644 index 000000000000..0e1fadd3d52e --- /dev/null +++ b/include/soc/rockchip/pm_domains.h @@ -1735241,7 +1735091,7 @@ index 000000000000..c9e9efd2222b +extern bool (*md_is_ddr_address)(u64 virt_addr); +#endif /* __RK_MINIDUMP_H */ diff --git a/include/soc/rockchip/rkfb_dmc.h b/include/soc/rockchip/rkfb_dmc.h -new file mode 100755 +new file mode 100644 index 000000000000..5e82b3194dd3 --- /dev/null +++ b/include/soc/rockchip/rkfb_dmc.h @@ -1735294,7 +1735144,7 @@ index 000000000000..e3698b9e10fe + +#endif /* __SOC_ROCKCHIP_MAILBOX_H__ */ diff --git a/include/soc/rockchip/rockchip-system-status.h b/include/soc/rockchip/rockchip-system-status.h -new file mode 100755 +new file mode 100644 index 000000000000..5eb53ff2f3f3 --- /dev/null +++ b/include/soc/rockchip/rockchip-system-status.h @@ -1735461,7 +1735311,7 @@ index 000000000000..4338d68359f7 + +#endif diff --git a/include/soc/rockchip/rockchip_dmc.h b/include/soc/rockchip/rockchip_dmc.h -new file mode 100755 +new file mode 100644 index 000000000000..f115cdcec291 --- /dev/null +++ b/include/soc/rockchip/rockchip_dmc.h @@ -1735765,7 +1735615,7 @@ index 000000000000..19596f1bd4c6 + +#endif diff --git a/include/soc/rockchip/rockchip_iommu.h b/include/soc/rockchip/rockchip_iommu.h -new file mode 100755 +new file mode 100644 index 000000000000..191a2fda8f1a --- /dev/null +++ b/include/soc/rockchip/rockchip_iommu.h @@ -1735823,7 +1735673,7 @@ index 000000000000..191a2fda8f1a + +#endif diff --git a/include/soc/rockchip/rockchip_ipa.h b/include/soc/rockchip/rockchip_ipa.h -new file mode 100755 +new file mode 100644 index 000000000000..cb333f463c7b --- /dev/null +++ b/include/soc/rockchip/rockchip_ipa.h @@ -1735869,7 +1735719,7 @@ index 000000000000..cb333f463c7b + +#endif diff --git a/include/soc/rockchip/rockchip_opp_select.h b/include/soc/rockchip/rockchip_opp_select.h -new file mode 100755 +new file mode 100644 index 000000000000..e7669f29cbd5 --- /dev/null +++ b/include/soc/rockchip/rockchip_opp_select.h @@ -1736413,7 +1736263,7 @@ index c46a9ae2a2ab..269cf14c38fb 100644 #endif diff --git a/include/soc/rockchip/rockchip_system_monitor.h b/include/soc/rockchip/rockchip_system_monitor.h -new file mode 100755 +new file mode 100644 index 000000000000..0ca822d1041f --- /dev/null +++ b/include/soc/rockchip/rockchip_system_monitor.h @@ -1736757,7 +1736607,7 @@ index dd5fff2bb1b2..6c6a23b4b3c1 100644 DECLARE_EVENT_CLASS(sched_process_template, diff --git a/include/trace/events/thermal_ipa_power.h b/include/trace/events/thermal_ipa_power.h -new file mode 100755 +new file mode 100644 index 000000000000..a3a932c75d6a --- /dev/null +++ b/include/trace/events/thermal_ipa_power.h @@ -1736876,7 +1736726,7 @@ index dad9d3b4a97a..1c10ff522c6d 100644 } #endif diff --git a/include/uapi/drm/rockchip_drm.h b/include/uapi/drm/rockchip_drm.h -new file mode 100755 +new file mode 100644 index 000000000000..2ac71b43dba0 --- /dev/null +++ b/include/uapi/drm/rockchip_drm.h @@ -1742566,7 +1742416,7 @@ index 7d1a06c52469..ebbcb9b0104a 100644 * The remainder of this header defines all CEC messages and operands. * The format matters since it the cec-ctl utility parses it to generate diff --git a/include/uapi/linux/fec-config.h b/include/uapi/linux/fec-config.h -new file mode 100755 +new file mode 100644 index 000000000000..2b3f97fb2a3e --- /dev/null +++ b/include/uapi/linux/fec-config.h @@ -1742630,7 +1742480,7 @@ index 84fa53ffb13f..f16dff5b49cc 100644 /* YUV (including grey) - next is 0x202e */ #define MEDIA_BUS_FMT_Y8_1X8 0x2001 diff --git a/include/uapi/linux/rk-camera-module.h b/include/uapi/linux/rk-camera-module.h -new file mode 100755 +new file mode 100644 index 000000000000..68e57c0a9e41 --- /dev/null +++ b/include/uapi/linux/rk-camera-module.h @@ -1750342,7 +1750192,7 @@ index 000000000000..616ddff9ed64 + +#endif diff --git a/include/uapi/linux/rk-led-flash.h b/include/uapi/linux/rk-led-flash.h -new file mode 100755 +new file mode 100644 index 000000000000..c679cb9eb39a --- /dev/null +++ b/include/uapi/linux/rk-led-flash.h @@ -1750445,7 +1750295,7 @@ index 000000000000..9a24407001ec + +#endif /* _UAPI_RK_MPP_H */ diff --git a/include/uapi/linux/rk-pcie-dma.h b/include/uapi/linux/rk-pcie-dma.h -new file mode 100755 +new file mode 100644 index 000000000000..bf4a96b5eea7 --- /dev/null +++ b/include/uapi/linux/rk-pcie-dma.h @@ -1750636,7 +1750486,7 @@ index 000000000000..d89748eed925 + +#endif diff --git a/include/uapi/linux/rk-preisp.h b/include/uapi/linux/rk-preisp.h -new file mode 100755 +new file mode 100644 index 000000000000..4cd51a84ada8 --- /dev/null +++ b/include/uapi/linux/rk-preisp.h @@ -1750760,7 +1750610,7 @@ index 000000000000..4cd51a84ada8 + +#endif /* _UAPI_RKPREISP_H */ diff --git a/include/uapi/linux/rk-video-format.h b/include/uapi/linux/rk-video-format.h -new file mode 100755 +new file mode 100644 index 000000000000..938d5adff737 --- /dev/null +++ b/include/uapi/linux/rk-video-format.h @@ -1750803,7 +1750653,7 @@ index 000000000000..938d5adff737 + +#endif /* _UAPI_RK_VIDEO_FORMAT_H */ diff --git a/include/uapi/linux/rk803.h b/include/uapi/linux/rk803.h -new file mode 100755 +new file mode 100644 index 000000000000..448468da9e8d --- /dev/null +++ b/include/uapi/linux/rk803.h @@ -1751010,7 +1750860,7 @@ index 000000000000..26dcea790013 + +#endif /* _UAPI_RK_HDMIRX_CONFIG_H */ diff --git a/include/uapi/linux/rk_vcm_head.h b/include/uapi/linux/rk_vcm_head.h -new file mode 100755 +new file mode 100644 index 000000000000..4e663ae260d8 --- /dev/null +++ b/include/uapi/linux/rk_vcm_head.h @@ -1751153,7 +1751003,7 @@ index 000000000000..4e663ae260d8 +#endif /* RK_VCM_HEAD_H */ + diff --git a/include/uapi/linux/rkcif-config.h b/include/uapi/linux/rkcif-config.h -new file mode 100755 +new file mode 100644 index 000000000000..c9b9bbf0d301 --- /dev/null +++ b/include/uapi/linux/rkcif-config.h @@ -1751250,7 +1751100,7 @@ index 000000000000..c9b9bbf0d301 + +#endif diff --git a/include/uapi/linux/rkisp1-config.h b/include/uapi/linux/rkisp1-config.h -new file mode 100755 +new file mode 100644 index 000000000000..c26d4bb69261 --- /dev/null +++ b/include/uapi/linux/rkisp1-config.h @@ -1752128,7 +1751978,7 @@ index 000000000000..c26d4bb69261 + +#endif /* _UAPI_RKISP1_CONFIG_H */ diff --git a/include/uapi/linux/rkisp2-config.h b/include/uapi/linux/rkisp2-config.h -new file mode 100755 +new file mode 100644 index 000000000000..9d41f9e8a097 --- /dev/null +++ b/include/uapi/linux/rkisp2-config.h @@ -1753987,7 +1753837,7 @@ index 000000000000..9d41f9e8a097 + +#endif /* _UAPI_RKISP2_CONFIG_H */ diff --git a/include/uapi/linux/rkisp21-config.h b/include/uapi/linux/rkisp21-config.h -new file mode 100755 +new file mode 100644 index 000000000000..203022b62361 --- /dev/null +++ b/include/uapi/linux/rkisp21-config.h @@ -1754797,7 +1754647,7 @@ index 000000000000..203022b62361 + +#endif /* _UAPI_RKISP21_CONFIG_H */ diff --git a/include/uapi/linux/rkisp3-config.h b/include/uapi/linux/rkisp3-config.h -new file mode 100755 +new file mode 100644 index 000000000000..25bbe1a9a146 --- /dev/null +++ b/include/uapi/linux/rkisp3-config.h @@ -1755875,7 +1755725,7 @@ index 000000000000..25bbe1a9a146 + +#endif /* _UAPI_RKISP3_CONFIG_H */ diff --git a/include/uapi/linux/rkispp-config.h b/include/uapi/linux/rkispp-config.h -new file mode 100755 +new file mode 100644 index 000000000000..b4a27f74f9c9 --- /dev/null +++ b/include/uapi/linux/rkispp-config.h @@ -1756263,7 +1756113,7 @@ index f51bc8f36813..7e3fe68af328 100644 #define UART_IIR 2 /* In: Interrupt ID Register */ #define UART_IIR_NO_INT 0x01 /* No interrupts pending */ diff --git a/include/uapi/linux/usb/f_accessory.h b/include/uapi/linux/usb/f_accessory.h -new file mode 100755 +new file mode 100644 index 000000000000..0baeb7d0d74c --- /dev/null +++ b/include/uapi/linux/usb/f_accessory.h @@ -1756498,7 +1756348,7 @@ index c58854fb7d94..d160d5bdd730 100644 #endif /* __LINUX_USB_VIDEO_H */ diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index b28817c59fdf..622e97c1060f 100644 +index 55b8c4b82479..6f937714df4a 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -689,6 +689,7 @@ struct v4l2_pix_format { @@ -1756555,7 +1756405,7 @@ index 70bd7f69076a..4ce9ca666ce7 100644 config BOOT_CONFIG diff --git a/init/initramfs.c b/init/initramfs.c -index 55b74d7e5260..f4c4e2404dfd 100644 +index 4534c6611fa5..6bcb2a20e4b6 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -12,6 +12,7 @@ @@ -1756566,7 +1756416,7 @@ index 55b74d7e5260..f4c4e2404dfd 100644 #include static ssize_t __init xwrite(struct file *file, const char *p, size_t count, -@@ -465,6 +466,9 @@ static char * __init unpack_to_rootfs(char *buf, unsigned long len) +@@ -480,6 +481,9 @@ static char * __init unpack_to_rootfs(char *buf, unsigned long len) state = Start; this_header = 0; message = NULL; @@ -1756576,7 +1756426,7 @@ index 55b74d7e5260..f4c4e2404dfd 100644 while (!message && len) { loff_t saved_offset = this_header; if (*buf == '0' && !(this_header & 3)) { -@@ -639,4 +643,23 @@ static int __init populate_rootfs(void) +@@ -654,4 +658,23 @@ static int __init populate_rootfs(void) flush_delayed_fput(); return 0; } @@ -1756601,10 +1756451,10 @@ index 55b74d7e5260..f4c4e2404dfd 100644 rootfs_initcall(populate_rootfs); +#endif diff --git a/init/main.c b/init/main.c -index 30d6afeae932..bc383f09d3c6 100644 +index 124d586f2cd9..04d33abd945d 100644 --- a/init/main.c +++ b/init/main.c -@@ -1524,6 +1524,10 @@ static noinline void __init kernel_init_freeable(void) +@@ -1515,6 +1515,10 @@ static noinline void __init kernel_init_freeable(void) smp_init(); sched_init_smp(); @@ -1756615,7 +1756465,7 @@ index 30d6afeae932..bc383f09d3c6 100644 padata_init(); page_alloc_init_late(); /* Initialize page ext after all struct pages are initialized. */ -@@ -1533,6 +1537,10 @@ static noinline void __init kernel_init_freeable(void) +@@ -1524,6 +1528,10 @@ static noinline void __init kernel_init_freeable(void) kunit_run_all_tests(); @@ -1756714,7 +1756564,7 @@ index 7c3601dad9bd..bbb5190af6d9 100644 if (ipc != NULL) { rcu_read_lock(); diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c -index aaad2dce2be6..22d4909597d0 100644 +index 21737bdded37..4a8ac7c8cfad 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -128,21 +128,6 @@ static struct bpf_map *find_and_alloc_map(union bpf_attr *attr) @@ -1756767,16 +1756617,25 @@ index aaad2dce2be6..22d4909597d0 100644 } static const struct vm_operations_struct bpf_map_default_vmops = { -@@ -664,7 +655,7 @@ static int bpf_map_mmap(struct file *filp, struct vm_area_struct *vma) - goto out; - - if (vma->vm_flags & VM_MAYWRITE) +@@ -649,7 +640,7 @@ static int bpf_map_mmap(struct file *filp, struct vm_area_struct *vma) + err = -EACCES; + goto out; + } - bpf_map_write_active_inc(map); + map->writecnt++; + } out: mutex_unlock(&map->freeze_mutex); +@@ -667,7 +658,7 @@ static int bpf_map_mmap(struct file *filp, struct vm_area_struct *vma) + err = map->ops->map_mmap(map, vma); + if (err) { + if (vma->vm_flags & VM_WRITE) +- bpf_map_write_active_dec(map); ++ map->writecnt--; + } + return err; -@@ -1096,7 +1087,6 @@ static int map_update_elem(union bpf_attr *attr) +@@ -1099,7 +1090,6 @@ static int map_update_elem(union bpf_attr *attr) map = __bpf_map_get(f); if (IS_ERR(map)) return PTR_ERR(map); @@ -1756784,7 +1756643,7 @@ index aaad2dce2be6..22d4909597d0 100644 if (!(map_get_sys_perms(map, f) & FMODE_CAN_WRITE)) { err = -EPERM; goto err_put; -@@ -1138,7 +1128,6 @@ static int map_update_elem(union bpf_attr *attr) +@@ -1141,7 +1131,6 @@ static int map_update_elem(union bpf_attr *attr) free_key: kfree(key); err_put: @@ -1756792,7 +1756651,7 @@ index aaad2dce2be6..22d4909597d0 100644 fdput(f); return err; } -@@ -1161,7 +1150,6 @@ static int map_delete_elem(union bpf_attr *attr) +@@ -1164,7 +1153,6 @@ static int map_delete_elem(union bpf_attr *attr) map = __bpf_map_get(f); if (IS_ERR(map)) return PTR_ERR(map); @@ -1756800,7 +1756659,7 @@ index aaad2dce2be6..22d4909597d0 100644 if (!(map_get_sys_perms(map, f) & FMODE_CAN_WRITE)) { err = -EPERM; goto err_put; -@@ -1192,7 +1180,6 @@ static int map_delete_elem(union bpf_attr *attr) +@@ -1195,7 +1183,6 @@ static int map_delete_elem(union bpf_attr *attr) out: kfree(key); err_put: @@ -1756808,7 +1756667,7 @@ index aaad2dce2be6..22d4909597d0 100644 fdput(f); return err; } -@@ -1500,7 +1487,6 @@ static int map_lookup_and_delete_elem(union bpf_attr *attr) +@@ -1503,7 +1490,6 @@ static int map_lookup_and_delete_elem(union bpf_attr *attr) map = __bpf_map_get(f); if (IS_ERR(map)) return PTR_ERR(map); @@ -1756816,7 +1756675,7 @@ index aaad2dce2be6..22d4909597d0 100644 if (!(map_get_sys_perms(map, f) & FMODE_CAN_READ) || !(map_get_sys_perms(map, f) & FMODE_CAN_WRITE)) { err = -EPERM; -@@ -1542,7 +1528,6 @@ static int map_lookup_and_delete_elem(union bpf_attr *attr) +@@ -1545,7 +1531,6 @@ static int map_lookup_and_delete_elem(union bpf_attr *attr) free_key: kfree(key); err_put: @@ -1756824,7 +1756683,7 @@ index aaad2dce2be6..22d4909597d0 100644 fdput(f); return err; } -@@ -1569,7 +1554,8 @@ static int map_freeze(const union bpf_attr *attr) +@@ -1572,7 +1557,8 @@ static int map_freeze(const union bpf_attr *attr) } mutex_lock(&map->freeze_mutex); @@ -1756834,7 +1756693,7 @@ index aaad2dce2be6..22d4909597d0 100644 err = -EBUSY; goto err_put; } -@@ -3996,9 +3982,6 @@ static int bpf_map_do_batch(const union bpf_attr *attr, +@@ -4011,9 +3997,6 @@ static int bpf_map_do_batch(const union bpf_attr *attr, union bpf_attr __user *uattr, int cmd) { @@ -1756844,7 +1756703,7 @@ index aaad2dce2be6..22d4909597d0 100644 struct bpf_map *map; int err, ufd; struct fd f; -@@ -4011,13 +3994,16 @@ static int bpf_map_do_batch(const union bpf_attr *attr, +@@ -4026,13 +4009,16 @@ static int bpf_map_do_batch(const union bpf_attr *attr, map = __bpf_map_get(f); if (IS_ERR(map)) return PTR_ERR(map); @@ -1756865,7 +1756724,7 @@ index aaad2dce2be6..22d4909597d0 100644 err = -EPERM; goto err_put; } -@@ -4030,9 +4016,8 @@ static int bpf_map_do_batch(const union bpf_attr *attr, +@@ -4045,9 +4031,8 @@ static int bpf_map_do_batch(const union bpf_attr *attr, BPF_DO_BATCH(map->ops->map_update_batch); else BPF_DO_BATCH(map->ops->map_delete_batch); @@ -1756877,10 +1756736,10 @@ index aaad2dce2be6..22d4909597d0 100644 return err; } diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c -index f1deefc9bdcd..a27746e4b7c9 100644 +index 2780ccb4d10e..be2674823520 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c -@@ -3577,22 +3577,7 @@ static void coerce_reg_to_size(struct bpf_reg_state *reg, int size) +@@ -3724,22 +3724,7 @@ static void coerce_reg_to_size(struct bpf_reg_state *reg, int size) static bool bpf_map_is_rdonly(const struct bpf_map *map) { @@ -1756905,10 +1756764,10 @@ index f1deefc9bdcd..a27746e4b7c9 100644 static int bpf_map_direct_read(struct bpf_map *map, int off, int size, u64 *val) diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c -index 1592411cbdd5..3090a66cc509 100644 +index 715582c181bc..4ba47bd3a147 100644 --- a/kernel/cgroup/cgroup-v1.c +++ b/kernel/cgroup/cgroup-v1.c -@@ -520,7 +520,8 @@ static ssize_t __cgroup1_procs_write(struct kernfs_open_file *of, +@@ -519,7 +519,8 @@ static ssize_t __cgroup1_procs_write(struct kernfs_open_file *of, if (!uid_eq(cred->euid, GLOBAL_ROOT_UID) && #endif !uid_eq(cred->euid, tcred->uid) && @@ -1756919,7 +1756778,7 @@ index 1592411cbdd5..3090a66cc509 100644 put_cred(tcred); if (ret) diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c -index b68de0d09632..cbab2f812db6 100644 +index f2284aeac0f3..54274e61b034 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -374,9 +374,9 @@ static DEFINE_SPINLOCK(callback_lock); @@ -1757172,7 +1757031,7 @@ index 2cda6a3efd76..356baa1b6c9d 100644 if (!cpu_present(cpu)) diff --git a/kernel/irq/generic-chip.c b/kernel/irq/generic-chip.c -index e2999a070a99..79cb6d063b80 100644 +index 4195e7ad1ff2..5e7b66e32844 100644 --- a/kernel/irq/generic-chip.c +++ b/kernel/irq/generic-chip.c @@ -200,6 +200,7 @@ int irq_gc_set_wake(struct irq_data *d, unsigned int on) @@ -1757317,7 +1757176,7 @@ index b9faa363c46a..41053c3b4ead 100644 for_each_process_thread(g, p) { if (p != current && !freezer_should_skip(p) diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c -index f5dccd445d36..c60ed74e3cc7 100644 +index c1bdaae07f4c..6a1d97bc59fc 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -1137,7 +1137,15 @@ void free_basic_memory_bitmaps(void) @@ -1757445,7 +1757304,7 @@ index 4aa4d5d3947f..b776c3db6828 100644 if (error) { suspend_stats.fail++; diff --git a/kernel/power/wakeup_reason.c b/kernel/power/wakeup_reason.c -new file mode 100755 +new file mode 100644 index 000000000000..8fefaa3fdba2 --- /dev/null +++ b/kernel/power/wakeup_reason.c @@ -1757910,10 +1757769,10 @@ index 251a9af3709a..52cf14bff824 100644 rcu_force_quiescent_state(); /* Kick them all. */ diff --git a/kernel/reboot.c b/kernel/reboot.c -index af6f23d8bea1..bce629531d2a 100644 +index e297b35fc652..2c4470fa9379 100644 --- a/kernel/reboot.c +++ b/kernel/reboot.c -@@ -215,6 +215,27 @@ void do_kernel_restart(char *cmd) +@@ -216,6 +216,27 @@ void do_kernel_restart(char *cmd) atomic_notifier_call_chain(&restart_handler_list, reboot_mode, cmd); } @@ -1757942,7 +1757801,7 @@ index af6f23d8bea1..bce629531d2a 100644 { /* The boot cpu is always logical cpu 0 */ diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 9afa1dd0f7e2..867ee64a35a3 100644 +index 576e7a5767f0..e16bc9fb7047 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -50,6 +50,13 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(sched_overutilized_tp); @@ -1758059,7 +1757918,7 @@ index 9afa1dd0f7e2..867ee64a35a3 100644 return try_to_wake_up(curr->private, mode, wake_flags); } EXPORT_SYMBOL(default_wake_function); -@@ -5722,16 +5764,19 @@ int sched_setscheduler(struct task_struct *p, int policy, +@@ -5730,16 +5772,19 @@ int sched_setscheduler(struct task_struct *p, int policy, { return _sched_setscheduler(p, policy, param, true); } @@ -1758079,7 +1757938,7 @@ index 9afa1dd0f7e2..867ee64a35a3 100644 /** * sched_setscheduler_nocheck - change the scheduling policy and/or RT priority of a thread from kernelspace. -@@ -5751,6 +5796,7 @@ int sched_setscheduler_nocheck(struct task_struct *p, int policy, +@@ -5759,6 +5804,7 @@ int sched_setscheduler_nocheck(struct task_struct *p, int policy, { return _sched_setscheduler(p, policy, param, false); } @@ -1758087,7 +1757946,7 @@ index 9afa1dd0f7e2..867ee64a35a3 100644 /* * SCHED_FIFO is a broken scheduler model; that is, it is fundamentally -@@ -7058,6 +7104,11 @@ void migrate_tasks(struct rq *dead_rq, struct rq_flags *rf, +@@ -7053,6 +7099,11 @@ void migrate_tasks(struct rq *dead_rq, struct rq_flags *rf, */ update_rq_clock(rq); @@ -1758100,7 +1757959,7 @@ index 9afa1dd0f7e2..867ee64a35a3 100644 /* * There's this thread running, bail when that's the only diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index e5e72262e2ef..6ea17f110de9 100644 +index 9a701e968c0b..f485a2e19d97 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -86,6 +86,7 @@ enum sched_tunable_scaling sysctl_sched_tunable_scaling = SCHED_TUNABLESCALING_L @@ -1758326,7 +1758185,7 @@ index c529706bed11..92a6875bc2d3 100644 +#define LOAD_AVG_PERIOD pelt_load_avg_period +#define LOAD_AVG_MAX pelt_load_avg_max diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h -index 23cd54413f2e..9e264d895775 100644 +index 8da63d4e40e7..d57c4c8d5013 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1915,6 +1915,8 @@ extern const int sched_latency_to_weight[40]; @@ -1758385,8 +1758244,39 @@ index a55642aa3f68..6911bbca018c 100644 { /* Pairs with the smp_store_mb() in wait_woken(). */ smp_mb(); /* C */ +diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c +index 45c555d984bc..7eb3cf77e108 100644 +--- a/kernel/trace/trace.c ++++ b/kernel/trace/trace.c +@@ -9386,7 +9386,7 @@ static struct notifier_block trace_module_nb = { + }; + #endif /* CONFIG_MODULES */ + +-static __init int tracer_init_tracefs(void) ++static int tracefs_init(void * data) + { + int ret; + +@@ -9436,6 +9436,17 @@ static __init int tracer_init_tracefs(void) + return 0; + } + ++static __init int tracer_init_tracefs(void) ++{ ++ struct task_struct *thread; ++ ++ thread = kthread_run(tracefs_init, NULL, "tracefs_init"); ++ if (IS_ERR(thread)) ++ return PTR_ERR(thread); ++ ++ return 0; ++} ++ + static int trace_panic_handler(struct notifier_block *this, + unsigned long event, void *unused) + { diff --git a/make-boot.sh b/make-boot.sh -new file mode 100755 +new file mode 100644 index 000000000000..f4cd4c4524b5 --- /dev/null +++ b/make-boot.sh @@ -1758423,8 +1758313,8 @@ index 000000000000..f4cd4c4524b5 +cd - +cp ${BOOT_LINUX}/boot_linux.img ${OUT_IMAGE} diff --git a/make-ohos.sh b/make-ohos.sh -new file mode 100755 -index 000000000000..70ad2c5ccf41 +new file mode 100644 +index 000000000000..a9e22dc69143 --- /dev/null +++ b/make-ohos.sh @@ -0,0 +1,148 @@ @@ -1758701,7 +1758591,7 @@ index f72d53957033..ba21b5b13f39 100644 return end_pfn - start_pfn; diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 6993c6b27dcf..3078e59b72af 100644 +index fabeabbb1200..b63375b3f656 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1445,9 +1445,15 @@ static void free_one_page(struct zone *zone, @@ -1758779,10 +1758669,10 @@ index 6993c6b27dcf..3078e59b72af 100644 pgcnt++; } diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c -index 756523e5402a..f0a4377c3b7d 100644 +index 5f91fd198448..90ee1ba8891d 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c -@@ -1539,9 +1539,6 @@ static void l2cap_sock_close_cb(struct l2cap_chan *chan) +@@ -1546,9 +1546,6 @@ static void l2cap_sock_close_cb(struct l2cap_chan *chan) { struct sock *sk = chan->data; @@ -1758792,7 +1758682,7 @@ index 756523e5402a..f0a4377c3b7d 100644 l2cap_sock_kill(sk); } -@@ -1550,9 +1547,6 @@ static void l2cap_sock_teardown_cb(struct l2cap_chan *chan, int err) +@@ -1557,9 +1554,6 @@ static void l2cap_sock_teardown_cb(struct l2cap_chan *chan, int err) struct sock *sk = chan->data; struct sock *parent; @@ -1758802,7 +1758692,7 @@ index 756523e5402a..f0a4377c3b7d 100644 BT_DBG("chan %p state %s", chan, state_to_string(chan->state)); /* This callback can be called both for server (BT_LISTEN) -@@ -1752,10 +1746,8 @@ static void l2cap_sock_destruct(struct sock *sk) +@@ -1759,10 +1753,8 @@ static void l2cap_sock_destruct(struct sock *sk) { BT_DBG("sk %p", sk); @@ -1758815,10 +1758705,10 @@ index 756523e5402a..f0a4377c3b7d 100644 if (l2cap_pi(sk)->rx_busy_skb) { kfree_skb(l2cap_pi(sk)->rx_busy_skb); diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c -index 081d1ee3ddb8..8244d3ae185b 100644 +index f9a2993fd452..656601ab7b15 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c -@@ -93,10 +93,10 @@ static void sco_sock_timeout(struct work_struct *work) +@@ -97,10 +97,10 @@ static void sco_sock_timeout(struct work_struct *work) BT_DBG("sock %p state %d", sk, sk->sk_state); @@ -1758831,7 +1758721,7 @@ index 081d1ee3ddb8..8244d3ae185b 100644 sock_put(sk); } -@@ -193,10 +193,10 @@ static void sco_conn_del(struct hci_conn *hcon, int err) +@@ -197,10 +197,10 @@ static void sco_conn_del(struct hci_conn *hcon, int err) if (sk) { sock_hold(sk); @@ -1758844,7 +1758734,7 @@ index 081d1ee3ddb8..8244d3ae185b 100644 sock_put(sk); } -@@ -1103,10 +1103,10 @@ static void sco_conn_ready(struct sco_conn *conn) +@@ -1104,10 +1104,10 @@ static void sco_conn_ready(struct sco_conn *conn) if (sk) { sco_sock_clear_timer(sk); @@ -1758857,7 +1758747,7 @@ index 081d1ee3ddb8..8244d3ae185b 100644 } else { sco_conn_lock(conn); -@@ -1121,12 +1121,12 @@ static void sco_conn_ready(struct sco_conn *conn) +@@ -1122,12 +1122,12 @@ static void sco_conn_ready(struct sco_conn *conn) return; } @@ -1758872,7 +1758762,7 @@ index 081d1ee3ddb8..8244d3ae185b 100644 sco_conn_unlock(conn); return; } -@@ -1147,7 +1147,7 @@ static void sco_conn_ready(struct sco_conn *conn) +@@ -1148,7 +1148,7 @@ static void sco_conn_ready(struct sco_conn *conn) /* Wake up parent */ parent->sk_data_ready(parent); @@ -1758909,7 +1758799,7 @@ index dc47b6174ec5..beed5b506307 100644 +rfkill-rk-y += rfkill-wlan.o rfkill-bt.o +obj-$(CONFIG_RFKILL_RK) += rfkill-rk.o diff --git a/net/rfkill/rfkill-bt.c b/net/rfkill/rfkill-bt.c -new file mode 100755 +new file mode 100644 index 000000000000..7c943871a379 --- /dev/null +++ b/net/rfkill/rfkill-bt.c @@ -1759742,7 +1759632,7 @@ index 000000000000..7c943871a379 +MODULE_AUTHOR("cmy@rock-chips.com, gwl@rock-chips.com"); +MODULE_LICENSE("GPL"); diff --git a/net/rfkill/rfkill-wlan.c b/net/rfkill/rfkill-wlan.c -new file mode 100755 +new file mode 100644 index 000000000000..6a581c847a68 --- /dev/null +++ b/net/rfkill/rfkill-wlan.c @@ -1760755,7 +1760645,7 @@ index 53aa3e18ce8a..7ca0ddfa6e19 100644 -d $(depfile).dtc.tmp $(dtc-tmp) ; \ cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) diff --git a/scripts/clang-wrapper.py b/scripts/clang-wrapper.py -new file mode 100755 +new file mode 100644 index 000000000000..5486902f1f76 --- /dev/null +++ b/scripts/clang-wrapper.py @@ -1760892,7 +1760782,7 @@ index 17cb6890d45a..913fb08af475 100644 ERROR(omit_unused_nodes, fixup_omit_unused_nodes, NULL, &phandle_references, &path_references); diff --git a/scripts/mkimg b/scripts/mkimg -new file mode 100755 +new file mode 100644 index 000000000000..63e3da6f402c --- /dev/null +++ b/scripts/mkimg @@ -1761133,7 +1761023,7 @@ index 000000000000..63e3da6f402c + make_boot_img; +fi diff --git a/scripts/repack-bootimg b/scripts/repack-bootimg -new file mode 100755 +new file mode 100644 index 000000000000..69065d28e0ea --- /dev/null +++ b/scripts/repack-bootimg @@ -1761292,7 +1761182,7 @@ index 000000000000..69065d28e0ea +--os_patch_level $os_patch_level \ +--output $output diff --git a/scripts/resource_tool.c b/scripts/resource_tool.c -new file mode 100755 +new file mode 100644 index 000000000000..8465c578b2d7 --- /dev/null +++ b/scripts/resource_tool.c @@ -1762973,7 +1762863,7 @@ index fb45a32d99cd..0ec5bf47d96e 100644 } diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig -index f1c9e563994b..d3f815d7c867 100644 +index 04a7070c78e2..7ff1aa8db994 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -89,11 +89,16 @@ config SND_SOC_ALL_CODECS @@ -1763223,7 +1763113,7 @@ index 4d286844e3c8..2be7ba425ee4 100644 .formats = SNDRV_PCM_FMTBIT_S16_LE, }, diff --git a/sound/soc/codecs/dummy-codec.c b/sound/soc/codecs/dummy-codec.c -new file mode 100755 +new file mode 100644 index 000000000000..35756c753357 --- /dev/null +++ b/sound/soc/codecs/dummy-codec.c @@ -1763344,7 +1763234,7 @@ index 000000000000..35756c753357 +MODULE_DESCRIPTION("Rockchip Dummy Codec Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/es7202.c b/sound/soc/codecs/es7202.c -new file mode 100755 +new file mode 100644 index 000000000000..49035e8ca52d --- /dev/null +++ b/sound/soc/codecs/es7202.c @@ -1764520,7 +1764410,7 @@ index 000000000000..49035e8ca52d +MODULE_AUTHOR(" David Yang, >"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/es7202.h b/sound/soc/codecs/es7202.h -new file mode 100755 +new file mode 100644 index 000000000000..fb8643c0a3b2 --- /dev/null +++ b/sound/soc/codecs/es7202.h @@ -1764621,7 +1764511,7 @@ index 000000000000..fb8643c0a3b2 + +#endif diff --git a/sound/soc/codecs/es7210.c b/sound/soc/codecs/es7210.c -new file mode 100755 +new file mode 100644 index 000000000000..dfb0e24e23c7 --- /dev/null +++ b/sound/soc/codecs/es7210.c @@ -1766381,7 +1766271,7 @@ index 000000000000..dfb0e24e23c7 +MODULE_AUTHOR("David Yang / info@everest-semi.com"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/es7210.h b/sound/soc/codecs/es7210.h -new file mode 100755 +new file mode 100644 index 000000000000..234a365c398e --- /dev/null +++ b/sound/soc/codecs/es7210.h @@ -1766463,7 +1766353,7 @@ index 000000000000..234a365c398e + +#endif /* _ES7210_H_ */ diff --git a/sound/soc/codecs/es7243e.c b/sound/soc/codecs/es7243e.c -new file mode 100755 +new file mode 100644 index 000000000000..e2bf03c526d8 --- /dev/null +++ b/sound/soc/codecs/es7243e.c @@ -1769140,7 +1769030,7 @@ index 000000000000..e2bf03c526d8 +MODULE_AUTHOR("David Yang "); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/es7243e_usr_cfg.h b/sound/soc/codecs/es7243e_usr_cfg.h -new file mode 100755 +new file mode 100644 index 000000000000..1d9760ada940 --- /dev/null +++ b/sound/soc/codecs/es7243e_usr_cfg.h @@ -1769420,7 +1769310,7 @@ index 000000000000..1d9760ada940 + +#define VDDA_VOLTAGE VDDA_3V3 diff --git a/sound/soc/codecs/es8311.c b/sound/soc/codecs/es8311.c -new file mode 100755 +new file mode 100644 index 000000000000..b13ece8be069 --- /dev/null +++ b/sound/soc/codecs/es8311.c @@ -1770182,7 +1770072,7 @@ index 000000000000..b13ece8be069 +MODULE_AUTHOR("David Yang "); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/es8311.h b/sound/soc/codecs/es8311.h -new file mode 100755 +new file mode 100644 index 000000000000..94d8472bd5de --- /dev/null +++ b/sound/soc/codecs/es8311.h @@ -1770257,7 +1770147,7 @@ index 000000000000..94d8472bd5de + +#endif diff --git a/sound/soc/codecs/es8323.c b/sound/soc/codecs/es8323.c -new file mode 100755 +new file mode 100644 index 000000000000..636510849a6d --- /dev/null +++ b/sound/soc/codecs/es8323.c @@ -1771261,7 +1771151,7 @@ index 000000000000..636510849a6d +MODULE_AUTHOR("Mark Brown "); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/es8323.h b/sound/soc/codecs/es8323.h -new file mode 100755 +new file mode 100644 index 000000000000..355a6a7d3149 --- /dev/null +++ b/sound/soc/codecs/es8323.h @@ -1771454,7 +1771344,7 @@ index 081b5f189632..3e2de70340cc 100644 return -EINVAL; } diff --git a/sound/soc/codecs/es8396.c b/sound/soc/codecs/es8396.c -new file mode 100755 +new file mode 100644 index 000000000000..4cd7916b026f --- /dev/null +++ b/sound/soc/codecs/es8396.c @@ -1774667,7 +1774557,7 @@ index 000000000000..4cd7916b026f +MODULE_AUTHOR("DavidYang, Everest Semiconductor Co., Ltd, "); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/es8396.h b/sound/soc/codecs/es8396.h -new file mode 100755 +new file mode 100644 index 000000000000..e6f2f390707d --- /dev/null +++ b/sound/soc/codecs/es8396.h @@ -1775027,7 +1774917,7 @@ index 000000000000..e6f2f390707d + +#endif diff --git a/sound/soc/codecs/rk1000_codec.c b/sound/soc/codecs/rk1000_codec.c -new file mode 100755 +new file mode 100644 index 000000000000..9cabd0977813 --- /dev/null +++ b/sound/soc/codecs/rk1000_codec.c @@ -1775613,7 +1775503,7 @@ index 000000000000..9cabd0977813 +MODULE_AUTHOR("Sugar Zhang "); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/rk1000_codec.h b/sound/soc/codecs/rk1000_codec.h -new file mode 100755 +new file mode 100644 index 000000000000..0c9169cd6fb7 --- /dev/null +++ b/sound/soc/codecs/rk1000_codec.h @@ -1775939,7 +1775829,7 @@ index 000000000000..0c9169cd6fb7 + +#endif diff --git a/sound/soc/codecs/rk312x_codec.c b/sound/soc/codecs/rk312x_codec.c -new file mode 100755 +new file mode 100644 index 000000000000..0e3ac4008962 --- /dev/null +++ b/sound/soc/codecs/rk312x_codec.c @@ -1778471,7 +1778361,7 @@ index 000000000000..0e3ac4008962 +MODULE_DESCRIPTION("ROCKCHIP i2s ASoC Interface"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/rk312x_codec.h b/sound/soc/codecs/rk312x_codec.h -new file mode 100755 +new file mode 100644 index 000000000000..0924088681ba --- /dev/null +++ b/sound/soc/codecs/rk312x_codec.h @@ -1779043,7 +1778933,7 @@ index 000000000000..0924088681ba + +#endif /* __RK312x_CODEC_H__ */ diff --git a/sound/soc/codecs/rk3228_codec.c b/sound/soc/codecs/rk3228_codec.c -new file mode 100755 +new file mode 100644 index 000000000000..d82eec871ac8 --- /dev/null +++ b/sound/soc/codecs/rk3228_codec.c @@ -1779592,7 +1779482,7 @@ index 000000000000..d82eec871ac8 +MODULE_DESCRIPTION("ASoC rk3228 codec driver"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/rk3228_codec.h b/sound/soc/codecs/rk3228_codec.h -new file mode 100755 +new file mode 100644 index 000000000000..7283d0ba86e8 --- /dev/null +++ b/sound/soc/codecs/rk3228_codec.h @@ -1779816,7 +1779706,7 @@ index 000000000000..7283d0ba86e8 + +#endif diff --git a/sound/soc/codecs/rk3308_codec.c b/sound/soc/codecs/rk3308_codec.c -new file mode 100755 +new file mode 100644 index 000000000000..a6ce7f061d73 --- /dev/null +++ b/sound/soc/codecs/rk3308_codec.c @@ -1784950,7 +1784840,7 @@ index 000000000000..a6ce7f061d73 +MODULE_DESCRIPTION("ASoC RK3308 Codec Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/rk3308_codec.h b/sound/soc/codecs/rk3308_codec.h -new file mode 100755 +new file mode 100644 index 000000000000..93e089dae081 --- /dev/null +++ b/sound/soc/codecs/rk3308_codec.h @@ -1786025,7 +1785915,7 @@ index 000000000000..93e089dae081 + +#endif /* __RK3308_CODEC_H__ */ diff --git a/sound/soc/codecs/rk3308_codec_provider.h b/sound/soc/codecs/rk3308_codec_provider.h -new file mode 100755 +new file mode 100644 index 000000000000..34c1ef86a507 --- /dev/null +++ b/sound/soc/codecs/rk3308_codec_provider.h @@ -1786059,7 +1785949,7 @@ index 000000000000..34c1ef86a507 + +#endif /* __RK3308_CODEC_PROVIDER_H__ */ diff --git a/sound/soc/codecs/rk817_codec.c b/sound/soc/codecs/rk817_codec.c -new file mode 100755 +new file mode 100644 index 000000000000..453ea4bf5b7f --- /dev/null +++ b/sound/soc/codecs/rk817_codec.c @@ -1787429,7 +1787319,7 @@ index 000000000000..453ea4bf5b7f +MODULE_AUTHOR("binyuan "); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/rk817_codec.h b/sound/soc/codecs/rk817_codec.h -new file mode 100755 +new file mode 100644 index 000000000000..a928c323928b --- /dev/null +++ b/sound/soc/codecs/rk817_codec.h @@ -1787650,7 +1787540,7 @@ index 000000000000..a928c323928b + +#endif /* __RK817_CODEC_H__ */ diff --git a/sound/soc/codecs/rk_codec_digital.c b/sound/soc/codecs/rk_codec_digital.c -new file mode 100755 +new file mode 100644 index 000000000000..ec91b72fa6de --- /dev/null +++ b/sound/soc/codecs/rk_codec_digital.c @@ -1788765,7 +1788655,7 @@ index 000000000000..ec91b72fa6de +MODULE_DESCRIPTION("ASoC Rockchip codec digital driver"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/rk_codec_digital.h b/sound/soc/codecs/rk_codec_digital.h -new file mode 100755 +new file mode 100644 index 000000000000..4bb409b8d8bc --- /dev/null +++ b/sound/soc/codecs/rk_codec_digital.h @@ -1789282,7 +1789172,7 @@ index 20c33a3ece37..05739b17813c 100644 #endif /* __RT5651_H__ */ diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c -index c86231dfcf4f..0827b7e65ac1 100644 +index 600e93d61a90..49a165515344 100644 --- a/sound/soc/codecs/wm8974.c +++ b/sound/soc/codecs/wm8974.c @@ -7,6 +7,7 @@ @@ -1799915,62 +1799805,3 @@ index 1f44a29818bf..51574379ff91 100644 }; #define STR_INTERFACE "AIO Test" -diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c -index 89a8bb8e2..70cd26e8b 100644 ---- a/kernel/trace/trace.c -+++ b/kernel/trace/trace.c -@@ -9401,7 +9401,7 @@ static struct notifier_block trace_module_nb = { - }; - #endif /* CONFIG_MODULES */ - --static __init int tracer_init_tracefs(void) -+static int tracefs_init(void * data) - { - int ret; - -@@ -9451,6 +9451,17 @@ static __init int tracer_init_tracefs(void) - return 0; - } - -+static __init int tracer_init_tracefs(void) -+{ -+ struct task_struct *thread; -+ -+ thread = kthread_run(tracefs_init, NULL, "tracefs_init"); -+ if (IS_ERR(thread)) -+ return PTR_ERR(thread); -+ -+ return 0; -+} -+ - static int trace_panic_handler(struct notifier_block *this, - unsigned long event, void *unused) - { -diff --git a/drivers/char/mem.c b/drivers/char/mem.c -index 7d483c332..9b839d619 100644 ---- a/drivers/char/mem.c -+++ b/drivers/char/mem.c -@@ -1066,6 +1066,12 @@ static int devmem_init_inode(void) - return 0; - } - -+static int do_wait_for_random_bytes(void * data) -+{ -+ wait_for_random_bytes(); -+ return 0; -+} -+ - static int __init chr_dev_init(void) - { - int minor; -@@ -1094,6 +1100,11 @@ static int __init chr_dev_init(void) - NULL, devlist[minor].name); - } - -+ struct task_struct *thread; -+ thread = kthread_run(do_wait_for_random_bytes,NULL,"wait_for_random_bytes_thread"); -+ if (IS_ERR(thread)){ -+ printk("wait_for_random_bytes_thread thread create fail"); -+ } - return tty_init(); - } -- Gitee